From c9336f7a1f7f8293012b4a23db941039f9572b4c Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Fri, 24 Jun 2022 14:14:24 +0200 Subject: [PATCH] borgbackup: Fix bug #12884 - borgbackup 1.2.0 crashes on running any borg command - 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 a27b7c11cc..b744b0b99c 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 bfdc9e3ff3..c2faaac210 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 = -- 2.39.5