Date: Thursday, December 3, 2015 @ 20:19:40 Author: pierre Revision: 148233
archrelease: copy trunk to multilib-x86_64 Added: lib32-openssl/repos/multilib-x86_64/PKGBUILD (from rev 148232, lib32-openssl/trunk/PKGBUILD) lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 148232, lib32-openssl/trunk/ca-dir.patch) lib32-openssl/repos/multilib-x86_64/no-rpath.patch (from rev 148232, lib32-openssl/trunk/no-rpath.patch) Deleted: lib32-openssl/repos/multilib-x86_64/PKGBUILD lib32-openssl/repos/multilib-x86_64/ca-dir.patch lib32-openssl/repos/multilib-x86_64/no-rpath.patch ----------------+ PKGBUILD | 142 +++++++++++++++++++++++++++---------------------------- ca-dir.patch | 66 ++++++++++++------------- no-rpath.patch | 22 ++++---- 3 files changed, 115 insertions(+), 115 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-12-03 19:19:29 UTC (rev 148232) +++ PKGBUILD 2015-12-03 19:19:40 UTC (rev 148233) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -_pkgbasename=openssl -pkgname=lib32-$_pkgbasename -_ver=1.0.2d -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -#pkgver=$_ver -pkgrel=1 -pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' -arch=('x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -depends=('lib32-zlib' "${_pkgbasename}") -optdepends=('ca-certificates') -makedepends=('gcc-multilib') -options=('!makeflags') -source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" - "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc" - 'no-rpath.patch' - 'ca-dir.patch') -validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491) -md5sums=('38dd619b2e77cbac69b99f52a053d25a' - 'SKIP' - 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') - -prepare() { - cd $srcdir/$_pkgbasename-$_ver - - # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch - # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgbasename-$_ver - - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ - shared zlib \ - linux-elf \ - "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" - - make MAKEDEPPROG="${CC}" depend - make -} - -check() { - cd $srcdir/$_pkgbasename-$_ver - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - patch -p0 -R -i $srcdir/ca-dir.patch - make test - patch -p0 -i $srcdir/ca-dir.patch -} - -package() { - cd $srcdir/$_pkgbasename-$_ver - make INSTALL_PREFIX=$pkgdir install_sw - - rm -rf ${pkgdir}/{usr/{include,bin},etc} - mkdir -p $pkgdir/usr/share/licenses - ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname -} Copied: lib32-openssl/repos/multilib-x86_64/PKGBUILD (from rev 148232, lib32-openssl/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-12-03 19:19:40 UTC (rev 148233) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +_pkgbasename=openssl +pkgname=lib32-$_pkgbasename +_ver=1.0.2e +# use a pacman compatible version scheme +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +#pkgver=$_ver +pkgrel=1 +pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' +arch=('x86_64') +url='https://www.openssl.org' +license=('custom:BSD') +depends=('lib32-zlib' "${_pkgbasename}") +optdepends=('ca-certificates') +makedepends=('gcc-multilib') +options=('!makeflags') +source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" + "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc" + 'no-rpath.patch' + 'ca-dir.patch') +validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491) +md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5' + 'SKIP' + 'dc78d3d06baffc16217519242ce92478' + '3bf51be3a1bbd262be46dc619f92aa90') + +prepare() { + cd $srcdir/$_pkgbasename-$_ver + + # remove rpath: http://bugs.archlinux.org/task/14367 + patch -p0 -i $srcdir/no-rpath.patch + # set ca dir to /etc/ssl by default + patch -p0 -i $srcdir/ca-dir.patch +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd $srcdir/$_pkgbasename-$_ver + + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ + shared zlib \ + linux-elf \ + "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" + + make MAKEDEPPROG="${CC}" depend + make +} + +check() { + cd $srcdir/$_pkgbasename-$_ver + # the test fails due to missing write permissions in /etc/ssl + # revert this patch for make test + patch -p0 -R -i $srcdir/ca-dir.patch + make test + patch -p0 -i $srcdir/ca-dir.patch +} + +package() { + cd $srcdir/$_pkgbasename-$_ver + make INSTALL_PREFIX=$pkgdir install_sw + + rm -rf ${pkgdir}/{usr/{include,bin},etc} + mkdir -p $pkgdir/usr/share/licenses + ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname +} Deleted: ca-dir.patch =================================================================== --- ca-dir.patch 2015-12-03 19:19:29 UTC (rev 148232) +++ ca-dir.patch 2015-12-03 19:19:40 UTC (rev 148233) @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. Copied: lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 148232, lib32-openssl/trunk/ca-dir.patch) =================================================================== --- ca-dir.patch (rev 0) +++ ca-dir.patch 2015-12-03 19:19:40 UTC (rev 148233) @@ -0,0 +1,33 @@ +--- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 ++++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 +@@ -53,7 +53,7 @@ + $X509="$openssl x509"; + $PKCS12="$openssl pkcs12"; + +-$CATOP="./demoCA"; ++$CATOP="/etc/ssl"; + $CAKEY="cakey.pem"; + $CAREQ="careq.pem"; + $CACERT="cacert.pem"; +--- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 ++++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 +@@ -68,7 +68,7 @@ + X509="$OPENSSL x509" + PKCS12="openssl pkcs12" + +-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi ++if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi + CAKEY=./cakey.pem + CAREQ=./careq.pem + CACERT=./cacert.pem +--- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 ++++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 +@@ -39,7 +39,7 @@ + #################################################################### + [ CA_default ] + +-dir = ./demoCA # Where everything is kept ++dir = /etc/ssl # Where everything is kept + certs = $dir/certs # Where the issued certs are kept + crl_dir = $dir/crl # Where the issued crl are kept + database = $dir/index.txt # database index file. Deleted: no-rpath.patch =================================================================== --- no-rpath.patch 2015-12-03 19:19:29 UTC (rev 148232) +++ no-rpath.patch 2015-12-03 19:19:40 UTC (rev 148233) @@ -1,11 +0,0 @@ ---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to Copied: lib32-openssl/repos/multilib-x86_64/no-rpath.patch (from rev 148232, lib32-openssl/trunk/no-rpath.patch) =================================================================== --- no-rpath.patch (rev 0) +++ no-rpath.patch 2015-12-03 19:19:40 UTC (rev 148233) @@ -0,0 +1,11 @@ +--- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 ++++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 +@@ -153,7 +153,7 @@ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + +-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" ++DO_GNU_APP=LDFLAGS="$(CFLAGS)" + + #This is rather special. It's a special target with which one can link + #applications without bothering with any features that have anything to