Date: Saturday, December 12, 2020 @ 06:41:29 Author: pierre Revision: 404004
archrelease: copy trunk to testing-x86_64 Added: openssl/repos/testing-x86_64/PKGBUILD (from rev 404003, openssl/trunk/PKGBUILD) openssl/repos/testing-x86_64/ca-dir.patch (from rev 404003, openssl/trunk/ca-dir.patch) Deleted: openssl/repos/testing-x86_64/PKGBUILD openssl/repos/testing-x86_64/ca-dir.patch --------------+ PKGBUILD | 154 +++++++++++++++++++++++---------------------------------- ca-dir.patch | 62 +++++++++++----------- 2 files changed, 95 insertions(+), 121 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-12 06:41:25 UTC (rev 404003) +++ PKGBUILD 2020-12-12 06:41:29 UTC (rev 404004) @@ -1,90 +0,0 @@ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=openssl -pkgname=(openssl openssl-doc openssl-perl) -_ver=1.1.1i -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -arch=('x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -makedepends=('perl') -source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc} - 'ca-dir.patch') -sha256sums=('e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242' - 'SKIP' - '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2') -validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' - '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') - -prepare() { - cd "$srcdir/$pkgbase-$_ver" - - # set ca dir to /etc/ssl by default - patch -p0 -i "$srcdir/ca-dir.patch" -} - -build() { - cd "$srcdir/$pkgbase-$_ver" - - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \ - "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" - - make depend - make -} - -check() { - cd "$srcdir/$pkgbase-$_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" - # re-run make to re-generate CA.pl from th patched .in file. - make apps/CA.pl -} - -package_openssl() { - pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' - depends=('glibc') - optdepends=('ca-certificates') - backup=('etc/ssl/openssl.cnf') - - cd "$srcdir/$pkgbase-$_ver" - - make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs - - rm -rf $pkgdir/etc/ssl/misc $pkgdir/usr/bin/c_rehash - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -package_openssl-doc() { - pkgdesc='Documentation provided with OpenSSL' - depends=('openssl') - - cd "$srcdir/$pkgbase-$_ver" - - make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_man_docs - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -package_openssl-perl() { - pkgdesc='Perl scripts provided with OpenSSL' - depends=('openssl' 'perl') - - cd "$srcdir/$pkgbase-$_ver" - - make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_programs install_ssldirs - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - mv $pkgdir/etc/ssl/misc/* $pkgdir/usr/bin/ - rm -rf $pkgdir/{etc,usr/lib} $pkgdir/usr/bin/openssl -} Copied: openssl/repos/testing-x86_64/PKGBUILD (from rev 404003, openssl/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-12 06:41:29 UTC (rev 404004) @@ -0,0 +1,64 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=openssl +_ver=1.1.1i +# use a pacman compatible version scheme +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=2 +pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' +arch=('x86_64') +url='https://www.openssl.org' +license=('custom:BSD') +depends=('glibc') +makedepends=('perl') +optdepends=('ca-certificates' 'perl') +replaces=('openssl-perl' 'openssl-doc') +backup=('etc/ssl/openssl.cnf') +source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc} + 'ca-dir.patch') +sha256sums=('e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242' + 'SKIP' + '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2') +validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' + '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') + +prepare() { + cd "$srcdir/$pkgname-$_ver" + + # set ca dir to /etc/ssl by default + patch -p0 -i "$srcdir/ca-dir.patch" +} + +build() { + cd "$srcdir/$pkgname-$_ver" + + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \ + "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" + + make depend + make +} + +check() { + cd "$srcdir/$pkgbase-$_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" + # re-run make to re-generate CA.pl from th patched .in file. + make apps/CA.pl +} + +package() { + cd "$srcdir/$pkgname-$_ver" + + make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs install_man_docs + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} Deleted: ca-dir.patch =================================================================== --- ca-dir.patch 2020-12-12 06:41:25 UTC (rev 404003) +++ ca-dir.patch 2020-12-12 06:41:29 UTC (rev 404004) @@ -1,31 +0,0 @@ ---- apps/CA.pl.in 2019-09-10 15:13:07.000000000 +0200 -+++ apps/CA.pl.in 2019-10-06 09:34:23.960864556 +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 2019-09-10 15:13:07.000000000 +0200 -+++ apps/openssl.cnf 2019-10-06 09:34:23.960864556 +0200 -@@ -42,7 +42,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. -@@ -325,7 +325,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: openssl/repos/testing-x86_64/ca-dir.patch (from rev 404003, openssl/trunk/ca-dir.patch) =================================================================== --- ca-dir.patch (rev 0) +++ ca-dir.patch 2020-12-12 06:41:29 UTC (rev 404004) @@ -0,0 +1,31 @@ +--- apps/CA.pl.in 2019-09-10 15:13:07.000000000 +0200 ++++ apps/CA.pl.in 2019-10-06 09:34:23.960864556 +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 2019-09-10 15:13:07.000000000 +0200 ++++ apps/openssl.cnf 2019-10-06 09:34:23.960864556 +0200 +@@ -42,7 +42,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. +@@ -325,7 +325,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