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 f26f67f17c717b1dfaca6a9e55ac5a834a93c7bf..259fd04711ce5fc349e3f666650f70a703908180 100644 (file)
--- 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 c52e256ac2cae4baf3455127f4dc9ac67f9e752b..330b6042bc11499966ddd1d10aa587a2a7c56cc7 100644 (file)
--- 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