commit 0036fefc84719c1b597dc6cb811f358b5c541eaa Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Oct 18 23:09:54 2014 +1100 openssl-32: 1.0.1i -> 1.0.1j diff --git a/openssl-32/.md5sum b/openssl-32/.md5sum index 8be85f8..1699cb1 100644 --- a/openssl-32/.md5sum +++ b/openssl-32/.md5sum @@ -1,3 +1,3 @@ -9d0df57845af8acd1027a7df5c18d017 mksslcert.sh -c8dc151a671b9b92ff3e4c118b174972 openssl-1.0.1i.tar.gz -bcc6cecf10603a07b9a2261c75aff1c6 openssl-32.patch +79557e38ae66cfcd9444463ab55eb411 openssl-1.0.1c-32bit_x86_64-1.patch +ffcc8ee49222d341cdab991aca3c5827 openssl-1.0.1e-fix_parallel_build-1.patch +f7175c9cd3c39bb1907ac8bba9df8ed3 openssl-1.0.1j.tar.gz diff --git a/openssl-32/Pkgfile b/openssl-32/Pkgfile index c7cc640..b21f797 100644 --- a/openssl-32/Pkgfile +++ b/openssl-32/Pkgfile @@ -1,24 +1,58 @@ # Description: Secure Sockets Layer and Transport Layer Security tools -# URL: http://www.openssl.org/ +# URL: http://www.openssl.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu name=openssl-32 -version=1.0.1i +version=1.0.1j release=1 -source=(http://www.openssl.org/source/openssl-$version.tar.gz \ - mksslcert.sh $name.patch) +source=(http://www.openssl.org/source/openssl-$version.tar.gz + http://svn.cross-lfs.org/svn/repos/patches/openssl/openssl-1.0.1c-32bit_x86_... + http://svn.cross-lfs.org/svn/repos/patches/openssl/openssl-1.0.1e-fix_parall...) build() { - unset CC CXX - export MAKEFLAGS="${MAKEFLAGS} -j1" cd openssl-$version - patch -p1 -i $SRC/$name.patch - ./Configure linux-x86_64-32 --prefix=/usr --libdir=/usr/lib32 --openssldir=/etc/ssl shared - sed -i "s|-O3|$CFLAGS|" Makefile - make - make INSTALL_PREFIX=$PKG LIBDIR=lib32 MANDIR=/usr/man MANSUFFIX=ssl install - find $PKG -name "*fips*" -delete - chmod -R +w $PKG - install -D -m 755 $SRC/mksslcert.sh $PKG/usr/bin/mksslcert - rm -rf $PKG/usr/{bin,include,man} $PKG/etc + + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script + rm Makefile + + patch -p1 -i $SRC/openssl-1.0.1c-32bit_x86_64-1.patch + patch -p1 -i $SRC/openssl-1.0.1e-fix_parallel_build-1.patch + + # Disable fips and man pages + sed \ + -e '/DIRS/s| fips | |g' \ + -e '/^install:/s|install_docs||' \ + -i Makefile.org + + ./Configure \ + linux-x86_64-32 \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --openssldir=/etc/ssl shared + + # Clean out hardcoded flags + local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + -e 's|^CFLAG=||' \ + -e 's|-fomit-frame-pointer ||g' \ + -e 's|-O[0-9] ||g' \ + -e 's|-march=[-a-z0-9]* ||g' \ + -e 's|-mcpu=[-a-z0-9]* ||g' \ + -e 's|-m[a-z0-9]* ||g' \ + ) + sed \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + -i Makefile + + make + make \ + INSTALL_PREFIX=$PKG \ + LIBDIR=lib32 \ + MANDIR=/usr/man \ + MANSUFFIX=ssl \ + install + + chmod -R +w $PKG + rm -r $PKG/usr/{bin,include,man} $PKG/etc } diff --git a/openssl-32/mksslcert.sh b/openssl-32/mksslcert.sh deleted file mode 100755 index 9cca3fb..0000000 --- a/openssl-32/mksslcert.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# mksslcert -# -# creates self-signed openssl certificates based on -# the local hostname or the given one -# Fallback to localhost if not set. -# -# Jürgen Daubert, jue at jue dot li - - -print_help() { - echo "usage: ${0##*/} <key> <cert> [hostname]" - echo " key full path to openssl private key" - echo " cert full path to openssl certificate" - echo " hostname host name of certificate" -} - -main() { - if [ ! "$1" -o ! "$2" ]; then - print_help - exit 1 - fi - - KEY=$1 - CRT=$2 - FQDN=$(hostname -f) || FQDN=localhost - if [ ! -z "$3" ]; then - FQDN="$3" - fi - INFO=".\n.\n.\n.\n.\n$FQDN\nroot@$FQDN" - OPTS="req -new -nodes -x509 -days 365 -newkey rsa:1024" - - echo -e $INFO | openssl $OPTS -out $CRT -keyout $KEY 2> /dev/null - - if [ $? -ne 0 ]; then - echo "Error: creating of certificate failed" - exit 1 - else - echo "SSL certificate $CRT with key $KEY for host $FQDN created" - chmod 0600 $CRT $KEY - fi -} - -main "$@" - -# End of file diff --git a/openssl-32/openssl-32.patch b/openssl-32/openssl-32.patch deleted file mode 100644 index 9946c9b..0000000 --- a/openssl-32/openssl-32.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN openssl-1.0.1c.orig/Configure openssl-1.0.1c/Configure ---- openssl-1.0.1c.orig/Configure 2012-03-14 17:20:40.000000000 -0500 -+++ openssl-1.0.1c/Configure 2012-08-19 11:07:01.922325500 -0500 -@@ -359,6 +359,7 @@ - "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-x86_64-32", "gcc:-m32 -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see