bump version openssl-1.0.2k & optimize for size

diff --git a/archive-patches/openssl-0.9.7-coolstream.diff b/archive-patches/openssl-0.9.7-coolstream.diff
deleted file mode 100644 (file)
index 703a709..0000000
--- a/archive-patches/openssl-0.9.7-coolstream.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- openssl-0.9.7/Configure    1970-01-01 01:00:00.000000000 +0100
-+++ openssl-0.9.7/Configure    2010-03-22 17:51:26.000000000 +0200
-@@ -414,6 +414,9 @@
- # Linux on ARM
- "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-+# Linux on Coolstream
-+"linux-coolstream","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- # UnixWare 2.0x fails destest with -O
- "unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
- "unixware-2.0-pentium","cc:-DFILIO_H -DNO_STRINGS_H -Kpentium::-Kthread::-lsocket -lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",

diff --git a/archive-patches/openssl-1.0.x-optimize-for-size.patch b/archive-patches/openssl-1.0.x-optimize-for-size.patch
new file mode 100644 (file)
index 0000000..aaa94ae
--- /dev/null
+++ b/archive-patches/openssl-1.0.x-optimize-for-size.patch
@@ -0,0 +1,12 @@
+--- a/Configure
++++ b/Configure
+@@ -374,7 +374,7 @@
+ ####
+ # *-generic* is endian-neutral target, but ./config is free to
+ # throw in -D[BL]_ENDIAN, whichever appropriate...
+-"linux-generic32","gcc:-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)",
++"linux-generic32","gcc:-Os -pipe -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)",
+ "linux-ppc",  "gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #######################################################################
+

diff --git a/make/libraries.mk b/make/libraries.mk
index b23994ad612fa590e5f4bb5ed43c76cdc3d45312..a80d2bca2c8b13cfc32b3c10c7bf2b37cb8fad2b 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -126,6 +126,7 @@ $(D)/libungif: $(ARCHIVE)/libungif-4.1.4.tar.bz2 | $(TARGETPREFIX)
 $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARGETPREFIX)
        $(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
        pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER) && \
+               $(PATCH)/openssl-1.0.x-optimize-for-size.patch && \
                CC=$(TARGET)-gcc \
                ./Configure shared no-hw no-engine linux-generic32 --prefix=/ --openssldir=/.remove && \
                $(MAKE) depend && \

diff --git a/make/versions.mk b/make/versions.mk
index d1a06ac36b73c596f983dcb64076a7693d6525ec..4ae63d31c389d0c306f0e0000e128c2a47ee15ec 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -95,12 +95,12 @@ NTP_VER=4.2.8p6
 # openssl; toolkit for the SSL v2/v3 and TLS v1 protocol
 ifeq ($(PLATFORM), nevis)
 OPENSSL_VER=1.0.2
-OPENSSL_SUBVER=j
+OPENSSL_SUBVER=k
 #OPENSSL_VER=0.9.8
 #OPENSSL_SUBVER=zh
 else
 OPENSSL_VER=1.0.2
-OPENSSL_SUBVER=j
+OPENSSL_SUBVER=k
 endif
 
 # pkg-config; a helper tool used when compiling applications and libraries to insert the correct compiler options