From mboxrd@z Thu Jan 1 00:00:00 1970 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 Content-Type: multipart/mixed; boundary="===============3507373907860165021==" List-Id: --===============3507373907860165021== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - When borgbackup was upgraded from version 1.1.17 to 1.2.0 the build was suc= essfully completed but there was no testing feedback till after full release. It tu= rned out that it did not successfully run. - python3-packaging which had been installed for the build of borgbackup need= ed to also be available for the execution. - When borgbackup was upgraded to 1.2.0 it was noticed that the old python3-m= sgpack was no longer needed as borgbackup used its own bundled msgpack since around v= ersion 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 w= hich currently require it to be =3D<1.0.3 - This patch adds the python3-packaging and python3-msgpack modules as depend= encies for borgbackup - The egg-info files are uncommented in the rootfile so that the borgbackup m= etadata can be found by python. - The updated borgbackup build together with the python3-packaging and python= 3-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.t= xt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependenc= y_links.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_poi= nts.txt -#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-s= afe -#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_poin= ts.txt +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-sa= fe +usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.t= xt +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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D borgbackup -PAK_VER =3D 11 +PAK_VER =3D 12 =20 -DEPS =3D python3-pkgconfig +DEPS =3D python3-pkgconfig python3-msgpack python3-packaging =20 SERVICES =3D =20 --=20 2.36.1 --===============3507373907860165021==--