summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-31 15:52:11 +0000
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-31 15:52:11 +0000
commit868fc521a640bc311871f364d0846dcfe3e750f2 (patch)
treef3a2ab7b55b8b136fed8a749d379c44bcc0d715d
parenta8f2d938ff86f475fcc105056976c3f08e03a968 (diff)
updated OpenSSL to 0.9.8h
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11309 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/openssl/patches/110-optimize-for-size.patch8
-rw-r--r--package/openssl/patches/150-no_engines.patch14
3 files changed, 13 insertions, 13 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index fa11c160d..9fca6b149 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
-PKG_VERSION:=0.9.8g
+PKG_VERSION:=0.9.8h
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,7 +17,7 @@ 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:=acf70a16359bf3658bdfb74bda1c4419
+PKG_MD5SUM:=7d3d41dafc76cf2fcb5559963b5783b3
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 a1c396cd2..ddd2ea6b2 100644
--- a/package/openssl/patches/110-optimize-for-size.patch
+++ b/package/openssl/patches/110-optimize-for-size.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
+--- openssl-0.9.8h.orig/Configure 2008-05-31 17:27:47.000000000 +0200
++++ openssl-0.9.8h/Configure 2008-05-31 17:28:16.000000000 +0200
+@@ -357,6 +357,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 1c9e71543..b4e4999e4 100644
--- a/package/openssl/patches/150-no_engines.patch
+++ b/package/openssl/patches/150-no_engines.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
+--- openssl-0.9.8h.orig/Configure 2008-05-31 17:31:04.000000000 +0200
++++ openssl-0.9.8h/Configure 2008-05-31 17:30:47.000000000 +0200
+@@ -1712,6 +1712,11 @@
close(OUT);
}
@@ -13,9 +13,9 @@ diff -ur openssl-0.9.8g/Configure openssl-0.9.8g2/Configure
print <<EOF;
Configured for $target.
-diff -ur openssl-0.9.8g/util/libeay.num openssl-0.9.8g2/util/libeay.num
---- openssl-0.9.8g/util/libeay.num 2007-06-11 18:33:48.000000000 +0200
-+++ openssl-0.9.8g2/util/libeay.num 2008-05-19 22:50:40.000000000 +0200
+diff -ur openssl-0.9.8h.orig/util/libeay.num openssl-0.9.8h/util/libeay.num
+--- openssl-0.9.8h.orig/util/libeay.num 2008-05-31 17:27:46.000000000 +0200
++++ openssl-0.9.8h/util/libeay.num 2008-05-31 17:30:47.000000000 +0200
@@ -2071,7 +2071,6 @@
UI_add_error_string 2633 EXIST::FUNCTION:
KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: