From 4b8ab7392b8ef0f9d9dcec81a150b77a69fa3a58 Mon Sep 17 00:00:00 2001 From: Robert Schade Date: Sat, 25 Nov 2017 20:12:52 +0100 Subject: [PATCH] openssl path --- README.md | 8 ++++---- borg.patch | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b302e89..3d91581 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ How to use: - (if virtualenv for python does not work properly you have to set selinux to permissive (do "/system/bin/setenforce 0" with root permissions)) Tested with: -- termux 0.53 -- borg 1.0.12 +- termux 0.54 +- borg 1.1.0 Tested and working so far is: - creation of repositories @@ -23,8 +23,8 @@ Tested and working so far is: - backup up to remote repositories via ssh Tested and working on devices: -- Huawei Nexus6p with stock Android 7.1.2 (angler, aarch64) -- Samsung Galaxy Note 2 with Lineage 14.1 (n7100, armv7l) +- Huawei Nexus6p with stock Android 8.0.0 (angler, aarch64) +- Samsung Galaxy Note 2 with Lineage 14.1 (n7100, armv7l, only tested with borg 1.0) Feedback on tests with other devices and android versions is very welcome. diff --git a/borg.patch b/borg.patch index 3bb7fff..1173270 100644 --- a/borg.patch +++ b/borg.patch @@ -20,4 +20,12 @@ index 33116acd..40db200f 100644 if os.environ.get('BORG_LZ4_PREFIX'): possible_lz4_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX')) lz4_prefix = detect_lz4(possible_lz4_prefixes) - +@@ -161,7 +161,7 @@ def detect_libb2(prefixes): + crypto_libraries = ['crypto'] + + possible_openssl_prefixes = ['/usr', '/usr/local', '/usr/local/opt/openssl', '/usr/local/ssl', '/usr/local/openssl', +- '/usr/local/borg', '/opt/local', '/opt/pkg', ] ++ '/usr/local/borg', '/opt/local', '/opt/pkg', '/data/data/com.termux/files/usr/'] + if os.environ.get('BORG_OPENSSL_PREFIX'): + possible_openssl_prefixes.insert(0, os.environ.get('BORG_OPENSSL_PREFIX')) + ssl_prefix = detect_openssl(possible_openssl_prefixes)