openssl: bump version

Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>, closes #217

Fixes multiple security flaws - See
http://www.openssl.org/news/secadv_20090325.txt for details.

diff --git a/package/openssl/openssl-0.9.8j-do-not-build-docs.patch b/package/openssl/openssl-0.9.8j-do-not-build-docs.patch
deleted file mode 100644 (file)
index 135a9d3..0000000
--- a/package/openssl/openssl-0.9.8j-do-not-build-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Dont waste time building manpages if we're not going to use em.
-
---- openssl/Makefile.org
-+++ openssl/Makefile.org
-@@ -792,7 +792,7 @@
- dist_pem_h:
-       (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: all install_sw
- 
- install_sw:
-       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

diff --git a/package/openssl/openssl-0.9.8j-dont-force-large-file.patch b/package/openssl/openssl-0.9.8j-dont-force-large-file.patch
deleted file mode 100644 (file)
index 5b04656..0000000
--- a/package/openssl/openssl-0.9.8j-dont-force-large-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-[patch]: bss_file.c: don't force largefile mode
----
- crypto/bio/bss_file.c |    3 ---
- 1 file changed, 3 deletions(-)
-
-Index: openssl-0.9.8g/crypto/bio/bss_file.c
-===================================================================
---- openssl-0.9.8g.orig/crypto/bio/bss_file.c
-+++ openssl-0.9.8g/crypto/bio/bss_file.c
-@@ -78,9 +78,6 @@
-  * sequential access of large files without extra "magic" comprise *BSD,
-  * Darwin, IRIX...
-  */
--#ifndef _FILE_OFFSET_BITS
--#define _FILE_OFFSET_BITS 64
--#endif
- #endif
- 
- #include <stdio.h>

diff --git a/package/openssl/openssl-0.9.8j-nofips.patch b/package/openssl/openssl-0.9.8j-nofips.patch
deleted file mode 100644 (file)
index 7780fa4..0000000
--- a/package/openssl/openssl-0.9.8j-nofips.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura openssl-0.9.8j/Makefile openssl-0.9.8j.nofips/Makefile
---- openssl-0.9.8j/Makefile    2009-01-07 09:57:01.000000000 -0200
-+++ openssl-0.9.8j.nofips/Makefile     2009-03-05 10:10:09.000000000 -0200
-@@ -133,7 +133,7 @@
- 
- BASEADDR=0xFB00000
- 
--DIRS=   crypto fips ssl engines apps test tools
-+DIRS=   crypto ssl engines apps test tools
- SHLIBDIRS= crypto ssl
- 
- # dirs in crypto to build

diff --git a/package/openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch b/package/openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch
deleted file mode 100644 (file)
index eb1d277..0000000
--- a/package/openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-sys/timeb.h / ftime are legacy, so don't enable them for uClibc 
----
- apps/speed.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: openssl-0.9.8g/apps/speed.c
-===================================================================
---- openssl-0.9.8g.orig/apps/speed.c
-+++ openssl-0.9.8g/apps/speed.c
-@@ -113,7 +113,7 @@
- #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
- # define TIMES
- #endif
--#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
-+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
- # define TIMEB
- #endif
- 

diff --git a/package/openssl/openssl-0.9.8k-do-not-build-docs.patch b/package/openssl/openssl-0.9.8k-do-not-build-docs.patch
new file mode 100644 (file)
index 0000000..135a9d3
--- /dev/null
+++ b/package/openssl/openssl-0.9.8k-do-not-build-docs.patch
@@ -0,0 +1,13 @@
+Dont waste time building manpages if we're not going to use em.
+
+--- openssl/Makefile.org
++++ openssl/Makefile.org
+@@ -792,7 +792,7 @@
+ dist_pem_h:
+       (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

diff --git a/package/openssl/openssl-0.9.8k-dont-force-large-file.patch b/package/openssl/openssl-0.9.8k-dont-force-large-file.patch
new file mode 100644 (file)
index 0000000..5b04656
--- /dev/null
+++ b/package/openssl/openssl-0.9.8k-dont-force-large-file.patch
@@ -0,0 +1,19 @@
+[patch]: bss_file.c: don't force largefile mode
+---
+ crypto/bio/bss_file.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: openssl-0.9.8g/crypto/bio/bss_file.c
+===================================================================
+--- openssl-0.9.8g.orig/crypto/bio/bss_file.c
++++ openssl-0.9.8g/crypto/bio/bss_file.c
+@@ -78,9 +78,6 @@
+  * sequential access of large files without extra "magic" comprise *BSD,
+  * Darwin, IRIX...
+  */
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+ #endif
+ 
+ #include <stdio.h>

diff --git a/package/openssl/openssl-0.9.8k-nofips.patch b/package/openssl/openssl-0.9.8k-nofips.patch
new file mode 100644 (file)
index 0000000..0edea3e
--- /dev/null
+++ b/package/openssl/openssl-0.9.8k-nofips.patch
@@ -0,0 +1,12 @@
+diff -Nura openssl-0.9.8k/Makefile.org openssl-0.9.8k.nofips/Makefile.org
+--- openssl-0.9.8k/Makefile.org        2009-03-03 20:40:29.000000000 -0200
++++ openssl-0.9.8k.nofips/Makefile.org 2009-03-26 09:50:27.000000000 -0300
+@@ -131,7 +131,7 @@
+ 
+ BASEADDR=
+ 
+-DIRS=   crypto fips ssl engines apps test tools
++DIRS=   crypto ssl engines apps test tools
+ SHLIBDIRS= crypto ssl fips
+ 
+ # dirs in crypto to build

diff --git a/package/openssl/openssl-0.9.8k-uclibc-susv3-legacy.patch b/package/openssl/openssl-0.9.8k-uclibc-susv3-legacy.patch
new file mode 100644 (file)
index 0000000..eb1d277
--- /dev/null
+++ b/package/openssl/openssl-0.9.8k-uclibc-susv3-legacy.patch
@@ -0,0 +1,18 @@
+sys/timeb.h / ftime are legacy, so don't enable them for uClibc 
+---
+ apps/speed.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: openssl-0.9.8g/apps/speed.c
+===================================================================
+--- openssl-0.9.8g.orig/apps/speed.c
++++ openssl-0.9.8g/apps/speed.c
+@@ -113,7 +113,7 @@
+ #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+ # define TIMES
+ #endif
+-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
++#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
+ # define TIMEB
+ #endif
+ 

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index e7da3cdc23b7a62bced302424552debcf9bdc8a9..cca0afd698a5b7ce38fdf54accc09941c88afe66 100644 (file)
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -3,7 +3,7 @@
 # openssl
 #
 #############################################################
-OPENSSL_VERSION:=0.9.8j
+OPENSSL_VERSION:=0.9.8k
 OPENSSL_SITE:=http://www.openssl.org/source
 
 OPENSSL_TARGET_ARCH=generic32