From 8c35e570ceb9266e7f8b340e5ff1af3e8f4b2a9f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 3 Jun 2010 16:48:18 +0200 Subject: [PATCH] openssl: - dont use linker plugin (gcc bug 42453) - update to openssl-1.0.0a - use /lib as libdir also on 64bit build - dont build with ec* support --- packages/security/openssl/build | 13 ++++++++++--- .../openssl-0.9.8k-do-not-build-docs.diff | 13 ------------- .../openssl-0.9.8k-dont-force-large-file.diff | 19 ------------------- .../patches/openssl-0.9.8k-nofips.diff | 12 ------------ packages/security/openssl/url | 2 +- 5 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 packages/security/openssl/patches/openssl-0.9.8k-do-not-build-docs.diff delete mode 100644 packages/security/openssl/patches/openssl-0.9.8k-dont-force-large-file.diff delete mode 100644 packages/security/openssl/patches/openssl-0.9.8k-nofips.diff diff --git a/packages/security/openssl/build b/packages/security/openssl/build index 74f76ec820..8cdb057f2e 100755 --- a/packages/security/openssl/build +++ b/packages/security/openssl/build @@ -5,6 +5,10 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib +# Suffers from bug 42453 . + CFLAGS=`echo $CFLAGS | sed -e "s|-fuse-linker-plugin||"` + LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"` + export MAKEFLAGS=-j1 case $TARGET_ARCH in @@ -32,12 +36,15 @@ cd $PKG_BUILD no-mdc2 \ no-rc5 \ no-krb5 \ + no-ec \ + no-ecdh \ + no-ecdsa \ $TARGET $SED -i -e "s:-march=[-a-z0-9] ::" \ -e "s:-mcpu=[-a-z0-9] ::g" \ -e "s:-O[0-9]:$CFLAGS:" Makefile -make CC=$CC LD=$LD RANLIB=$RANLIB all build-shared -make CC=$CC LD=$LD RANLIB=$RANLIB do_linux-shared -make CC=$CC LD=$LD RANLIB=$RANLIB INSTALL_PREFIX=$SYSROOT_PREFIX install_sw +make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib all build-shared +make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib do_linux-shared +make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib INSTALL_PREFIX=$SYSROOT_PREFIX install_sw diff --git a/packages/security/openssl/patches/openssl-0.9.8k-do-not-build-docs.diff b/packages/security/openssl/patches/openssl-0.9.8k-do-not-build-docs.diff deleted file mode 100644 index 135a9d3b04..0000000000 --- a/packages/security/openssl/patches/openssl-0.9.8k-do-not-build-docs.diff +++ /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/packages/security/openssl/patches/openssl-0.9.8k-dont-force-large-file.diff b/packages/security/openssl/patches/openssl-0.9.8k-dont-force-large-file.diff deleted file mode 100644 index 5b04656ff5..0000000000 --- a/packages/security/openssl/patches/openssl-0.9.8k-dont-force-large-file.diff +++ /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/packages/security/openssl/patches/openssl-0.9.8k-nofips.diff b/packages/security/openssl/patches/openssl-0.9.8k-nofips.diff deleted file mode 100644 index 0edea3ebc1..0000000000 --- a/packages/security/openssl/patches/openssl-0.9.8k-nofips.diff +++ /dev/null @@ -1,12 +0,0 @@ -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/packages/security/openssl/url b/packages/security/openssl/url index 1d4922d441..91fdd6d0bc 100644 --- a/packages/security/openssl/url +++ b/packages/security/openssl/url @@ -1 +1 @@ -http://openssl.org/source/openssl-0.9.8m.tar.gz +http://www.openssl.org/source/openssl-1.0.0a.tar.gz \ No newline at end of file