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

1 files changed, 4 insertions, 11 deletions

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() {