Updated to 1.1.1d

3 files changed, 14 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 548e0c3df935..5dfd67e5e7e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssl-zlib
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with zlib support
-	pkgver = 1.1.0.f
-	pkgrel = 2
+	pkgver = 1.1.1.d
+	pkgrel = 1
 	url = https://www.openssl.org
 	arch = i686
 	arch = x86_64
@@ -12,15 +12,14 @@ pkgbase = openssl-zlib
 	provides = openssl
 	conflicts = openssl
 	backup = etc/ssl/openssl.cnf
-	source = https://www.openssl.org/source/openssl-1.1.0f.tar.gz
-	source = https://www.openssl.org/source/openssl-1.1.0f.tar.gz.asc
+	source = https://www.openssl.org/source/openssl-1.1.1d.tar.gz
+	source = https://www.openssl.org/source/openssl-1.1.1d.tar.gz.asc
 	source = ca-dir.patch
-	source = fs54205.patch
 	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
-	sha256sums = 12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765
+	validpgpkeys = 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
+	sha256sums = 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
 	sha256sums = SKIP
 	sha256sums = 90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790
-	sha256sums = 04de0feaaa81b5fb1c70a00c9f46670eb748f6d6795bd228d613c5f15c92af15
 
 pkgname = openssl-zlib
 
diff --git a/PKGBUILD b/PKGBUILD
index ee28057939ec..c2c0dba40c55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,10 @@
 
 _basename=openssl
 pkgname=openssl-zlib
-_ver=1.1.0f
+_ver=1.1.1d
 # 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 zlib support'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -15,15 +14,13 @@ license=('custom:BSD')
 depends=('perl' 'zlib')
 optdepends=('ca-certificates')
 backup=('etc/ssl/openssl.cnf')
-source=("https://www.openssl.org/source/${_basename}-${_ver}.tar.gz"
-        "https://www.openssl.org/source/${_basename}-${_ver}.tar.gz.asc"
-        'ca-dir.patch'
-	'fs54205.patch')
-sha256sums=('12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765'
+source=("https://www.openssl.org/source/${_basename}-${_ver}.tar.gz"{,.asc}
+        'ca-dir.patch')
+sha256sums=('1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2'
             'SKIP'
-            '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790'
-            '04de0feaaa81b5fb1c70a00c9f46670eb748f6d6795bd228d613c5f15c92af15')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+            '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
+              '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 provides=('openssl')
 conflicts=('openssl')
 
@@ -32,8 +29,6 @@ prepare() {
 
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i "$srcdir/ca-dir.patch"
-
-	patch -Np1 -i "$srcdir/fs54205.patch"
 }
 
 build() {
diff --git a/fs54205.patch b/fs54205.patch
deleted file mode 100644
index f20068d42b15..000000000000
--- a/fs54205.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6831138ced3804f8ebd2079b671a40c74794a8c4 Mon Sep 17 00:00:00 2001
-From: Rich Salz <rsalz@openssl.org>
-Date: Wed, 31 May 2017 12:14:55 -0400
-Subject: [PATCH] Only release thread-local key if we created it.
-
-Thanks to Jan Alexander Steffens for finding the bug and confirming the
-fix.
----
- crypto/err/err.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/err/err.c b/crypto/err/err.c
-index f866f2fdd0a..c55f849590b 100644
---- a/crypto/err/err.c
-+++ b/crypto/err/err.c
-@@ -122,6 +122,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = {
- #endif
- 
- static CRYPTO_ONCE err_init = CRYPTO_ONCE_STATIC_INIT;
-+static int set_err_thread_local;
- static CRYPTO_THREAD_LOCAL err_thread_local;
- 
- static CRYPTO_ONCE err_string_init = CRYPTO_ONCE_STATIC_INIT;
-@@ -260,7 +261,8 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
- 
- void err_cleanup(void)
- {
--    CRYPTO_THREAD_cleanup_local(&err_thread_local);
-+    if (set_err_thread_local != 0)
-+        CRYPTO_THREAD_cleanup_local(&err_thread_local);
-     CRYPTO_THREAD_lock_free(err_string_lock);
-     err_string_lock = NULL;
- }
-@@ -639,6 +641,7 @@ void ERR_remove_state(unsigned long pid)
- 
- DEFINE_RUN_ONCE_STATIC(err_do_init)
- {
-+    set_err_thread_local = 1;
-     return CRYPTO_THREAD_init_local(&err_thread_local, NULL);
- }
-