From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 30DED138252 for ; Wed, 11 May 2016 14:23:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05A09E0854; Wed, 11 May 2016 14:23:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A0D6E0854 for ; Wed, 11 May 2016 14:23:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 021213408CF for ; Wed, 11 May 2016 14:23:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D95CF32E for ; Wed, 11 May 2016 14:23:09 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1462976645.59e2b59bdca8190353478c9432a44c04d9d485b5.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/stunnel/files/stunnel-compat-libressl.patch net-misc/stunnel/stunnel-5.30.ebuild net-misc/stunnel/stunnel-5.31.ebuild net-misc/stunnel/stunnel-5.32.ebuild X-VCS-Directories: net-misc/stunnel/ net-misc/stunnel/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 59e2b59bdca8190353478c9432a44c04d9d485b5 X-VCS-Branch: master Date: Wed, 11 May 2016 14:23:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87dfea93-542b-4d5d-9099-6bb05e7522f4 X-Archives-Hash: 3403245c22fa9dd4513364f04b2b6616 commit: 59e2b59bdca8190353478c9432a44c04d9d485b5 Author: Anthony G. Basile gentoo org> AuthorDate: Wed May 11 14:21:12 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed May 11 14:24:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e2b59b net-misc/stunnel: add libressl compat patch, bug #582050 Package-Manager: portage-2.2.26 .../stunnel/files/stunnel-compat-libressl.patch | 32 ++++++++++++++++++++++ net-misc/stunnel/stunnel-5.30.ebuild | 3 ++ net-misc/stunnel/stunnel-5.31.ebuild | 3 ++ net-misc/stunnel/stunnel-5.32.ebuild | 3 ++ 4 files changed, 41 insertions(+) diff --git a/net-misc/stunnel/files/stunnel-compat-libressl.patch b/net-misc/stunnel/files/stunnel-compat-libressl.patch new file mode 100644 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 5acb98e..a5e0fda 100644 --- 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 4eac53e..6fb712f 100644 --- 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 4eac53e..6fb712f 100644 --- 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 }