From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 Jun 2010 20:10:10 +0000 (-0300)
Subject: openssl: bump version, enable mdc2+camellia+tlsext
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3dbc86f09897a7d038cce04ea986bbb7ce819eb7;p=buildroot.git

openssl: bump version, enable mdc2+camellia+tlsext

Closes #1951

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/CHANGES b/CHANGES
index f26f67f17c..259fd04711 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,8 +7,8 @@
 	New packages: cgilua, copas, coxpcall, luafilesystem,
 	luasocket, rings, wsapi, xavante
 
-	Updated/fixed packages: cdrkit, libidn, netperf, php, qt,
-	tn5250, usbutils
+	Updated/fixed packages: cdrkit, libidn, netperf, openssl, php,
+	qt, tn5250, usbutils
 
 	Removed packages: modutils
 
@@ -21,6 +21,7 @@
 	#1903: Bump tn5250 to 0.17.4 and migrate to autotargets
 	#1909: netperf-2.4.5 fails to build because of undeclared SOCK_DCCP
 	#1945: PHP: add sqlite3 dependency when using external lib
+	#1951: Bump openssl to 0.9.8o
 
 2010.05, Released May 30th, 2010:
 
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index c52e256ac2..330b6042bc 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -3,7 +3,7 @@
 # openssl
 #
 #############################################################
-OPENSSL_VERSION:=0.9.8n
+OPENSSL_VERSION:=0.9.8o
 OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
@@ -32,8 +32,10 @@ define OPENSSL_CONFIGURE_CMDS
 			threads \
 			shared \
 			no-idea \
-			no-mdc2 \
 			no-rc5 \
+			enable-camellia \
+			enable-mdc2 \
+			enable-tlsext \
 			zlib-dynamic \
 	)
 	$(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile