Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (019557f9ab779103789d3bf545847f0dad928e9b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (019557f9ab779103789d3bf545847f0dad928e9b)
  • Date: Fri, 9 Feb 2018 22:54:44 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:


python-pypi/borgbackup/0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch
| 77 ++++++++++
python-pypi/borgbackup/HISTORY
| 4
python-pypi/borgbackup/PRE_BUILD
| 3
3 files changed, 84 insertions(+)

New commits:
commit 019557f9ab779103789d3bf545847f0dad928e9b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/borgbackup: fix build with lz4 1.8

diff --git
a/python-pypi/borgbackup/0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch

b/python-pypi/borgbackup/0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch
new file mode 100644
index 0000000..8972cbd
--- /dev/null
+++
b/python-pypi/borgbackup/0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch
@@ -0,0 +1,77 @@
+From 9cf8d57f51738bcc570d042192cacb6a83039865 Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw AT waldmann-edv.de>
+Date: Sat, 27 Jan 2018 19:49:42 +0100
+Subject: [PATCH] do .h file content checks in binary mode, fixes #3544
+
+we can't know the encoding header file authors will use,
+so using binary for our simple checks is the safest way.
+---
+ setup.py | 4 ++--
+ setup_b2.py | 4 ++--
+ setup_lz4.py | 4 ++--
+ setup_zstd.py | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index a81100df..e7dd05cc 100644
+--- a/setup.py
++++ b/setup.py
+@@ -149,8 +149,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 --git a/setup_b2.py b/setup_b2.py
+index e69e0cdf..e775d9b7 100644
+--- a/setup_b2.py
++++ b/setup_b2.py
+@@ -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 --git a/setup_lz4.py b/setup_lz4.py
+index 6e6c63f8..e6d0ddb4 100644
+--- a/setup_lz4.py
++++ b/setup_lz4.py
+@@ -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 --git a/setup_zstd.py b/setup_zstd.py
+index bf23cb58..f796c35f 100644
+--- a/setup_zstd.py
++++ b/setup_zstd.py
+@@ -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
+
+
+--
+2.16.1
+
diff --git a/python-pypi/borgbackup/HISTORY b/python-pypi/borgbackup/HISTORY
index 639489c..81cea08 100644
--- a/python-pypi/borgbackup/HISTORY
+++ b/python-pypi/borgbackup/HISTORY
@@ -1,3 +1,7 @@
+2018-02-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD,
0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch:
+ fix build with lz4 1.8
+
2017-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.4
* DEPENDS: add dependency on zstd
diff --git a/python-pypi/borgbackup/PRE_BUILD
b/python-pypi/borgbackup/PRE_BUILD
index 03dc5a5..a261886 100755
--- a/python-pypi/borgbackup/PRE_BUILD
+++ b/python-pypi/borgbackup/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build
cd $SOURCE_DIRECTORY &&
+
+patch -p1 <
"$SPELL_DIRECTORY/0001-do-.h-file-content-checks-in-binary-mode-fixes-3544.patch"
&&
+
sed -i 's/_scm//' setup.py



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (019557f9ab779103789d3bf545847f0dad928e9b), Florian Franzmann, 02/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page