From f2de1dec21881b6300efbb7a636150bfe753424b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 20 May 2008 18:12:08 +0000 Subject: [PATCH] Merge branch 'openssl' SVN-Revision: 11224 --- package/openssl/Makefile | 6 +- .../patches/110-optimize-for-size.patch | 9 +- package/openssl/patches/150-no_engines.patch | 38 ++- .../openssl/patches/180-gcc_breakage.patch | 252 ------------------ 4 files changed, 25 insertions(+), 280 deletions(-) delete mode 100644 package/openssl/patches/180-gcc_breakage.patch diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 86c584b7eb..fa11c160d3 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8e -PKG_RELEASE:=3 +PKG_VERSION:=0.9.8g +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=3a7ff24f6ea5cd711984722ad654b927 +PKG_MD5SUM:=acf70a16359bf3658bdfb74bda1c4419 include $(INCLUDE_DIR)/package.mk diff --git a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch index e0a1952d32..a1c396cd23 100644 --- a/package/openssl/patches/110-optimize-for-size.patch +++ b/package/openssl/patches/110-optimize-for-size.patch @@ -1,8 +1,7 @@ -Index: openssl-0.9.8e/Configure -=================================================================== ---- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.150846224 +0200 -+++ openssl-0.9.8e/Configure 2007-06-04 13:23:32.217836040 +0200 -@@ -353,6 +353,8 @@ +diff -ur openssl-0.9.8g/Configure openssl-0.9.8g2/Configure +--- openssl-0.9.8g/Configure 2007-09-16 14:24:17.000000000 +0200 ++++ openssl-0.9.8g2/Configure 2008-05-19 22:46:03.000000000 +0200 +@@ -352,6 +352,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:${no_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:${no_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:${no_asm}", diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch index 104cba07a2..1c9e715439 100644 --- a/package/openssl/patches/150-no_engines.patch +++ b/package/openssl/patches/150-no_engines.patch @@ -1,7 +1,21 @@ -Index: openssl-0.9.8e/util/libeay.num -=================================================================== ---- openssl-0.9.8e.orig/util/libeay.num 2007-06-04 13:23:32.021865832 +0200 -+++ openssl-0.9.8e/util/libeay.num 2007-06-04 13:23:33.045710184 +0200 +diff -ur openssl-0.9.8g/Configure openssl-0.9.8g2/Configure +--- openssl-0.9.8g/Configure 2008-05-19 22:49:45.000000000 +0200 ++++ openssl-0.9.8g2/Configure 2008-05-19 22:50:40.000000000 +0200 +@@ -1685,6 +1685,11 @@ + close(OUT); + } + ++# ugly hack to disable engines ++if($target eq "mingwx") { ++ system("sed -e s/^LIB/XLIB/g -i engines/Makefile"); ++} ++ + print <