Date: Tuesday, November 1, 2022 @ 12:55:57
Author: foutrelis
Revision: 1340078
upgpkg: lib32-openssl 1:3.0.5-1
Modified:
lib32-openssl/trunk/PKGBUILD
lib32-openssl/trunk/ca-dir.patch
--------------+
PKGBUILD | 30 +++++++++++++-----------------
ca-dir.patch | 16 ++++++++--------
2 files changed, 21 insertions(+), 25 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-01 11:23:16 UTC (rev 1340077)
+++ PKGBUILD 2022-11-01 12:55:57 UTC (rev 1340078)
@@ -3,29 +3,27 @@
_pkgbasename=openssl
pkgname=lib32-$_pkgbasename
epoch=1
-_ver=1.1.1q
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgver=3.0.5
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')
+license=('Apache')
depends=('lib32-glibc' "${_pkgbasename}")
optdepends=('ca-certificates')
-source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"{,.asc}
+source=("https://www.openssl.org/source/${_pkgbasename}-${pkgver}.tar.gz"{,.asc}
'ca-dir.patch')
-sha256sums=('d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca'
+sha256sums=('aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a'
'SKIP'
- '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
+ '0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
prepare() {
- cd "$srcdir"/$_pkgbasename-$_ver
+ cd "$srcdir"/$_pkgbasename-$pkgver
# set ca dir to /etc/ssl by default
- patch -p0 -i "$srcdir"/ca-dir.patch
+ patch -Np1 -i "$srcdir"/ca-dir.patch
}
build() {
@@ -33,11 +31,11 @@
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- cd "$srcdir"/$_pkgbasename-$_ver
+ cd "$srcdir"/$_pkgbasename-$pkgver
# 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 \
+ shared enable-ktls linux-elf \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make MAKEDEPPROG="${CC}" depend
@@ -45,19 +43,17 @@
}
check() {
- cd "$srcdir"/$_pkgbasename-$_ver
+ cd "$srcdir"/$_pkgbasename-$pkgver
# 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
+ patch -Rp1 -i "$srcdir"/ca-dir.patch
make test
- patch -p0 -i "$srcdir"/ca-dir.patch
+ patch -Np1 -i "$srcdir"/ca-dir.patch
}
package() {
- cd "$srcdir"/$_pkgbasename-$_ver
+ cd "$srcdir"/$_pkgbasename-$pkgver
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
}
Modified: ca-dir.patch
===================================================================
--- ca-dir.patch 2022-11-01 11:23:16 UTC (rev 1340077)
+++ ca-dir.patch 2022-11-01 12:55:57 UTC (rev 1340078)
@@ -1,17 +1,17 @@
---- 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 @@
+--- a/apps/CA.pl.in
++++ b/apps/CA.pl.in
+@@ -29,7 +29,7 @@
my $PKCS12 = "$openssl pkcs12";
- # default openssl.cnf file has setup as per the following
+ # Default values for various configuration settings.
-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 @@
+--- a/apps/openssl.cnf
++++ b/apps/openssl.cnf
+@@ -79,7 +79,7 @@
####################################################################
[ CA_default ]
@@ -20,7 +20,7 @@
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 @@
+@@ -309,7 +309,7 @@
[ tsa_config1 ]
# These are used by the TSA reply generation only.
