From patchwork Fri Jun 24 12:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5701 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4LTwzH3ZL4z3wcT for ; Fri, 24 Jun 2022 12:14:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4LTwzF3dMhzlC; Fri, 24 Jun 2022 12:14:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LTwzF39fgz2xmL; Fri, 24 Jun 2022 12:14:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4LTwzD18dCz2xHK for ; Fri, 24 Jun 2022 12:14:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4LTwzC56hSz7n; Fri, 24 Jun 2022 12:14:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1656072871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QUm4Ug1pLOvFUrLWvEimq4jdlz3Uw679xFWoFpTsdmo=; b=o3jR6tYzMuhi/jnUQlf2+WRPi2PfRnKfWfEGfeE0eEhf77J0qd8g4ubcv6OsTR3pHvZz/c DaezHBAjWPVhBTAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1656072871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QUm4Ug1pLOvFUrLWvEimq4jdlz3Uw679xFWoFpTsdmo=; b=kvSz+ucdYIt5vrQnVqOvkOMXt/3ygXtMNSc6sbuF6cOYfeMnfol6wCYnylZEmxUv7sujJ3 6uuXSox1tz63fbqfKinSN8n0Wwh3hqAb/C+k/y4fVwKFNhlHERSzCM8N/3TsHaLhUXoGlU dIeot6FOKh5G/5SBjopYgAZGGrXOHjM22kTELhj5wN6fKPhzGqJE+8A1l15jQXrEkFeDdL Q5tmCWz7ppD7zXOyHjPv6UNRPsH0ZSI15OisLCjpFrZVS/PyQwulbjR8LHnQcdbMWd62Bt pXRqfCN/sJaoe0Mw+GTCTlamkNphgeOLnrmV9f8VwYeBeAnKSgWBKnoqIcRO8g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/3] borgbackup: Fix bug #12884 - borgbackup 1.2.0 crashes on running any borg command Date: Fri, 24 Jun 2022 14:14:24 +0200 Message-Id: <20220624121426.3504065-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - When borgbackup was upgraded from version 1.1.17 to 1.2.0 the build was sucessfully completed but there was no testing feedback till after full release. It turned out that it did not successfully run. - python3-packaging which had been installed for the build of borgbackup needed to also be available for the execution. - When borgbackup was upgraded to 1.2.0 it was noticed that the old python3-msgpack was no longer needed as borgbackup used its own bundled msgpack since around version 1.1.10 What was not seen was that in version 1.1.19 or 1.1.18 the bundled version of msgpack had been removed and that the newer version of python3-msgpack now needed to be installed but the version number has to meet the borgbackup requirements which currently require it to be =<1.0.3 - This patch adds the python3-packaging and python3-msgpack modules as dependencies for borgbackup - The egg-info files are uncommented in the rootfile so that the borgbackup metadata can be found by python. - The updated borgbackup build together with the python3-packaging and python3-msgpack modules were installed into a vm system using the .ipfire packages. Successfully initialised a borgbackup repo and ran two backups to the repo and checked the stats for the backup. Everything ran fine. Fixes: Bug #12884 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/borgbackup | 14 +++++++------- lfs/borgbackup | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index a27b7c11c..b744b0b99 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -92,10 +92,10 @@ usr/lib/python3.10/site-packages/borg/upgrader.py usr/lib/python3.10/site-packages/borg/version.py usr/lib/python3.10/site-packages/borg/xattr.py #usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt diff --git a/lfs/borgbackup b/lfs/borgbackup index bfdc9e3ff..c2faaac21 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 11 +PAK_VER = 12 -DEPS = python3-pkgconfig +DEPS = python3-pkgconfig python3-msgpack python3-packaging SERVICES =