Date: Thursday, September 2, 2021 @ 13:57:16 Author: pierre Revision: 1010579
archrelease: copy trunk to multilib-x86_64 Added: lib32-openssl/repos/multilib-x86_64/PKGBUILD (from rev 1010578, lib32-openssl/trunk/PKGBUILD) lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 1010578, lib32-openssl/trunk/ca-dir.patch) Deleted: lib32-openssl/repos/multilib-x86_64/PKGBUILD lib32-openssl/repos/multilib-x86_64/ca-dir.patch --------------+ PKGBUILD | 126 ++++++++++++++++++++++++++++----------------------------- ca-dir.patch | 62 ++++++++++++++-------------- 2 files changed, 94 insertions(+), 94 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-02 13:57:12 UTC (rev 1010578) +++ PKGBUILD 2021-09-02 13:57:16 UTC (rev 1010579) @@ -1,63 +0,0 @@ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -_pkgbasename=openssl -pkgname=lib32-$_pkgbasename -epoch=1 -_ver=1.1.1k -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -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-glibc' "${_pkgbasename}") -optdepends=('ca-certificates') -source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"{,.asc} - 'ca-dir.patch') -sha256sums=('892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5' - 'SKIP' - '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e') -validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' - '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') - -prepare() { - cd "$srcdir"/$_pkgbasename-$_ver - - # 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 no-ssl3-method 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 DESTDIR="$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 1010578, lib32-openssl/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-02 13:57:16 UTC (rev 1010579) @@ -0,0 +1,63 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +_pkgbasename=openssl +pkgname=lib32-$_pkgbasename +epoch=1 +_ver=1.1.1l +# use a pacman compatible version scheme +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +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-glibc' "${_pkgbasename}") +optdepends=('ca-certificates') +source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"{,.asc} + 'ca-dir.patch') +sha256sums=('0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1' + 'SKIP' + '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e') +validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' + '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') + +prepare() { + cd "$srcdir"/$_pkgbasename-$_ver + + # 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 no-ssl3-method 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 DESTDIR="$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 2021-09-02 13:57:12 UTC (rev 1010578) +++ ca-dir.patch 2021-09-02 13:57:16 UTC (rev 1010579) @@ -1,31 +0,0 @@ ---- apps/CA.pl.in 2018-09-11 14:48:19.000000000 +0200 -+++ apps/CA.pl.in 2018-09-11 16:16:32.125629435 +0200 -@@ -33,7 +33,7 @@ - my $PKCS12 = "$openssl pkcs12"; - - # default openssl.cnf file has setup as per the following --my $CATOP = "./demoCA"; -+my $CATOP = "/etc/ssl"; - my $CAKEY = "cakey.pem"; - my $CAREQ = "careq.pem"; - my $CACERT = "cacert.pem"; ---- apps/openssl.cnf 2018-09-11 14:48:20.000000000 +0200 -+++ apps/openssl.cnf 2018-09-11 16:16:32.125629435 +0200 -@@ -43,7 +43,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. -@@ -327,7 +327,7 @@ - [ tsa_config1 ] - - # These are used by the TSA reply generation only. --dir = ./demoCA # TSA root directory -+dir = /etc/ssl # TSA root directory - serial = $dir/tsaserial # The current serial number (mandatory) - crypto_device = builtin # OpenSSL engine to use for signing - signer_cert = $dir/tsacert.pem # The TSA signing certificate Copied: lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 1010578, lib32-openssl/trunk/ca-dir.patch) =================================================================== --- ca-dir.patch (rev 0) +++ ca-dir.patch 2021-09-02 13:57:16 UTC (rev 1010579) @@ -0,0 +1,31 @@ +--- apps/CA.pl.in 2018-09-11 14:48:19.000000000 +0200 ++++ apps/CA.pl.in 2018-09-11 16:16:32.125629435 +0200 +@@ -33,7 +33,7 @@ + my $PKCS12 = "$openssl pkcs12"; + + # default openssl.cnf file has setup as per the following +-my $CATOP = "./demoCA"; ++my $CATOP = "/etc/ssl"; + my $CAKEY = "cakey.pem"; + my $CAREQ = "careq.pem"; + my $CACERT = "cacert.pem"; +--- apps/openssl.cnf 2018-09-11 14:48:20.000000000 +0200 ++++ apps/openssl.cnf 2018-09-11 16:16:32.125629435 +0200 +@@ -43,7 +43,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. +@@ -327,7 +327,7 @@ + [ tsa_config1 ] + + # These are used by the TSA reply generation only. +-dir = ./demoCA # TSA root directory ++dir = /etc/ssl # TSA root directory + serial = $dir/tsaserial # The current serial number (mandatory) + crypto_device = builtin # OpenSSL engine to use for signing + signer_cert = $dir/tsacert.pem # The TSA signing certificate