[arch-commits] Commit in openssl/trunk (PKGBUILD fs54205.patch)

[Pierre Schmitz]

    Date: Thursday, November 2, 2017 @ 17:41:24
  Author: pierre
Revision: 308864

upgpkg: openssl 1.1.0.g-1

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/fs54205.patch

---------------+
 PKGBUILD      |   14 +++++---------
 fs54205.patch |   41 -----------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-02 16:46:29 UTC (rev 308863)
+++ PKGBUILD	2017-11-02 17:41:24 UTC (rev 308864)
@@ -2,11 +2,11 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=openssl
-_ver=1.1.0f
+_ver=1.1.0g
 # 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'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -16,12 +16,10 @@
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
-        'ca-dir.patch'
-	'fs54205.patch')
-sha256sums=('12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765'
+        'ca-dir.patch')
+sha256sums=('de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af'
             'SKIP'
-            '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790'
-            '04de0feaaa81b5fb1c70a00c9f46670eb748f6d6795bd228d613c5f15c92af15')
+            '90c7411fed0157116f2df8f4be755aaf5a26e8484351b4e6a79492805d5f2790')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 prepare() {
@@ -29,8 +27,6 @@
 
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i "$srcdir/ca-dir.patch"
-
-	patch -Np1 -i "$srcdir/fs54205.patch"
 }
 
 build() {

Deleted: fs54205.patch
===================================================================
--- fs54205.patch	2017-11-02 16:46:29 UTC (rev 308863)
+++ fs54205.patch	2017-11-02 17:41:24 UTC (rev 308864)
@@ -1,41 +0,0 @@
-From 6831138ced3804f8ebd2079b671a40c74794a8c4 Mon Sep 17 00:00:00 2001
-From: Rich Salz <rsalz at 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);
- }
-