diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index e9932ed8d..73d3cf401 100755 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssl.org/ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions" TERMUX_PKG_DEPENDS="ca-certificates" TERMUX_PKG_VERSION=1.0.2o -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" diff --git a/packages/openssl/e_os.h.patch b/packages/openssl/e_os.h.patch new file mode 100644 index 000000000..7246f098e --- /dev/null +++ b/packages/openssl/e_os.h.patch @@ -0,0 +1,23 @@ +diff -uNr openssl-1.0.2o/e_os.h openssl-1.0.2o.mod/e_os.h +--- openssl-1.0.2o/e_os.h 2018-03-27 16:54:46.000000000 +0300 ++++ openssl-1.0.2o.mod/e_os.h 2018-06-19 15:24:21.644044663 +0300 +@@ -90,7 +90,7 @@ + * sockets will be tried in the order listed in case accessing the device + * files listed in DEVRANDOM did not return enough entropy. + */ +-# define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy" ++# define DEVRANDOM_EGD "@TERMUX_PREFIX@/var/run/egd-pool","/dev/egd-pool","@TERMUX_PREFIX@/etc/egd-pool","@TERMUX_PREFIX@/etc/entropy" + # endif + + # if defined(OPENSSL_SYS_VXWORKS) +@@ -723,6 +723,10 @@ + # define NO_SYSLOG + # endif + ++#ifdef __ANDROID__ ++# define NO_SYSLOG ++#endif ++ + /* vxworks */ + # if defined(OPENSSL_SYS_VXWORKS) + # include diff --git a/packages/openssl/no_syslog.patch b/packages/openssl/no_syslog.patch deleted file mode 100644 index 853b98b09..000000000 --- a/packages/openssl/no_syslog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r ../openssl-1.0.1f/e_os.h ./e_os.h ---- ../openssl-1.0.1f/e_os.h 2014-01-06 14:47:42.000000000 +0100 -+++ ./e_os.h 2014-02-19 01:38:25.000000000 +0100 -@@ -691,6 +691,10 @@ - # define NO_SYSLOG - #endif - -+#ifdef __ANDROID__ -+# define NO_SYSLOG -+#endif -+ - /* vxworks */ - #if defined(OPENSSL_SYS_VXWORKS) - #include