From bd14b0e70f5b5b1d1e308bab6af0821e5894de57 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 Apr 2009 07:01:20 +0000 Subject: openssl: bump version Patch by Gustavo Zacarias , closes #217 Fixes multiple security flaws - See http://www.openssl.org/news/secadv_20090325.txt for details. --- .../openssl/openssl-0.9.8j-do-not-build-docs.patch | 13 ------------- .../openssl-0.9.8j-dont-force-large-file.patch | 19 ------------------- package/openssl/openssl-0.9.8j-nofips.patch | 12 ------------ .../openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch | 18 ------------------ .../openssl/openssl-0.9.8k-do-not-build-docs.patch | 13 +++++++++++++ .../openssl-0.9.8k-dont-force-large-file.patch | 19 +++++++++++++++++++ package/openssl/openssl-0.9.8k-nofips.patch | 12 ++++++++++++ .../openssl/openssl-0.9.8k-uclibc-susv3-legacy.patch | 18 ++++++++++++++++++ package/openssl/openssl.mk | 2 +- 9 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 package/openssl/openssl-0.9.8j-do-not-build-docs.patch delete mode 100644 package/openssl/openssl-0.9.8j-dont-force-large-file.patch delete mode 100644 package/openssl/openssl-0.9.8j-nofips.patch delete mode 100644 package/openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch create mode 100644 package/openssl/openssl-0.9.8k-do-not-build-docs.patch create mode 100644 package/openssl/openssl-0.9.8k-dont-force-large-file.patch create mode 100644 package/openssl/openssl-0.9.8k-nofips.patch create mode 100644 package/openssl/openssl-0.9.8k-uclibc-susv3-legacy.patch 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 index 135a9d3b0..000000000 --- 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 index 5b04656ff..000000000 --- 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 diff --git a/package/openssl/openssl-0.9.8j-nofips.patch b/package/openssl/openssl-0.9.8j-nofips.patch deleted file mode 100644 index 7780fa432..000000000 --- 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 index eb1d27798..000000000 --- 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 index 000000000..135a9d3b0 --- /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 index 000000000..5b04656ff --- /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 diff --git a/package/openssl/openssl-0.9.8k-nofips.patch b/package/openssl/openssl-0.9.8k-nofips.patch new file mode 100644 index 000000000..0edea3ebc --- /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 index 000000000..eb1d27798 --- /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 e7da3cdc2..cca0afd69 100644 --- 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 -- cgit v1.2.3