From 9a91bb20cc0a008784b2b8b30afd7e2aab9f7bf3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 18 Jan 2020 11:47:26 +0100 Subject: [PATCH] Use '_1_1.so' suffix for dynamic libs of android-*-openssl * Avoid loading system OpenSSL libraries * In accordance with qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.html and https://github.com/KDAB/android_openssl --- openssl/android-aarch64/PKGBUILD | 11 ++++++----- openssl/android-armv7a-eabi/PKGBUILD | 11 ++++++----- openssl/android-x86-64/PKGBUILD | 11 ++++++----- openssl/android-x86/PKGBUILD | 11 ++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/openssl/android-aarch64/PKGBUILD b/openssl/android-aarch64/PKGBUILD index 213514c5..4dda4e90 100644 --- a/openssl/android-aarch64/PKGBUILD +++ b/openssl/android-aarch64/PKGBUILD @@ -3,7 +3,6 @@ _pkg_arch=aarch64 _android_arch=arm64-v8a -_android_platform=22 # https://developer.android.com/about/dashboards/ _android_platform_arch=arch-arm64 _pkgname=openssl _ver=1.1.1d @@ -11,7 +10,7 @@ _ver=1.1.1d pkgname=android-$_pkg_arch-$_pkgname # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 +pkgrel=2 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)" arch=('any') url='https://www.openssl.org' @@ -38,7 +37,7 @@ build() { ./Configure \ --prefix="${ANDROID_PREFIX}" \ --openssldir="${ANDROID_PREFIX}" \ - -D__ANDROID_API__=$_android_platform \ + -D__ANDROID_API__="${ANDROID_MINIMUM_PLATFORM}" \ -Wl,--no-allow-shlib-undefined \ -Wl,--no-undefined \ no-stdio \ @@ -51,8 +50,10 @@ build() { sed -i -e 's/\#define TEST_ENG_OPENSSL_RC4_P_INIT//' crypto/engine/eng_openssl.c # build only libraries + # note: Setting SHLIB_EXT in accordance with qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp to avoid loading + # system library. make depend - make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=.so build_libs + make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs } package() { @@ -61,7 +62,7 @@ package() { export PATH="$ANDROID_TOOLCHAIN:$PATH" # install header files, libraries and license - for lib in libcrypto.{a,so} libssl.{a,so}; do + for lib in libcrypto{.a,_1_1.so} libssl{.a,_1_1.so}; do install -D -m0644 $lib "$pkgdir/${ANDROID_PREFIX_LIB}/$lib" done for pc in libcrypto.pc libssl.pc openssl.pc; do diff --git a/openssl/android-armv7a-eabi/PKGBUILD b/openssl/android-armv7a-eabi/PKGBUILD index 3680f358..61983928 100644 --- a/openssl/android-armv7a-eabi/PKGBUILD +++ b/openssl/android-armv7a-eabi/PKGBUILD @@ -3,7 +3,6 @@ _pkg_arch=armv7a-eabi _android_arch=armeabi-v7a -_android_platform=21 # https://developer.android.com/about/dashboards/ _android_platform_arch=arch-arm _pkgname=openssl _ver=1.1.1d @@ -11,7 +10,7 @@ _ver=1.1.1d pkgname=android-$_pkg_arch-$_pkgname # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 +pkgrel=2 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)" arch=('any') url='https://www.openssl.org' @@ -38,7 +37,7 @@ build() { ./Configure \ --prefix="${ANDROID_PREFIX}" \ --openssldir="${ANDROID_PREFIX}" \ - -D__ANDROID_API__=$_android_platform \ + -D__ANDROID_API__="${ANDROID_MINIMUM_PLATFORM}" \ -Wl,--no-allow-shlib-undefined \ -Wl,--no-undefined \ no-stdio \ @@ -51,8 +50,10 @@ build() { sed -i -e 's/\#define TEST_ENG_OPENSSL_RC4_P_INIT//' crypto/engine/eng_openssl.c # build only libraries + # note: Setting SHLIB_EXT in accordance with qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp to avoid loading + # system library. make depend - make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=.so build_libs + make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs } package() { @@ -61,7 +62,7 @@ package() { export PATH="$ANDROID_TOOLCHAIN:$PATH" # install header files, libraries and license - for lib in libcrypto.{a,so} libssl.{a,so}; do + for lib in libcrypto{.a,_1_1.so} libssl{.a,_1_1.so}; do install -D -m0644 $lib "$pkgdir/${ANDROID_PREFIX_LIB}/$lib" done for pc in libcrypto.pc libssl.pc openssl.pc; do diff --git a/openssl/android-x86-64/PKGBUILD b/openssl/android-x86-64/PKGBUILD index 21ec5568..e3645734 100644 --- a/openssl/android-x86-64/PKGBUILD +++ b/openssl/android-x86-64/PKGBUILD @@ -3,7 +3,6 @@ _pkg_arch=x86-64 _android_arch=x86_64 -_android_platform=22 # https://developer.android.com/about/dashboards/ _android_platform_arch=arch-x86_64 _pkgname=openssl _ver=1.1.1d @@ -11,7 +10,7 @@ _ver=1.1.1d pkgname=android-$_pkg_arch-$_pkgname # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 +pkgrel=2 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)" arch=('any') url='https://www.openssl.org' @@ -38,7 +37,7 @@ build() { ./Configure \ --prefix="${ANDROID_PREFIX}" \ --openssldir="${ANDROID_PREFIX}" \ - -D__ANDROID_API__=$_android_platform \ + -D__ANDROID_API__="${ANDROID_MINIMUM_PLATFORM}" \ -Wl,--no-allow-shlib-undefined \ -Wl,--no-undefined \ no-stdio \ @@ -51,8 +50,10 @@ build() { sed -i -e 's/\#define TEST_ENG_OPENSSL_RC4_P_INIT//' crypto/engine/eng_openssl.c # build only libraries + # note: Setting SHLIB_EXT in accordance with qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp to avoid loading + # system library. make depend - make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=.so build_libs + make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs } package() { @@ -61,7 +62,7 @@ package() { export PATH="$ANDROID_TOOLCHAIN:$PATH" # install header files, libraries and license - for lib in libcrypto.{a,so} libssl.{a,so}; do + for lib in libcrypto{.a,_1_1.so} libssl{.a,_1_1.so}; do install -D -m0644 $lib "$pkgdir/${ANDROID_PREFIX_LIB}/$lib" done for pc in libcrypto.pc libssl.pc openssl.pc; do diff --git a/openssl/android-x86/PKGBUILD b/openssl/android-x86/PKGBUILD index 76fd4d2f..90215b1f 100644 --- a/openssl/android-x86/PKGBUILD +++ b/openssl/android-x86/PKGBUILD @@ -3,7 +3,6 @@ _pkg_arch=x86 _android_arch=x86 -_android_platform=22 # https://developer.android.com/about/dashboards/ _android_platform_arch=arch-x86 _pkgname=openssl _ver=1.1.1d @@ -11,7 +10,7 @@ _ver=1.1.1d pkgname=android-$_pkg_arch-$_pkgname # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 +pkgrel=2 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)" arch=('any') url='https://www.openssl.org' @@ -38,7 +37,7 @@ build() { ./Configure \ --prefix="${ANDROID_PREFIX}" \ --openssldir="${ANDROID_PREFIX}" \ - -D__ANDROID_API__=$_android_platform \ + -D__ANDROID_API__="${ANDROID_MINIMUM_PLATFORM}" \ -Wl,--no-allow-shlib-undefined \ -Wl,--no-undefined \ no-stdio \ @@ -51,8 +50,10 @@ build() { sed -i -e 's/\#define TEST_ENG_OPENSSL_RC4_P_INIT//' crypto/engine/eng_openssl.c # build only libraries + # note: Setting SHLIB_EXT in accordance with qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp to avoid loading + # system library. make depend - make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=.so build_libs + make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs } package() { @@ -61,7 +62,7 @@ package() { export PATH="$ANDROID_TOOLCHAIN:$PATH" # install header files, libraries and license - for lib in libcrypto.{a,so} libssl.{a,so}; do + for lib in libcrypto{.a,_1_1.so} libssl{.a,_1_1.so}; do install -D -m0644 $lib "$pkgdir/${ANDROID_PREFIX_LIB}/$lib" done for pc in libcrypto.pc libssl.pc openssl.pc; do