From 8108aba4c19baca1fe3919830219c460d9247cfe Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 14 Sep 2018 22:16:09 +0200 Subject: [PATCH] openssl: Fix broken Configuration patch --- packages/openssl/Configurations-15-android.conf.patch | 8 ++++---- packages/openssl/build.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/openssl/Configurations-15-android.conf.patch b/packages/openssl/Configurations-15-android.conf.patch index 1e8c029b04..cabdfa8001 100644 --- a/packages/openssl/Configurations-15-android.conf.patch +++ b/packages/openssl/Configurations-15-android.conf.patch @@ -21,12 +21,12 @@ diff -u -r ../openssl-1.1.1-pre9/Configurations/15-android.conf ./Configurations # inherit_from => [ "android", asm("armv4_asm") ], - bn_ops => add("RC4_CHAR"), -+ bn_ops => add("BN_LLONG RC4_CHAR"), ++ bn_ops => "BN_LLONG RC4_CHAR", }, "android-arm64" => { inherit_from => [ "android", asm("aarch64_asm") ], - bn_ops => add("RC4_CHAR"), -+ bn_ops => add("SIXTY_FOUR_BIT_LONG RC4_CHAR"), ++ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", perlasm_scheme => "linux64", }, @@ -35,13 +35,13 @@ diff -u -r ../openssl-1.1.1-pre9/Configurations/15-android.conf ./Configurations inherit_from => [ "android", asm("x86_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), - bn_ops => add("RC4_INT"), -+ bn_ops => add("BN_LLONG RC4_INT"), ++ bn_ops => "BN_LLONG RC4_INT", perlasm_scheme => "android", }, "android-x86_64" => { inherit_from => [ "android", asm("x86_64_asm") ], - bn_ops => add("RC4_INT"), -+ bn_ops => add("SIXTY_FOUR_BIT_LONG RC4_INT"), ++ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_INT", perlasm_scheme => "elf", }, diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index 6cbfac1659..948bf964a1 100755 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -2,6 +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_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"