Date: Tuesday, April 21, 2020 @ 18:44:23 Author: jelle Revision: 380687
db-move: moved openssl from [testing] to [core] (x86_64) Added: openssl/repos/core-x86_64/PKGBUILD (from rev 380686, openssl/repos/testing-x86_64/PKGBUILD) openssl/repos/core-x86_64/ca-dir.patch (from rev 380686, openssl/repos/testing-x86_64/ca-dir.patch) Deleted: openssl/repos/core-x86_64/PKGBUILD openssl/repos/core-x86_64/ca-dir.patch openssl/repos/testing-x86_64/ --------------------------+ /PKGBUILD | 55 +++++++++++++++++++++++++++++++++++++++++++++ /ca-dir.patch | 31 +++++++++++++++++++++++++ core-x86_64/PKGBUILD | 55 --------------------------------------------- core-x86_64/ca-dir.patch | 31 ------------------------- 4 files changed, 86 insertions(+), 86 deletions(-) Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2020-04-21 15:48:16 UTC (rev 380686) +++ core-x86_64/PKGBUILD 2020-04-21 18:44:23 UTC (rev 380687) @@ -1,55 +0,0 @@ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=openssl -_ver=1.1.1f -# 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' -arch=('x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -depends=('perl') -optdepends=('ca-certificates') -backup=('etc/ssl/openssl.cnf') -source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc} - 'ca-dir.patch') -sha256sums=('186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35' - 'SKIP' - '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e') -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/$pkgname-$_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/$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 -} Copied: openssl/repos/core-x86_64/PKGBUILD (from rev 380686, openssl/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2020-04-21 18:44:23 UTC (rev 380687) @@ -0,0 +1,55 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=openssl +_ver=1.1.1g +# 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' +arch=('x86_64') +url='https://www.openssl.org' +license=('custom:BSD') +depends=('perl') +optdepends=('ca-certificates') +backup=('etc/ssl/openssl.cnf') +source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc} + 'ca-dir.patch') +sha256sums=('ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46' + 'SKIP' + '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e') +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/$pkgname-$_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/$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: core-x86_64/ca-dir.patch =================================================================== --- core-x86_64/ca-dir.patch 2020-04-21 15:48:16 UTC (rev 380686) +++ core-x86_64/ca-dir.patch 2020-04-21 18:44:23 UTC (rev 380687) @@ -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: openssl/repos/core-x86_64/ca-dir.patch (from rev 380686, openssl/repos/testing-x86_64/ca-dir.patch) =================================================================== --- core-x86_64/ca-dir.patch (rev 0) +++ core-x86_64/ca-dir.patch 2020-04-21 18:44:23 UTC (rev 380687) @@ -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