diff mbox series

borgbackup: Fixes DEP error. Update to 1.1.11

Message ID 20200411052658.26643-1-ummeegge@ipfire.org
State Accepted
Commit 086c09eefb72449ef39517e3586470ebef5e7276
Headers
Series borgbackup: Fixes DEP error. Update to 1.1.11 |

Commit Message

ummeegge April 11, 2020, 5:26 a.m. UTC 
  Fixes #12356

Several fixes but also new features has been added with this version.
Full changelog can be found in here --> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08 .

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
---
 config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++------------
 lfs/borgbackup                       |  8 ++++----
 2 files changed, 26 insertions(+), 16 deletions(-)

Comments

Michael Tremer April 11, 2020, 8:57 a.m. UTC | #1 
Hi Erik,

What is the DEP error you are referring to in the commit message? I cannot see anything that has changed here.

Apart from that, this looks good.

Best,
-Michael

Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 11 Apr 2020, at 06:26, Erik Kapfer <ummeegge@ipfire.org> wrote:
> 
> Fixes #12356
> 
> Several fixes but also new features has been added with this version.
> Full changelog can be found in here --> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08 .
> 
> Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> ---
> config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++------------
> lfs/borgbackup                       |  8 ++++----
> 2 files changed, 26 insertions(+), 16 deletions(-)
> 
> 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 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
> #                                                                             #
> # 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 @@
> 
> include Config
> 
> -VER        = 1.1.9
> +VER        = 1.1.11
> 
> THISAPP    = borgbackup-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = borgbackup
> -PAK_VER    = 3
> +PAK_VER    = 4
> 
> DEPS       = python3-llfuse python3-msgpack
> 
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836
> +$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
> 
> install : $(TARGET)
> 
> -- 
> 2.12.2
>
ummeegge April 11, 2020, 9:56 a.m. UTC | #2 
Hi Michael,
the last line was 

pkg_resources.DistributionNotFound: The ‘msgpack-python!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,!=0.5.4,!=0.5.5,<=0.5.6,>=0.4.6’ distribution was not found and is required by borgbackup

so the dependecy 'msgpack-python' could not be found by the system even it was properly installed

the full error can be found in here -->
https://community.ipfire.org/t/borgbackup-msgpack-dependency/1855/3

have checked it first with Core 136 where borgback runs without
problems but after the installation on a Core 142 system i got the same
error as the user mtb. Made then an update but bumbped also the PAK_VER
and borgback comes back to life again.

Best,

Erik

Am Samstag, den 11.04.2020, 09:57 +0100 schrieb Michael Tremer:
> Hi Erik,
> 
> What is the DEP error you are referring to in the commit message? I
> cannot see anything that has changed here.
> 
> Apart from that, this looks good.
> 
> Best,
> -Michael
> 
> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
> 
> > On 11 Apr 2020, at 06:26, Erik Kapfer <ummeegge@ipfire.org> wrote:
> > 
> > Fixes #12356
> > 
> > Several fixes but also new features has been added with this
> > version.
> > Full changelog can be found in here --> 
> > https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08
> >  .
> > 
> > Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> > ---
> > config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++---
> > ---------
> > lfs/borgbackup                       |  8 ++++----
> > 2 files changed, 26 insertions(+), 16 deletions(-)
> > 
> > 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 @@
> > ###################################################################
> > ############
> > #                                                                  
> >            #
> > # IPFire.org - A linux based
> > firewall                                         #
> > -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>         
> >             #
> > +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>         
> >             #
> > #                                                                  
> >            #
> > # 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 @@
> > 
> > include Config
> > 
> > -VER        = 1.1.9
> > +VER        = 1.1.11
> > 
> > THISAPP    = borgbackup-$(VER)
> > DL_FILE    = $(THISAPP).tar.gz
> > @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> > DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > TARGET     = $(DIR_INFO)/$(THISAPP)
> > PROG       = borgbackup
> > -PAK_VER    = 3
> > +PAK_VER    = 4
> > 
> > DEPS       = python3-llfuse python3-msgpack
> > 
> > @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> > 
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > 
> > -$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836
> > +$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
> > 
> > install : $(TARGET)
> > 
> > -- 
> > 2.12.2
> > 
> 
>
Jonatan Schlag April 24, 2020, 2:12 p.m. UTC | #3 
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 <jonatan.schlag@ipfire.org>

Am Samstag, den 11.04.2020, 07:26 +0200 schrieb Erik Kapfer:
> Fixes #12356
> 
> Several fixes but also new features has been added with this version.
> Full changelog can be found in here --> 
> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08
> .
> 
> Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> ---
>  config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++--
> ----------
>  lfs/borgbackup                       |  8 ++++----
>  2 files changed, 26 insertions(+), 16 deletions(-)
> 
> 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 @@
>  ####################################################################
> ###########
>  #                                                                   
>           #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>           
>           #
> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>           
>           #
>  #                                                                   
>           #
>  # 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 @@
>  
>  include Config
>  
> -VER        = 1.1.9
> +VER        = 1.1.11
>  
>  THISAPP    = borgbackup-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = borgbackup
> -PAK_VER    = 3
> +PAK_VER    = 4
>  
>  DEPS       = python3-llfuse python3-msgpack
>  
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836
> +$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
>  
>  install : $(TARGET)
>
diff mbox series

Patch

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 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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 @@ 
 
 include Config
 
-VER        = 1.1.9
+VER        = 1.1.11
 
 THISAPP    = borgbackup-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = borgbackup
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = python3-llfuse python3-msgpack
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836
+$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
 
 install : $(TARGET)