Hello community,
here is the log from the commit of package borgbackup for openSUSE:Factory checked in at 2018-03-02 21:12:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/borgbackup (Old)
and /work/SRC/openSUSE:Factory/.borgbackup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgbackup"
Fri Mar 2 21:12:38 2018 rev:12 rq:581926 version:1.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/borgbackup/borgbackup.changes 2018-02-01 21:30:01.951266225 +0100
+++ /work/SRC/openSUSE:Factory/.borgbackup.new/borgbackup.changes 2018-03-02 21:12:43.858733932 +0100
@@ -1,0 +2,15 @@
+Thu Mar 1 17:38:49 UTC 2018 - alarrosa@suse.com
+
+- Add patch to require the new msgpack python module in Tumbleweed
+ instead of the deprecated msgpack-python python module:
+ * fix-msgpack-requirement.patch
+
+-------------------------------------------------------------------
+Tue Feb 27 15:28:58 UTC 2018 - jacobwinski@gmail.com
+
+- Add patch borgbackup-1.1.4-binary-content-checks.patch:
+ * Fixes build failure due to bad encoding
+ * Based on upstream commit 9cf8d57 "do .h file content checks in binary mode"
+ * This patch will no longer be needed with borgbackup > 1.1.4
+
+-------------------------------------------------------------------
New:
----
borgbackup-1.1.4-binary-content-checks.patch
fix-msgpack-requirement.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ borgbackup.spec ++++++
--- /var/tmp/diff_new_pack.cZllNr/_old 2018-03-02 21:12:44.802699987 +0100
+++ /var/tmp/diff_new_pack.cZllNr/_new 2018-03-02 21:12:44.806699843 +0100
@@ -25,6 +25,10 @@
Group: Productivity/Archiving/Backup
Url: https://github.com/borgbackup/borg
Source: https://github.com/borgbackup/borg/releases/download/%{version}/borgbackup-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM borgbackup-1.1.4-binary-content-checks.patch gh#borgbackup/borg#3544
+# Already applied upstream, this patch will not be needed in borgbackup > 1.1.4
+Patch0: borgbackup-1.1.4-binary-content-checks.patch
+Patch1: fix-msgpack-requirement.patch
BuildRequires: libacl-devel
%if 0%{?suse_version} >= 1500
BuildRequires: liblz4-devel >= 1.7.0
@@ -39,7 +43,12 @@
%if 0%{?suse_version} >= 1500
BuildRequires: python3-guzzle_sphinx_theme
%endif
+%if 0%{?suse_version} > 1500
+BuildRequires: python3-msgpack >= 0.4.6
+%else
BuildRequires: python3-msgpack-python >= 0.4.6
+%endif
+
# testing requirements
BuildRequires: bash
%if 0%{?sle_version} == 120200
@@ -51,7 +60,11 @@
BuildRequires: python3-setuptools_scm
BuildRequires: python3-sphinx_rtd_theme
BuildRequires: zsh
+%if 0%{?suse_version} > 1500
+Requires: python3-msgpack >= 0.4.6
+%else
Requires: python3-msgpack-python >= 0.4.6
+%endif
# weak dependencies
Recommends: python3-llfuse
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -115,6 +128,10 @@
%prep
%setup -q
+%patch0 -p1
+%if 0%{?suse_version} > 1500
+%patch1 -p1
+%endif
# a single test is failing: test_non_ascii_acl - which is a rather esoteric check
# that cannot be tripped with openSUSE, because user- and group-ids have to be
# 7-bit ascii clean, and the test involves in setting an acl for an utf-8 encoded
++++++ borgbackup-1.1.4-binary-content-checks.patch ++++++
diff -rupN a/setup_b2.py b/setup_b2.py
--- a/setup_b2.py 2017-12-30 04:14:25.000000000 -0500
+++ b/setup_b2.py 2018-02-27 09:32:05.436199491 -0500
@@ -24,8 +24,8 @@ def b2_system_prefix(prefixes):
for prefix in prefixes:
filename = os.path.join(prefix, 'include', 'blake2.h')
if os.path.exists(filename):
- with open(filename, 'r') as fd:
- if 'blake2b_init' in fd.read():
+ with open(filename, 'rb') as fd:
+ if b'blake2b_init' in fd.read():
return prefix
diff -rupN a/setup_lz4.py b/setup_lz4.py
--- a/setup_lz4.py 2017-12-30 04:14:25.000000000 -0500
+++ b/setup_lz4.py 2018-02-27 09:32:26.040150097 -0500
@@ -24,8 +24,8 @@ def lz4_system_prefix(prefixes):
for prefix in prefixes:
filename = os.path.join(prefix, 'include', 'lz4.h')
if os.path.exists(filename):
- with open(filename, 'r') as fd:
- if 'LZ4_compress_default' in fd.read(): # requires lz4 >= 1.7.0 (r129)
+ with open(filename, 'rb') as fd:
+ if b'LZ4_compress_default' in fd.read(): # requires lz4 >= 1.7.0 (r129)
return prefix
diff -rupN a/setup.py b/setup.py
--- a/setup.py 2017-12-30 04:14:25.000000000 -0500
+++ b/setup.py 2018-02-27 09:31:35.968272628 -0500
@@ -145,8 +145,8 @@ def detect_openssl(prefixes):
for prefix in prefixes:
filename = os.path.join(prefix, 'include', 'openssl', 'evp.h')
if os.path.exists(filename):
- with open(filename, 'r') as fd:
- if 'PKCS5_PBKDF2_HMAC(' in fd.read():
+ with open(filename, 'rb') as fd:
+ if b'PKCS5_PBKDF2_HMAC(' in fd.read():
return prefix
diff -rupN a/setup_zstd.py b/setup_zstd.py
--- a/setup_zstd.py 2017-12-30 04:14:25.000000000 -0500
+++ b/setup_zstd.py 2018-02-27 09:32:44.264114280 -0500
@@ -66,8 +66,8 @@ def zstd_system_prefix(prefixes):
for prefix in prefixes:
filename = os.path.join(prefix, 'include', 'zstd.h')
if os.path.exists(filename):
- with open(filename, 'r') as fd:
- if 'ZSTD_getFrameContentSize' in fd.read(): # checks for zstd >= 1.3.0
+ with open(filename, 'rb') as fd:
+ if b'ZSTD_getFrameContentSize' in fd.read(): # checks for zstd >= 1.3.0
return prefix
++++++ fix-msgpack-requirement.patch ++++++
From: Antonio Larrosa