From 0ca5137581994ea3247d601156b20f7e2b052287 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 1 Mar 2019 21:36:01 +0100 Subject: [PATCH] openssl: Update from 1.1.1a to 1.1.1b --- packages/openssl/apps-ocsp.c.patch | 17 ++++++++--------- packages/openssl/build.sh | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/openssl/apps-ocsp.c.patch b/packages/openssl/apps-ocsp.c.patch index 67830f394..cdad42a89 100644 --- a/packages/openssl/apps-ocsp.c.patch +++ b/packages/openssl/apps-ocsp.c.patch @@ -1,12 +1,11 @@ -diff -u -r ../openssl-1.1.1-pre8/apps/ocsp.c ./apps/ocsp.c ---- ../openssl-1.1.1-pre8/apps/ocsp.c 2018-06-20 14:48:09.000000000 +0000 -+++ ./apps/ocsp.c 2018-08-17 21:17:37.915758081 +0000 -@@ -37,7 +37,7 @@ - # include +diff -u -r ../openssl-1.1.1b/apps/ocsp.c ./apps/ocsp.c +--- ../openssl-1.1.1b/apps/ocsp.c 2019-02-26 14:15:30.000000000 +0000 ++++ ./apps/ocsp.c 2019-03-01 20:32:41.429610048 +0000 +@@ -51,6 +51,7 @@ + #endif - # if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \ -- && !defined(OPENSSL_NO_POSIX_IO) -+ && !defined(OPENSSL_NO_POSIX_IO) && !defined(__ANDROID__) + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ ++ && !defined(__ANDROID__) \ + && !defined(OPENSSL_NO_POSIX_IO) # define OCSP_DAEMON # include - # include diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index d3bce04d2..1539c4a0e 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -2,8 +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.1a -TERMUX_PKG_SHA256=fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41 +TERMUX_PKG_VERSION=1.1.1b +TERMUX_PKG_SHA256=5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b 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" TERMUX_PKG_BUILD_IN_SRC=yes