From 7f7910508b630792a034531ade80307cd2536542 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 27 Nov 2017 14:52:26 +0100 Subject: [PATCH] Remove disabled-packages/openssl-1.1 --- disabled-packages/openssl-1.1/build.sh | 53 ---------------------- disabled-packages/openssl-1.1/no_syslog.patch | 14 ------ .../openssl-1.1/openssl-tool.subpackage.sh | 3 -- 3 files changed, 70 deletions(-) delete mode 100755 disabled-packages/openssl-1.1/build.sh delete mode 100644 disabled-packages/openssl-1.1/no_syslog.patch delete mode 100644 disabled-packages/openssl-1.1/openssl-tool.subpackage.sh diff --git a/disabled-packages/openssl-1.1/build.sh b/disabled-packages/openssl-1.1/build.sh deleted file mode 100755 index dafa29da..00000000 --- a/disabled-packages/openssl-1.1/build.sh +++ /dev/null @@ -1,53 +0,0 @@ -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.0e -TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=57be8618979d80c910728cfc99369bf97b2a1abd8f366ab6ebdee8975ad3874c -TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" -TERMUX_PKG_BUILD_IN_SRC=yes -# Avoid assembly errors, see -# https://github.com/android-ndk/ndk/issues/144 -# https://github.com/openssl/openssl/issues/1498 -# May be fixed in later openssl version. -TERMUX_PKG_CLANG=no - -# Information about compilation and installation of openssl: -# http://wiki.openssl.org/index.php/Compilation_and_Installation - -termux_step_configure () { - #perl -p -i -e "s@TERMUX_CFLAGS@$CFLAGS@g" Configure - rm -Rf $TERMUX_PREFIX/lib/libcrypto.* $TERMUX_PREFIX/lib/libssl.* - - # See Configurations/10-main.conf - export CROSS_SYSROOT=$TERMUX_STANDALONE_TOOLCHAIN/sysroot - #export CROSS_COMPILE=${TERMUX_HOST_PLATFORM}- - - test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM="android-armeabi" - test $TERMUX_ARCH = "aarch64" && TERMUX_OPENSSL_PLATFORM="android64-aarch64" - test $TERMUX_ARCH = "i686" && TERMUX_OPENSSL_PLATFORM="android-x86" - test $TERMUX_ARCH = "x86_64" && TERMUX_OPENSSL_PLATFORM="android64" - - # If enabling zlib-dynamic we need "zlib-dynamic" instead of "no-comp no-dso": - ./Configure $TERMUX_OPENSSL_PLATFORM \ - --prefix=$TERMUX_PREFIX \ - --openssldir=$TERMUX_PREFIX/etc/tls \ - shared \ - no-comp \ - no-dso \ - no-ssl2 \ - no-hw \ - no-engine \ - no-psk \ - no-srp -} - -termux_step_make () { - make depend - make -j 1 all -} - -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 -} diff --git a/disabled-packages/openssl-1.1/no_syslog.patch b/disabled-packages/openssl-1.1/no_syslog.patch deleted file mode 100644 index 853b98b0..00000000 --- a/disabled-packages/openssl-1.1/no_syslog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r ../openssl-1.0.1f/e_os.h ./e_os.h ---- ../openssl-1.0.1f/e_os.h 2014-01-06 14:47:42.000000000 +0100 -+++ ./e_os.h 2014-02-19 01:38:25.000000000 +0100 -@@ -691,6 +691,10 @@ - # define NO_SYSLOG - #endif - -+#ifdef __ANDROID__ -+# define NO_SYSLOG -+#endif -+ - /* vxworks */ - #if defined(OPENSSL_SYS_VXWORKS) - #include diff --git a/disabled-packages/openssl-1.1/openssl-tool.subpackage.sh b/disabled-packages/openssl-1.1/openssl-tool.subpackage.sh deleted file mode 100644 index 62ede318..00000000 --- a/disabled-packages/openssl-1.1/openssl-tool.subpackage.sh +++ /dev/null @@ -1,3 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="bin" -TERMUX_SUBPKG_DESCRIPTION="The openssl command line cryptographic tool" -TERMUX_SUBPKG_DEPENDS="openssl" -- 2.11.0