mirror of
https://github.com/archlinux/aur.git
synced 2026-01-27 20:28:31 +01:00
Updated to 1.1.0h
This commit is contained in:
pingplug
parent
dff44c84d3
commit
be8de341ba
4 changed files with 12 additions and 92 deletions
19
.SRCINFO
19
.SRCINFO
|
|
@ -1,9 +1,7 @@
|
|||
# Generated by mksrcinfo v8
|
||||
# Sat Jul 29 09:49:51 UTC 2017
|
||||
pkgbase = mingw-w64-openssl
|
||||
pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)
|
||||
pkgver = 1.1.0.f
|
||||
pkgrel = 2
|
||||
pkgver = 1.1.0.h
|
||||
pkgrel = 1
|
||||
url = http://www.openssl.org
|
||||
arch = any
|
||||
license = custom:BSD
|
||||
|
|
@ -14,14 +12,11 @@ pkgbase = mingw-w64-openssl
|
|||
options = !buildflags
|
||||
options = staticlibs
|
||||
options = !emptydirs
|
||||
source = http://www.openssl.org/source/openssl-1.1.0f.tar.gz
|
||||
source = http://www.openssl.org/source/openssl-1.1.0f.tar.gz.asc
|
||||
source = fs54205.patch
|
||||
source = openssl-1.0.2a-x509.patch
|
||||
md5sums = 7b521dea79ab159e8ec879d2333369fa
|
||||
md5sums = SKIP
|
||||
md5sums = 2f1b34d666894f447241c60191e9cfda
|
||||
md5sums = c730f823023879de28513081aedbf06b
|
||||
source = http://www.openssl.org/source/openssl-1.1.0h.tar.gz
|
||||
source = http://www.openssl.org/source/openssl-1.1.0h.tar.gz.asc
|
||||
validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
|
||||
sha256sums = 5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517
|
||||
sha256sums = SKIP
|
||||
|
||||
pkgname = mingw-w64-openssl
|
||||
|
||||
|
|
|
|||
16
PKGBUILD
16
PKGBUILD
|
|
@ -1,9 +1,9 @@
|
|||
# Contributor: ant32 <antreimer@gmail.com>
|
||||
# Contributor: Filip Brcic <brcha@gna.org>
|
||||
pkgname=mingw-w64-openssl
|
||||
_ver=1.1.0f
|
||||
_ver=1.1.0h
|
||||
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)"
|
||||
arch=(any)
|
||||
depends=(mingw-w64-zlib)
|
||||
|
|
@ -11,21 +11,15 @@ makedepends=(mingw-w64-gcc perl)
|
|||
options=(!strip !buildflags staticlibs !emptydirs)
|
||||
license=("custom:BSD")
|
||||
url="http://www.openssl.org"
|
||||
source=("http://www.openssl.org/source/openssl-$_ver.tar.gz"{,.asc}
|
||||
"fs54205.patch"
|
||||
"openssl-1.0.2a-x509.patch")
|
||||
md5sums=('7b521dea79ab159e8ec879d2333369fa'
|
||||
'SKIP'
|
||||
'2f1b34d666894f447241c60191e9cfda'
|
||||
'c730f823023879de28513081aedbf06b')
|
||||
source=("http://www.openssl.org/source/openssl-$_ver.tar.gz"{,.asc})
|
||||
sha256sums=('5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517'
|
||||
'SKIP')
|
||||
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
|
||||
|
||||
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
|
||||
|
||||
prepare() {
|
||||
cd openssl-$_ver
|
||||
patch -p1 -i ${srcdir}/openssl-1.0.2a-x509.patch
|
||||
patch -Np1 -i "$srcdir/fs54205.patch"
|
||||
sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4/' Configure
|
||||
sed -i -e '/^"mingw64"/ s/-O3 -Wall/-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4/' Configure
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff -up openssl-1.0.2a/crypto/x509/by_file.c.x509 openssl-1.0.2a/crypto/x509/by_file.c
|
||||
--- openssl-1.0.2a/crypto/x509/by_file.c.x509 2015-04-09 18:16:29.365456157 +0200
|
||||
+++ openssl-1.0.2a/crypto/x509/by_file.c 2015-04-09 18:16:26.398387618 +0200
|
||||
@@ -152,9 +152,12 @@ int X509_load_cert_file(X509_LOOKUP *ctx
|
||||
}
|
||||
}
|
||||
i = X509_STORE_add_cert(ctx->store_ctx, x);
|
||||
- if (!i)
|
||||
- goto err;
|
||||
- count++;
|
||||
+ /* ignore any problems with current certificate
|
||||
+ and continue with the next one */
|
||||
+ if (i)
|
||||
+ count++;
|
||||
+ else
|
||||
+ ERR_clear_error();
|
||||
X509_free(x);
|
||||
x = NULL;
|
||||
}
|
||||
@@ -167,7 +170,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx
|
||||
}
|
||||
i = X509_STORE_add_cert(ctx->store_ctx, x);
|
||||
if (!i)
|
||||
- goto err;
|
||||
+ ERR_clear_error();
|
||||
ret = i;
|
||||
} else {
|
||||
X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);
|
||||
Loading…
Add table
Reference in a new issue