diff --git a/packages/openssl/apps-openssl.cnf.patch b/packages/openssl/apps-openssl.cnf.patch new file mode 100644 index 000000000..816a55b51 --- /dev/null +++ b/packages/openssl/apps-openssl.cnf.patch @@ -0,0 +1,21 @@ +See https://github.com/openssl/openssl/pull/7217 + +diff -u -r ../openssl-1.1.1/apps/openssl.cnf ./apps/openssl.cnf +--- ../openssl-1.1.1/apps/openssl.cnf 2018-09-11 12:48:20.000000000 +0000 ++++ ./apps/openssl.cnf 2018-09-20 21:25:38.970930892 +0000 +@@ -10,7 +10,6 @@ + # This definition stops the following lines choking if HOME isn't + # defined. + HOME = . +-RANDFILE = $ENV::HOME/.rnd + + # Extra OBJECT IDENTIFIER info: + #oid_file = $ENV::HOME/.oid +@@ -57,7 +56,6 @@ + # must be commented out to leave a V1 CRL + crl = $dir/crl.pem # The current CRL + private_key = $dir/private/cakey.pem# The private key +-RANDFILE = $dir/private/.rand # private random number file + + x509_extensions = usr_cert # The extensions to add to the cert + diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index b85aafbaa..238692323 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.1.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d 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" @@ -43,4 +43,6 @@ termux_step_make () { termux_step_make_install () { # "install_sw" instead of "install" to not install man pages: make -j 1 install_sw MANDIR=$TERMUX_PREFIX/share/man MANSUFFIX=.ssl + + cp apps/openssl.cnf $TERMUX_PREFIX/etc/tls/openssl.cnf } diff --git a/packages/openssl/openssl-tool.subpackage.sh b/packages/openssl/openssl-tool.subpackage.sh index 62ede318f..257ffd176 100644 --- a/packages/openssl/openssl-tool.subpackage.sh +++ b/packages/openssl/openssl-tool.subpackage.sh @@ -1,3 +1,4 @@ -TERMUX_SUBPKG_INCLUDE="bin" +TERMUX_SUBPKG_INCLUDE="bin etc/tls/openssl.cnf" TERMUX_SUBPKG_DESCRIPTION="The openssl command line cryptographic tool" TERMUX_SUBPKG_DEPENDS="openssl" +TERMUX_SUBPKG_CONFFILES="etc/tls/openssl.cnf"