mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Thomas Waldmann 2018-01-27 19:49:42 +01:00
parent 208ff77ddd
commit 9cf8d57f51
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -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

4
setup_b2.py
View File

@ -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

4
setup_lz4.py
View File

@ -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

4
setup_zstd.py
View File

@ -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