net-misc/stunnel: add libressl compat patch, bug #582050

Package-Manager: portage-2.2.26

diff --git a/net-misc/stunnel/files/stunnel-compat-libressl.patch b/net-misc/stunnel/files/stunnel-compat-libressl.patch
new file mode 100644 (file)
index 0000000..5d92cab
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-compat-libressl.patch
@@ -0,0 +1,32 @@
+Author: 80x24 <80x24@momoka.net>
+
+diff -ru stunnel-5.24/src/verify.c stunnel-5.24.new/src/verify.c
+--- stunnel-5.24/src/verify.c  2015-09-23 18:00:08.000000000 +0800
++++ stunnel-5.24.new/src/verify.c      2015-11-18 13:16:06.321540501 +0800
+@@ -51,7 +51,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 && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+ NOEXPORT int cert_check_local(X509_STORE_CTX *);
+@@ -280,7 +280,7 @@
+     }
+ 
+     if(depth==0) { /* additional peer certificate checks */
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+         if(!cert_check_subject(c, callback_ctx))
+             return 0; /* reject */
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+@@ -291,7 +291,7 @@
+     return 1; /* accept */
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 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;

diff --git a/net-misc/stunnel/stunnel-5.30.ebuild b/net-misc/stunnel/stunnel-5.30.ebuild
index 5acb98e89aed3d552dcfb766cc26a011321a3476..a5e0fdac9310e4fe7f890029b22d43f2a4b280f3 100644 (file)
--- a/net-misc/stunnel/stunnel-5.30.ebuild
+++ b/net-misc/stunnel/stunnel-5.30.ebuild
@@ -40,6 +40,9 @@ src_prepare() {
        sed -i -e "s/^install-data-local:/do-not-run-this:/" \
                tools/Makefile.in || die "sed failed"
 
+       # libressl compat
+       epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
        echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 }
 

diff --git a/net-misc/stunnel/stunnel-5.31.ebuild b/net-misc/stunnel/stunnel-5.31.ebuild
index 4eac53ed941b6bddce751b44b831a5e5d6b68b2e..6fb712f83c960b75341bcfe82f9179f4cbef60a4 100644 (file)
--- a/net-misc/stunnel/stunnel-5.31.ebuild
+++ b/net-misc/stunnel/stunnel-5.31.ebuild
@@ -40,6 +40,9 @@ src_prepare() {
        sed -i -e "s/^install-data-local:/do-not-run-this:/" \
                tools/Makefile.in || die "sed failed"
 
+       # libressl compat
+       epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
        echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 }
 

diff --git a/net-misc/stunnel/stunnel-5.32.ebuild b/net-misc/stunnel/stunnel-5.32.ebuild
index 4eac53ed941b6bddce751b44b831a5e5d6b68b2e..6fb712f83c960b75341bcfe82f9179f4cbef60a4 100644 (file)
--- a/net-misc/stunnel/stunnel-5.32.ebuild
+++ b/net-misc/stunnel/stunnel-5.32.ebuild
@@ -40,6 +40,9 @@ src_prepare() {
        sed -i -e "s/^install-data-local:/do-not-run-this:/" \
                tools/Makefile.in || die "sed failed"
 
+       # libressl compat
+       epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
        echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 }