upgpkg: openssl-1.0-chacha20 1.0.2.u-1

4 files changed, 16 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3d7785c06ad..434c92374a9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,28 @@
-# Generated by mksrcinfo v8
-# Mon Jan 21 16:17:53 UTC 2019
 pkgbase = openssl-1.0-chacha20
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with Chacha20 cipher
-	pkgver = 1.0.2.q
-	pkgrel = 2
+	pkgver = 1.0.2.u
+	pkgrel = 1
 	url = https://www.openssl.org
 	arch = x86_64
 	license = custom:BSD
 	depends = perl
 	optdepends = ca-certificates
-	provides = openssl-1.0=1.0.2.q
+	provides = openssl-1.0=1.0.2.u
 	conflicts = openssl-1.0
 	options = !makeflags
 	backup = etc/ssl/openssl.cnf
-	source = https://www.openssl.org/source/openssl-1.0.2q.tar.gz
-	source = https://www.openssl.org/source/openssl-1.0.2q.tar.gz.asc
+	source = https://www.openssl.org/source/openssl-1.0.2u.tar.gz
+	source = https://www.openssl.org/source/openssl-1.0.2u.tar.gz.asc
 	source = no-rpath.patch
 	source = ssl3-test-failure.patch
-	source = ca-dir.patch
 	source = openssl-1.0-versioned-symbols.patch
 	source = openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch
-	sha256sums = 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684
+	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
+	sha256sums = ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
 	sha256sums = SKIP
 	sha256sums = 754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c
 	sha256sums = c54ae87c602eaa1530a336ab7c6e22e12898e1941012349c153e52553df64a13
-	sha256sums = 9e8126f3a748f4c1d6fe34d4436de72b16a40e97a6d18234d2e88caa179d50c4
-	sha256sums = 5ffb7d9d966bc6dbd3f4882796ee9c8613422c63431f2f793903005e54310e44
+	sha256sums = 9826076af410ac72180f9efbbcc53d0a31915e8a7d659308e8a53407edfb0fcc
 	sha256sums = d6f9427d5cb63c7299563c201cd8708c7166e0f8c98b57a1fee69767362bf0f7
 
 pkgname = openssl-1.0-chacha20
diff --git a/PKGBUILD b/PKGBUILD
index ff7e02602c32..1e82d0dbe3be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 
 _pkgname=openssl-1.0
 pkgname=${_pkgname}-chacha20
-_ver=1.0.2q
+_ver=1.0.2u
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with Chacha20 cipher'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -24,15 +24,13 @@ source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
         "https://www.openssl.org/source/openssl-${_ver}.tar.gz.asc"
         'no-rpath.patch'
         'ssl3-test-failure.patch'
-        'ca-dir.patch'
         'openssl-1.0-versioned-symbols.patch'
         'openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch')
-sha256sums=('5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684'
+sha256sums=('ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16'
             'SKIP'
             '754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c'
             'c54ae87c602eaa1530a336ab7c6e22e12898e1941012349c153e52553df64a13'
-            '9e8126f3a748f4c1d6fe34d4436de72b16a40e97a6d18234d2e88caa179d50c4'
-            '353a84e4c92e36c379ebd9216b8f8fb9c271396583561eb84ac8c825979acaa6'
+            '9826076af410ac72180f9efbbcc53d0a31915e8a7d659308e8a53407edfb0fcc'
             'd6f9427d5cb63c7299563c201cd8708c7166e0f8c98b57a1fee69767362bf0f7')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
@@ -51,9 +49,6 @@ prepare() {
 
     # add symbol versioning to prevent conflicts with openssl 1.1 symbols (Debian)
     patch -p1 -i "$srcdir"/openssl-1.0-versioned-symbols.patch
-
-    # set ca dir to /etc/ssl by default
-    patch -p0 -i $srcdir/ca-dir.patch
 }
 
 build() {
@@ -83,9 +78,7 @@ check() {
     cd "$srcdir/openssl-$_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() {
diff --git a/ca-dir.patch b/ca-dir.patch
deleted file mode 100644
index 41d1386d3d06..000000000000
--- a/ca-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- apps/CA.pl.in	2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in	2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
- 
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh	2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh	2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
- 
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf	2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf	2010-04-01 00:35:02.607220681 +0200
-@@ -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.
diff --git a/openssl-1.0-versioned-symbols.patch b/openssl-1.0-versioned-symbols.patch
index 71759a9c1d59..41ebdbc72347 100644
--- a/openssl-1.0-versioned-symbols.patch
+++ b/openssl-1.0-versioned-symbols.patch
@@ -2,7 +2,7 @@
  Configure                 |    2 
  engines/ccgost/openssl.ld |   10 
  engines/openssl.ld        |   10 
- openssl.ld                | 4620 ++++++++++++++++++++++++++++++++++++++++++++++
+ openssl.ld                | 4622 ++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 4642 insertions(+)
 
 --- a/Configure
@@ -44,7 +44,7 @@
 +
 --- /dev/null
 +++ b/openssl.ld
-@@ -0,0 +1,4620 @@
+@@ -0,0 +1,4622 @@
 +OPENSSL_1.0.0 {
 +	global:
 +		BIO_f_ssl;
@@ -599,6 +599,8 @@
 +		EVP_bf_cfb64;
 +		EVP_bf_ecb;
 +		EVP_bf_ofb;
++		EVP_chacha20_poly1305;
++		EVP_chacha20_poly1305_draft;
 +		EVP_cleanup;
 +		EVP_des_cbc;
 +		EVP_des_cfb64;