Date: Thursday, August 23, 2018 @ 16:38:08
Author: eschwartz
Revision: 373448
archrelease: copy trunk to multilib-x86_64
Added:
lib32-openssl/repos/multilib-x86_64/PKGBUILD
(from rev 373447, lib32-openssl/trunk/PKGBUILD)
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
(from rev 373447, lib32-openssl/trunk/ca-dir.patch)
Deleted:
lib32-openssl/repos/multilib-x86_64/PKGBUILD
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
--------------+
PKGBUILD | 137 ++++++++++++++++++++++++++++-----------------------------
ca-dir.patch | 62 ++++++++++++-------------
2 files changed, 99 insertions(+), 100 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-23 16:37:36 UTC (rev 373447)
+++ PKGBUILD 2018-08-23 16:38:08 UTC (rev 373448)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pie...@archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-_ver=1.1.0h
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=1
-epoch=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')
-makedepends=('gcc-multilib')
-source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz";
- "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc";
- 'ca-dir.patch')
-validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
-md5sums=('5271477e4d93f4ea032b665ef095ff24'
- 'SKIP'
- '02b53865fb70faef763e262b4971aa4b')
-
-prepare() {
- cd $srcdir/$_pkgbasename-$_ver
-
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
- # test fails since 1.1.0h
- rm test/recipes/80-test_cms.t
-}
-
-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 373447,
lib32-openssl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-23 16:38:08 UTC (rev 373448)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pie...@archlinux.de>
+
+_pkgbasename=openssl
+pkgname=lib32-$_pkgbasename
+_ver=1.1.0i
+# use a pacman compatible version scheme
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+#pkgver=$_ver
+pkgrel=1
+epoch=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";
+ "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc";
+ 'ca-dir.patch')
+validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
+md5sums=('9495126aafd2659d357ea66a969c3fe1'
+ 'SKIP'
+ '02b53865fb70faef763e262b4971aa4b')
+
+prepare() {
+ cd "$srcdir"/$_pkgbasename-$_ver
+
+ # set ca dir to /etc/ssl by default
+ patch -p0 -i "$srcdir"/ca-dir.patch
+ # test fails since 1.1.0h
+ rm test/recipes/80-test_cms.t
+}
+
+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: ca-dir.patch
===================================================================
--- ca-dir.patch 2018-08-23 16:37:36 UTC (rev 373447)
+++ ca-dir.patch 2018-08-23 16:38:08 UTC (rev 373448)
@@ -1,31 +0,0 @@
---- apps/CA.pl.in 2016-09-26 11:46:04.000000000 +0200
-+++ apps/CA.pl.in 2016-11-01 16:02:16.709616823 +0100
-@@ -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 2016-09-26 11:46:04.000000000 +0200
-+++ apps/openssl.cnf 2016-11-01 16:02:48.378503427 +0100
-@@ -39,7 +39,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.
-@@ -323,7 +323,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 373447,
lib32-openssl/trunk/ca-dir.patch)
===================================================================
--- ca-dir.patch (rev 0)
+++ ca-dir.patch 2018-08-23 16:38:08 UTC (rev 373448)
@@ -0,0 +1,31 @@
+--- apps/CA.pl.in 2016-09-26 11:46:04.000000000 +0200
++++ apps/CA.pl.in 2016-11-01 16:02:16.709616823 +0100
+@@ -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 2016-09-26 11:46:04.000000000 +0200
++++ apps/openssl.cnf 2016-11-01 16:02:48.378503427 +0100
+@@ -39,7 +39,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.
+@@ -323,7 +323,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
