summaryrefslogtreecommitdiff
path: root/package/openssl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-07-08 12:52:24 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-07-09 22:35:45 +0200
commitf51f082b1fca89149c25452443b27ca6d8d46209 (patch)
treeb4f2804614d4705805fd3d70c02224df6745b2d9 /package/openssl
parent2dd4a46a9ffb82ffeacea8ee27d74543fdd3cbb1 (diff)
remove wrong patch, enable ssh client for git
Diffstat (limited to 'package/openssl')
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/openssl/patches/patch-Makefile96
2 files changed, 2 insertions, 98 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 9c8dc66a0..f0fa4e9d8 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openssl
PKG_VERSION:= 1.0.1h
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8d6d684a9430d5cc98a62a5d8fbda8cf
PKG_DESCR:= secure socket layer libraries
PKG_SECTION:= libs/crypto
@@ -69,7 +69,7 @@ do-configure:
--prefix=/usr \
--openssldir=/etc/ssl \
-I$(STAGING_TARGET_DIR)/usr/include \
- -L$(STAGING_TARGET_DIR)/usr/lib -ldl \
+ -L$(STAGING_TARGET_DIR)/usr/lib \
-DOPENSSL_SMALL_FOOTPRINT \
$(OPENSSL_OPTIONS) \
);
diff --git a/package/openssl/patches/patch-Makefile b/package/openssl/patches/patch-Makefile
deleted file mode 100644
index 26e7be2f2..000000000
--- a/package/openssl/patches/patch-Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
---- openssl-1.0.1e.orig/Makefile 2013-02-11 16:26:04.000000000 +0100
-+++ openssl-1.0.1e/Makefile 2013-08-17 16:07:12.622613083 +0200
-@@ -11,11 +11,11 @@ SHLIB_VERSION_NUMBER=1.0.0
- SHLIB_VERSION_HISTORY=
- SHLIB_MAJOR=1
- SHLIB_MINOR=0.0
--SHLIB_EXT=
--PLATFORM=dist
--OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-zlib no-zlib-dynamic static-engine
--CONFIGURE_ARGS=dist
--SHLIB_TARGET=
-+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-+PLATFORM=linux-embedded
-+OPTIONS=--prefix=/usr --openssldir=/etc/ssl -I/home/wbx/openadk/target_arm_musl/usr/include -L/home/wbx/openadk/target_arm_musl/usr/lib -ldl -DOPENSSL_SMALL_FOOTPRINT enable-shared enable-zlib-dynamic no-aes192 no-camellia no-cast no-ec no-ec_nistp_64_gcc_128 no-ecdh no-ecdsa no-engines no-err no-gmp no-gost no-idea no-jpake no-krb5 no-md2 no-mdc2 no-rc5 no-rfc3779 no-ripemd no-sctp no-sha0 no-smime no-store no-threads no-static-engine
-+CONFIGURE_ARGS=linux-embedded --prefix=/usr --openssldir=/etc/ssl -I/home/wbx/openadk/target_arm_musl/usr/include -L/home/wbx/openadk/target_arm_musl/usr/lib -ldl -DOPENSSL_SMALL_FOOTPRINT shared no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast no-ec
-+SHLIB_TARGET=linux-shared
-
- # HERE indicates where this Makefile lives. This can be used to indicate
- # where sub-Makefiles are expected to be. Currently has very limited usage,
-@@ -26,10 +26,10 @@ HERE=.
- # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
- # Normally it is left empty.
- INSTALL_PREFIX=
--INSTALLTOP=/usr/local/ssl
-+INSTALLTOP=/usr
-
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
--OPENSSLDIR=/usr/local/ssl
-+OPENSSLDIR=/etc/ssl
-
- # NO_IDEA - Define to build without the IDEA algorithm
- # NO_RC4 - Define to build without the RC4 algorithm
-@@ -59,15 +59,15 @@ OPENSSLDIR=/usr/local/ssl
- # equal 4.
- # PKCS1_CHECK - pkcs1 tests.
-
--CC= cc
--CFLAG= -O
--DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE
-+CC= /home/wbx/openadk/host_arm_musl/bin/arm-openadk-linux-muslgnueabi-gcc
-+CFLAG= -fPIC -DOPENSSL_PIC -DZLIB_SHARED -DZLIB -DDSO_DLFCN -DHAVE_DLFCN_H -I/home/wbx/openadk/target_arm_musl/usr/include -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_ERR -DTERMIOS $(OPTIMIZATION_FLAGS) -Wall
-+DEPFLAG= -DOPENSSL_NO_AES192 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAST -DOPENSSL_NO_EC -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_ENGINES -DOPENSSL_NO_GMP -DOPENSSL_NO_GOST -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_SCTP -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SMIME -DOPENSSL_NO_STORE
- PEX_LIBS=
--EX_LIBS=
-+EX_LIBS= -L/home/wbx/openadk/target_arm_musl/usr/lib -ldl -ldl
- EXE_EXT=
- ARFLAGS=
--AR= ar $(ARFLAGS) r
--RANLIB= /usr/bin/ranlib
-+AR= /home/wbx/openadk/host_arm_musl/bin/arm-openadk-linux-muslgnueabi-ar $(ARFLAGS) r
-+RANLIB= /home/wbx/openadk/host_arm_musl/bin/arm-openadk-linux-muslgnueabi-ranlib
- NM= nm
- PERL= /usr/bin/perl
- TAR= tar
-@@ -103,7 +103,7 @@ WP_ASM_OBJ= wp_block.o
- CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
- MODES_ASM_OBJ=
- ENGINES_ASM_OBJ=
--PERLASM_SCHEME=
-+PERLASM_SCHEME= void
-
- # KRB5 stuff
- KRB5_INCLUDES=
-@@ -137,16 +137,16 @@ FIPSCANLIB=
-
- BASEADDR=0xFB00000
-
--DIRS= crypto ssl engines apps test tools
--ENGDIRS= ccgost
-+DIRS= crypto ssl engines apps tools
-+ENGDIRS=
- SHLIBDIRS= crypto ssl
-
- # dirs in crypto to build
- SDIRS= \
- objects \
-- md4 md5 sha mdc2 hmac ripemd whrlpool \
-- des aes rc2 rc4 idea bf cast camellia seed modes \
-- bn ec rsa dsa ecdsa dh ecdh dso engine \
-+ md4 md5 sha hmac whrlpool \
-+ des aes rc2 rc4 bf seed modes \
-+ bn rsa dsa dh dso engine \
- buffer bio stack lhash rand err \
- evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
- cms pqueue ts srp cmac
-@@ -174,8 +174,8 @@ WDIRS= windows
- LIBS= libcrypto.a libssl.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
- SHARED_SSL=libssl$(SHLIB_EXT)
--SHARED_LIBS=
--SHARED_LIBS_LINK_EXTS=
-+SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL)
-+SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
- SHARED_LDFLAGS=
-
- GENERAL= Makefile