From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: Re: [PATCH] borgbackup: Fixes DEP error. Update to 1.1.11 Date: Fri, 24 Apr 2020 16:12:13 +0200 Message-ID: <4adbe2035eb4473c4605fa1e9fa93635f7898d1c.camel@ipfire.org> In-Reply-To: <20200411052658.26643-1-ummeegge@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6400767037142316770==" List-Id: --===============6400767037142316770== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, this will introduce additionally root file changes on other architectures (arm) which somebody needs to take care of. Everything else is fine. @Arne: Could you merge this please and upload the package to our mirrors? As the packages are independent of Core updates, I would like to get this shipped, as this is a show stopper on a new installation. Thanks for your work. Greetings Jonatan Reviewed-by: Jonatan Schlag Am Samstag, den 11.04.2020, 07:26 +0200 schrieb Erik Kapfer: > Fixes #12356 >=20 > Several fixes but also new features has been added with this version. > Full changelog can be found in here -->=20 > https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-111= 1-2020-03-08 > . >=20 > Signed-off-by: Erik Kapfer > --- > config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++-- > ---------- > lfs/borgbackup | 8 ++++---- > 2 files changed, 26 insertions(+), 16 deletions(-) >=20 > diff --git a/config/rootfiles/packages/borgbackup > b/config/rootfiles/packages/borgbackup > index 19b5a69eb..81a7e7072 100644 > --- a/config/rootfiles/packages/borgbackup > +++ b/config/rootfiles/packages/borgbackup > @@ -1,19 +1,28 @@ > usr/bin/borg > usr/bin/borgfs > -usr/lib/python3.8/site-packages/borg > +#usr/lib/python3.8/site-packages/borg > usr/lib/python3.8/site-packages/borg/__init__.py > usr/lib/python3.8/site-packages/borg/__main__.py > usr/lib/python3.8/site-packages/borg/_version.py > -usr/lib/python3.8/site-packages/borg/algorithms > +#usr/lib/python3.8/site-packages/borg/algorithms > usr/lib/python3.8/site-packages/borg/algorithms/__init__.py > usr/lib/python3.8/site-packages/borg/algorithms/checksums.cpython- > 38-MACHINE-linux-gnu.so > +#usr/lib/python3.8/site-packages/borg/algorithms/msgpack > +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/__init__.py > +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_packer.cpp > +usr/lib/python3.8/site- > packages/borg/algorithms/msgpack/_packer.cpython-38-MACHINE-linux- > gnu.so > +usr/lib/python3.8/site- > packages/borg/algorithms/msgpack/_unpacker.cpp > +usr/lib/python3.8/site- > packages/borg/algorithms/msgpack/_unpacker.cpython-38-MACHINE-linux- > gnu.so > +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_version.py > +usr/lib/python3.8/site- > packages/borg/algorithms/msgpack/exceptions.py > +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/fallback.py > usr/lib/python3.8/site-packages/borg/archive.py > usr/lib/python3.8/site-packages/borg/archiver.py > usr/lib/python3.8/site-packages/borg/cache.py > usr/lib/python3.8/site-packages/borg/chunker.cpython-38-MACHINE- > linux-gnu.so > usr/lib/python3.8/site-packages/borg/compress.cpython-38-MACHINE- > linux-gnu.so > usr/lib/python3.8/site-packages/borg/constants.py > -usr/lib/python3.8/site-packages/borg/crypto > +#usr/lib/python3.8/site-packages/borg/crypto > usr/lib/python3.8/site-packages/borg/crypto/__init__.py > usr/lib/python3.8/site-packages/borg/crypto/file_integrity.py > usr/lib/python3.8/site-packages/borg/crypto/key.py > @@ -30,11 +39,12 @@ usr/lib/python3.8/site-packages/borg/lrucache.py > usr/lib/python3.8/site-packages/borg/nanorst.py > usr/lib/python3.8/site-packages/borg/paperkey.html > usr/lib/python3.8/site-packages/borg/patterns.py > -usr/lib/python3.8/site-packages/borg/platform > +#usr/lib/python3.8/site-packages/borg/platform > usr/lib/python3.8/site-packages/borg/platform/__init__.py > usr/lib/python3.8/site-packages/borg/platform/base.py > usr/lib/python3.8/site-packages/borg/platform/linux.cpython-38- > MACHINE-linux-gnu.so > usr/lib/python3.8/site-packages/borg/platform/posix.cpython-38- > MACHINE-linux-gnu.so > +usr/lib/python3.8/site-packages/borg/platform/syncfilerange.cpython- > 38-MACHINE-linux-gnu.so > usr/lib/python3.8/site-packages/borg/remote.py > usr/lib/python3.8/site-packages/borg/repository.py > usr/lib/python3.8/site-packages/borg/selftest.py > @@ -71,11 +81,11 @@ usr/lib/python3.8/site- > packages/borg/shellpattern.py > usr/lib/python3.8/site-packages/borg/upgrader.py > usr/lib/python3.8/site-packages/borg/version.py > usr/lib/python3.8/site-packages/borg/xattr.py > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/PKG- > INFO > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg- > info/SOURCES.txt > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg- > info/dependency_links.txt > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg- > info/entry_points.txt > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/not- > zip-safe > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg- > info/requires.txt > -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg- > info/top_level.txt > +#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/PKG-INFO > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/SOURCES.txt > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/dependency_links.txt > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/entry_points.txt > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/not-zip-safe > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/requires.txt > +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg- > info/top_level.txt > diff --git a/lfs/borgbackup b/lfs/borgbackup > index 97efd970d..cdfe5e3d5 100644 > --- a/lfs/borgbackup > +++ b/lfs/borgbackup > @@ -1,7 +1,7 @@ > #################################################################### > ########### > # =20 > # > # IPFire.org - A linux based > firewall # > -# Copyright (C) 2007-2018 IPFire Team =20 > # > +# Copyright (C) 2007-2020 IPFire Team =20 > # > # =20 > # > # This program is free software: you can redistribute it and/or > modify # > # it under the terms of the GNU General Public License as published > by # > @@ -24,7 +24,7 @@ > =20 > include Config > =20 > -VER =3D 1.1.9 > +VER =3D 1.1.11 > =20 > THISAPP =3D borgbackup-$(VER) > DL_FILE =3D $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > TARGET =3D $(DIR_INFO)/$(THISAPP) > PROG =3D borgbackup > -PAK_VER =3D 3 > +PAK_VER =3D 4 > =20 > DEPS =3D python3-llfuse python3-msgpack > =20 > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) > =20 > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =20 > -$(DL_FILE)_MD5 =3D 0fda2c1f636754d0748569bff67a6836 > +$(DL_FILE)_MD5 =3D ab9721f10c2500e0ca872545c64b6e2f > =20 > install : $(TARGET) > =20 --===============6400767037142316770==--