stunnel: update to 5.16.

This commit is contained in:
Christian Neukirchen 2015-04-24 12:17:36 +02:00
parent 2f0bad4ed0
commit 18cf78fe2e
2 changed files with 31 additions and 2 deletions

View file

@ -16,3 +16,32 @@
/* try the good-old default /dev/urandom, if available */
totbytes+=add_rand_file(global, "/dev/urandom");
if(RAND_status())
--- src/verify.c.orig 2015-04-24 12:13:40.887968414 +0200
+++ src/verify.c 2015-04-24 12:16:03.379359153 +0200
@@ -48,7 +48,7 @@
NOEXPORT int verify_callback(int, X509_STORE_CTX *);
NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
-#if OPENSSL_VERSION_NUMBER>=0x10002000L
+#if OPENSSL_VERSION_NUMBER>=0x10002000L && OPENSSL_VERSION_NUMBER<0x20000000L
NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
NOEXPORT int cert_check_local(X509_STORE_CTX *);
@@ -258,7 +258,7 @@
}
if(depth==0) { /* additional peer certificate checks */
-#if OPENSSL_VERSION_NUMBER>=0x10002000L
+#if OPENSSL_VERSION_NUMBER>=0x10002000L && OPENSSL_VERSION_NUMBER<0x20000000L
if(!cert_check_subject(c, callback_ctx))
return 0; /* reject */
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
@@ -269,7 +269,7 @@
return 1; /* accept */
}
-#if OPENSSL_VERSION_NUMBER>=0x10002000L
+#if OPENSSL_VERSION_NUMBER>=0x10002000L && OPENSSL_VERSION_NUMBER<0x20000000L
NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
NAME_LIST *ptr;

View file

@ -1,6 +1,6 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.14
version=5.16
revision=1
build_style=gnu-configure
build_pie=yes
@ -11,7 +11,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="https://www.stunnel.org/"
distfiles="https://www.stunnel.org/downloads/$pkgname-$version.tar.gz"
checksum=2197b4fc1db82eba69c8baf1fac30f0767af26e9f8c7e9e1d5a4a8fbb264695a
checksum=b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d
post_install() {
rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8