[arch-commits] Commit in lib32-openssl/trunk (PKGBUILD ca-dir.patch)

[Pierre Schmitz]

    Date: Wednesday, September 12, 2018 @ 07:14:56
  Author: pierre
Revision: 379781

upgpkg: lib32-openssl 1:1.1.1-1

Modified:
  lib32-openssl/trunk/PKGBUILD
  lib32-openssl/trunk/ca-dir.patch

--------------+
 PKGBUILD     |   21 ++++++++-------------
 ca-dir.patch |   12 ++++++------
 2 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-12 04:52:30 UTC (rev 379780)
+++ PKGBUILD	2018-09-12 07:14:56 UTC (rev 379781)
@@ -2,12 +2,11 @@
 
 _pkgbasename=openssl
 pkgname=lib32-$_pkgbasename
-_ver=1.1.0i
+epoch=1
+_ver=1.1.1
 # 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'
@@ -14,13 +13,12 @@
 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"
+source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"{,.asc}
         'ca-dir.patch')
-validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
-md5sums=('9495126aafd2659d357ea66a969c3fe1'
-         'SKIP'
-         '02b53865fb70faef763e262b4971aa4b')
+sha256sums=('2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d'
+            'SKIP'
+            '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
 	cd "$srcdir"/$_pkgbasename-$_ver
@@ -27,8 +25,6 @@
 
 	# 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() {
@@ -40,8 +36,7 @@
 
 	# 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 no-ssl3-method linux-elf \
 		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 
 	make MAKEDEPPROG="${CC}" depend

Modified: ca-dir.patch
===================================================================
--- ca-dir.patch	2018-09-12 04:52:30 UTC (rev 379780)
+++ ca-dir.patch	2018-09-12 07:14:56 UTC (rev 379781)
@@ -1,5 +1,5 @@
---- apps/CA.pl.in	2016-09-26 11:46:04.000000000 +0200
-+++ apps/CA.pl.in	2016-11-01 16:02:16.709616823 +0100
+--- 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";
  
@@ -9,9 +9,9 @@
  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 @@
+--- 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 ]
  
@@ -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.
-@@ -323,7 +323,7 @@
+@@ -327,7 +327,7 @@
  [ tsa_config1 ]
  
  # These are used by the TSA reply generation only.