summaryrefslogtreecommitdiff
path: root/package/openssl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-08-15 12:26:22 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-08-15 12:26:22 +0200
commit15fa797d71e47fc936cd0a9bca8207ba7a3c8a81 (patch)
treee0c63ab4d25889f24f8e5b71bce8ab0080ea6f8c /package/openssl
parent6b3ceb6798879b655f2233abe484906365172e31 (diff)
fix openssl musl compile, use TERMIOS
Diffstat (limited to 'package/openssl')
-rw-r--r--package/openssl/Makefile8
-rw-r--r--package/openssl/patches/patch-Configure4
-rw-r--r--package/openssl/patches/patch-crypto_ui_ui_openssl_c15
3 files changed, 21 insertions, 6 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index d5accbb52..cbc3460c4 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 1.0.1c
-PKG_RELEASE:= 4
-PKG_MD5SUM:= ae412727c8c15b67880aef7bd2999b2e
+PKG_VERSION:= 1.0.1e
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 66bf6f10f060d561929de96f9dfe5b8c
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
@@ -83,7 +83,7 @@ do-build:
OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
all build-shared
-post-install:
+libopenssl-install:
${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index d5ec7cc28..808662d33 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -4,8 +4,8 @@
"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
-+"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-embedded","gcc:-DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
# Android: linux-* but without -DTERMIO and pointers to headers and libs.
"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/package/openssl/patches/patch-crypto_ui_ui_openssl_c b/package/openssl/patches/patch-crypto_ui_ui_openssl_c
new file mode 100644
index 000000000..f9e3a7069
--- /dev/null
+++ b/package/openssl/patches/patch-crypto_ui_ui_openssl_c
@@ -0,0 +1,15 @@
+--- openssl-1.0.1c.orig/crypto/ui/ui_openssl.c 2012-02-12 00:38:49.000000000 +0100
++++ openssl-1.0.1c/crypto/ui/ui_openssl.c 2013-08-15 12:11:24.652833590 +0200
+@@ -184,12 +184,6 @@
+ # undef SGTTY
+ #endif
+
+-#if defined(linux) && !defined(TERMIO)
+-# undef TERMIOS
+-# define TERMIO
+-# undef SGTTY
+-#endif
+-
+ #ifdef _LIBC
+ # undef TERMIOS
+ # define TERMIO