diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index 4459f19be..2db572e9e 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -2,9 +2,8 @@ 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_LICENSE="BSD" TERMUX_PKG_DEPENDS="ca-certificates" -TERMUX_PKG_VERSION=1.1.1b -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SHA256=5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b +TERMUX_PKG_VERSION=1.1.1c +TERMUX_PKG_SHA256=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz TERMUX_PKG_CONFFILES="etc/tls/openssl.cnf" 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 index 2d5b44969..26ee3d7a1 100644 --- a/packages/openssl/e_os.h.patch +++ b/packages/openssl/e_os.h.patch @@ -1,12 +1,12 @@ -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 @@ +diff -u -r ../openssl-1.1.1c/e_os.h ./e_os.h +--- ../openssl-1.1.1c/e_os.h 2019-05-28 13:12:21.000000000 +0000 ++++ ./e_os.h 2019-05-29 20:59:46.153243395 +0000 +@@ -38,7 +38,7 @@ * sockets will be tried in the order listed in case accessing the device - * files listed in DEVRANDOM did not return enough entropy. + * files listed in DEVRANDOM did not return enough randomness. */ --# 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" +-# 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) + # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)