[arch-commits] Commit in lib32-openssl/repos (5 files)
Jelle van der Waa
jelle at archlinux.org
Tue Apr 21 18:45:29 UTC 2020
Date: Tuesday, April 21, 2020 @ 18:45:28
Author: jelle
Revision: 617387
db-move: moved lib32-openssl from [multilib-testing] to [multilib] (x86_64)
Added:
lib32-openssl/repos/multilib-x86_64/PKGBUILD
(from rev 617386, lib32-openssl/repos/multilib-testing-x86_64/PKGBUILD)
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
(from rev 617386, lib32-openssl/repos/multilib-testing-x86_64/ca-dir.patch)
Deleted:
lib32-openssl/repos/multilib-testing-x86_64/
lib32-openssl/repos/multilib-x86_64/PKGBUILD
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
------------------------------+
/PKGBUILD | 63 +++++++++++++++++++++++++++++++++++++++++
/ca-dir.patch | 31 ++++++++++++++++++++
multilib-x86_64/PKGBUILD | 63 -----------------------------------------
multilib-x86_64/ca-dir.patch | 31 --------------------
4 files changed, 94 insertions(+), 94 deletions(-)
Deleted: multilib-x86_64/PKGBUILD
===================================================================
--- multilib-x86_64/PKGBUILD 2020-04-21 18:26:49 UTC (rev 617386)
+++ multilib-x86_64/PKGBUILD 2020-04-21 18:45:28 UTC (rev 617387)
@@ -1,63 +0,0 @@
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-epoch=1
-_ver=1.1.1e
-# 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=('694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe'
- '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 617386, lib32-openssl/repos/multilib-testing-x86_64/PKGBUILD)
===================================================================
--- multilib-x86_64/PKGBUILD (rev 0)
+++ multilib-x86_64/PKGBUILD 2020-04-21 18:45:28 UTC (rev 617387)
@@ -0,0 +1,63 @@
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+_pkgbasename=openssl
+pkgname=lib32-$_pkgbasename
+epoch=1
+_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 (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=('ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46'
+ '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: multilib-x86_64/ca-dir.patch
===================================================================
--- multilib-x86_64/ca-dir.patch 2020-04-21 18:26:49 UTC (rev 617386)
+++ multilib-x86_64/ca-dir.patch 2020-04-21 18:45:28 UTC (rev 617387)
@@ -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 617386, lib32-openssl/repos/multilib-testing-x86_64/ca-dir.patch)
===================================================================
--- multilib-x86_64/ca-dir.patch (rev 0)
+++ multilib-x86_64/ca-dir.patch 2020-04-21 18:45:28 UTC (rev 617387)
@@ -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
More information about the arch-commits
mailing list