diff --git a/0003-ability-to-unbundle-msgpack.patch b/0003-ability-to-unbundle-msgpack.patch index 53518b0..8113ecd 100644 --- a/0003-ability-to-unbundle-msgpack.patch +++ b/0003-ability-to-unbundle-msgpack.patch @@ -1,15 +1,15 @@ diff --git a/setup.py b/setup.py -index dd63695..3b92421 100644 +index 80267e8..164cabf 100644 --- a/setup.py +++ b/setup.py -@@ -26,6 +26,8 @@ prefer_system_libzstd = True - prefer_system_libb2 = True +@@ -26,6 +26,8 @@ prefer_system_libb2 = True + prefer_system_libxxhash = True # prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py. +prefer_system_msgpack = bool(os.environ.get('BORG_EXTERNAL_MSGPACK')) + - min_python = (3, 4) + min_python = (3, 5) my_python = sys.version_info @@ -38,6 +40,20 @@ if my_python < min_python: on_rtd = os.environ.get('READTHEDOCS') @@ -32,7 +32,7 @@ index dd63695..3b92421 100644 # note for package maintainers: if you package borgbackup for distribution, # please add llfuse as a *requirement* on all platforms that have a working -@@ -100,9 +116,9 @@ cython_c_sources = [ +@@ -88,9 +104,9 @@ cython_c_sources = [ cython_cpp_sources = [ # these .pyx will get compiled to .cpp @@ -44,7 +44,7 @@ index dd63695..3b92421 100644 try: from Cython.Distutils import build_ext -@@ -133,9 +149,12 @@ try: +@@ -121,9 +137,12 @@ try: 'src/borg/platform/syncfilerange.c', 'src/borg/platform/freebsd.c', 'src/borg/platform/darwin.c', @@ -59,7 +59,7 @@ index dd63695..3b92421 100644 super().make_distribution() except ImportError: -@@ -158,11 +177,15 @@ except ImportError: +@@ -146,11 +165,15 @@ except ImportError: msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp') msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp') @@ -78,8 +78,8 @@ index dd63695..3b92421 100644 raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.') -@@ -805,26 +828,29 @@ if not on_rtd: - system_prefix=libb2_prefix, system=libb2_system, +@@ -809,26 +832,29 @@ if not on_rtd: + system_prefix=libxxhash_prefix, system=libxxhash_system, **crypto_ext_kwargs) - msgpack_endian = '__BIG_ENDIAN__' if (sys.byteorder == 'big') else '__LITTLE_ENDIAN__' diff --git a/borgbackup-strip-llfuse-versions.patch b/borgbackup-strip-llfuse-versions.patch deleted file mode 100644 index 11e7e9d..0000000 --- a/borgbackup-strip-llfuse-versions.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://mail.python.org/pipermail/borgbackup/2020q4/001699.html -diff --git a/setup.py b/setup.py -index 44191cf..66b196a 100644 ---- a/setup.py -+++ b/setup.py -@@ -66,8 +66,7 @@ extras_require = { - # llfuse 1.3 (tested shortly, looks ok), needs FUSE version >= 2.8.0 - # llfuse 2.0 will break API - 'fuse': [ -- 'llfuse >=1.3.4, <1.3.7; python_version <"3.9"', # broken on py39 -- 'llfuse >=1.3.7, <2.0; python_version >="3.9"', # broken on freebsd -+ 'llfuse >=1.3.4, <2.0', - ], - } - diff --git a/borgbackup.spec b/borgbackup.spec index b9ee20e..3e52c14 100644 --- a/borgbackup.spec +++ b/borgbackup.spec @@ -7,7 +7,7 @@ %endif Name: %{srcname} -Version: 1.1.14 +Version: 1.1.15 Release: 1%{?dist} Summary: A deduplicating backup program with compression and authenticated encryption @@ -29,8 +29,6 @@ Source2: gpgkey-6D5B_EF9A_DD20_7580_5747_B70F_9F88_FB52_FAF7_B393.gpg Patch1: 0002-disable-sphinx-man-page-build.patch # ability not to build bundled msgpack Patch2: 0003-ability-to-unbundle-msgpack.patch -# https://mail.python.org/pipermail/borgbackup/2020q4/001699.html -Patch3: borgbackup-strip-llfuse-versions.patch BuildRequires: gnupg2 # build @@ -58,11 +56,12 @@ BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: gcc BuildRequires: openssl-devel >= 1.0.0 BuildRequires: fuse-devel +BuildRequires: make BuildRequires: libacl-devel BuildRequires: libb2-devel BuildRequires: lz4-devel >= 1.7.0 BuildRequires: libzstd-devel >= 1.3.0 -BuildRequires: make +BuildRequires: xxhash-devel >= 0.6.5 %if ! %bundle_msgpack Requires: python%{python3_pkgversion}-msgpack <= 0.5.6 @@ -71,16 +70,6 @@ Requires: python%{python3_pkgversion}-setuptools Requires: python%{python3_pkgversion}-llfuse >= 1.3.4 Requires: fuse -# xxHash: https://github.com/Cyan4973/xxHash -# license: 2-clause BSD (Fedora: BSD, SPDX: BSD-2-Clause) -# code was stripped a bit to only contain 64-bit functionality -# upstream justification for bundling: -# https://github.com/borgbackup/borg/pull/2580#issuecomment-305579398 -# upstream won't unbundle this for v1.1.x: -# https://github.com/borgbackup/borg/issues/4592#issuecomment-495951573 -# since borgbackup 1.1.11 the code needs at least xxHash >= 0.7.2 -Provides: bundled(xxHash) = 0.7.4 - %description BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it supports compression and authenticated encryption. @@ -185,6 +174,9 @@ py.test-3 -x -vk "$TEST_SELECTOR" $PYTHONPATH/borg/testsuite/*.py %changelog +* Fri Dec 25 2020 Felix Schwarz - 1.1.15-1 +- update to 1.1.15 + * Thu Oct 08 2020 Felix Schwarz - 1.1.14-1 - update to 1.1.14 diff --git a/sources b/sources index ed3c784..10020c9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (borgbackup-1.1.14.tar.gz) = 2aae851d38ec2431cd09f9390b3afa41ec44c2891a3698b01f036cebc5b64d7b7f328d7c95bf30fc29016b4bd2d2ada2613f895091e22148f3d4861f4facd35f -SHA512 (borgbackup-1.1.14.tar.gz.asc) = 596aae46fdb523e7df296d880ee843f369834e6ee033167c57a9e637def6307d1e708396d6d9e9a05f265eb3b416bd278a9a40d4fdc83f89abe41047d894a335 +SHA512 (borgbackup-1.1.15.tar.gz) = db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3 +SHA512 (borgbackup-1.1.15.tar.gz.asc) = 59644b93b2f2305d592806fc3e3ee9cd11cc19b37ec04d18f611853931515a1b6f73fb895dac8d16f2b7aa7d9d747b695febb44755e0d555cf86d2b5ec0af263