3 files changed, 25 insertions, 48 deletions
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
deleted file mode 100644
index 9774ea7f6..000000000
--- a/package/openssl/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config ADK_COMPILE_OPENSSL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBOPENSSL
-	
-config ADK_PACKAGE_LIBOPENSSL
-	prompt "openssl........................... Open source SSL (Secure Socket Layer) libraries"
-	tristate
-	default n
-	select ADK_COMPILE_OPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the shared SSL libraries, needed by other programs.
-
-config ADK_PACKAGE_OPENSSL_UTIL
-	prompt   "openssl-util.................... OpenSSL command line tool"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBOPENSSL
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the multi-purpose OpenSSL binary tool.
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index fa93afd82..319deda11 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,33 +4,41 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
-PKG_VERSION:=		0.9.8k
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e555c6d58d276aec7fdc53363e338ab3
+PKG_VERSION:=		0.9.8l
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		05a0ece1372392a2cf310ebb96333025
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.openssl.org
 PKG_SITES:=		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_DESCR_UTIL:=	OpenSSL (Secure Socket Layer) command line tool
 PKG_SECTION_UTIL:=	admin
 PKG_DEPENDS_UTIL:=	libopenssl
+PKG_DEPENDS_DEV:=	libopenssl
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSSL_DEV}+=	libopenssl-dev-install
+
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
-INSTALL_STYLE:=		auto
+
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
-OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast no-bf
+OPENSSL_OPTIONS = shared no-ec no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+
+post-extract:
+	@find ${WRKBUILD} -name *.rej -exec rm {} \;
 
 do-configure:
 	(cd $(WRKBUILD); \
@@ -58,7 +66,7 @@ do-build:
 		OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
 		all build-shared
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
 	chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
@@ -68,4 +76,8 @@ post-install:
 	${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
 	chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
 
+libopenssl-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 4fd60ccb8..fb07479f9 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -1,7 +1,7 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openssl-0.9.8i.orig/Configure	2008-09-12 16:47:00.000000000 +0200
-+++ openssl-0.9.8i/Configure	2008-10-22 11:02:46.000000000 +0200
-@@ -357,6 +357,7 @@ my %table=(
+diff -Nur openssl-0.9.8l.orig/Configure openssl-0.9.8l/Configure
+--- openssl-0.9.8l.orig/Configure	2009-11-05 13:07:06.000000000 +0100
++++ openssl-0.9.8l/Configure	2009-12-06 02:14:45.000000000 +0100
+@@ -364,6 +364,7 @@
  "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}",