Browse Source

[multilib-testing] -> [multilib] 'lib32-openssl-1:1.1.1.q-1' move

master
Nathan Owens 1 month ago
parent
commit
4a931622ae
Signed by: ndowens
GPG Key ID: DC5A6F8092641E2D
  1. 63
      lib32-openssl/x86_64/multilib-testing/PKGBUILD
  2. 31
      lib32-openssl/x86_64/multilib-testing/ca-dir.patch
  3. 4
      lib32-openssl/x86_64/multilib/PKGBUILD

63
lib32-openssl/x86_64/multilib-testing/PKGBUILD

@ -1,63 +0,0 @@
# Maintainer: Nathan Owens <ndowens@artixlinux.org>
_pkgbasename=openssl
pkgname=lib32-$_pkgbasename
epoch=1
_ver=1.1.1q
# 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=('d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca'
'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
}

31
lib32-openssl/x86_64/multilib-testing/ca-dir.patch

@ -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

4
lib32-openssl/x86_64/multilib/PKGBUILD

@ -3,7 +3,7 @@
_pkgbasename=openssl
pkgname=lib32-$_pkgbasename
epoch=1
_ver=1.1.1p
_ver=1.1.1q
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
@ -15,7 +15,7 @@ depends=('lib32-glibc' "${_pkgbasename}")
optdepends=('ca-certificates')
source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"{,.asc}
'ca-dir.patch')
sha256sums=('bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f'
sha256sums=('d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca'
'SKIP'
'0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'

Loading…
Cancel
Save