From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16CF91382C5 for ; Mon, 16 Apr 2018 17:31:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24563E096A; Mon, 16 Apr 2018 17:31:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2648E096A for ; Mon, 16 Apr 2018 17:31:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B942C335C0C for ; Mon, 16 Apr 2018 17:31:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0109727C for ; Mon, 16 Apr 2018 17:31:04 +0000 (UTC) From: "Jason Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Donenfeld" Message-ID: <1523899820.5788ebc0a13f19bb93a49f2f9b8d10902cb0fcc1.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/, net-vpn/openvpn/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch net-vpn/openvpn/openvpn-2.4.5.ebuild X-VCS-Directories: net-vpn/openvpn/ net-vpn/openvpn/files/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason Donenfeld X-VCS-Revision: 5788ebc0a13f19bb93a49f2f9b8d10902cb0fcc1 X-VCS-Branch: master Date: Mon, 16 Apr 2018 17:31:04 +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: da12f17d-39cd-436d-a15b-5e80ca41f383 X-Archives-Hash: 7f749b799ef6fc7f81d523b119ec6968 commit: 5788ebc0a13f19bb93a49f2f9b8d10902cb0fcc1 Author: Jason A. Donenfeld gentoo org> AuthorDate: Mon Apr 16 17:29:55 2018 +0000 Commit: Jason Donenfeld gentoo org> CommitDate: Mon Apr 16 17:30:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5788ebc0 net-vpn/openvpn: fix compilation with libressl Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../files/openvpn-2.4.5-libressl-macro-fix.patch | 63 ++++++++++++++++++++++ net-vpn/openvpn/openvpn-2.4.5.ebuild | 1 + 2 files changed, 64 insertions(+) diff --git a/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch b/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch new file mode 100644 index 00000000000..13b97600952 --- /dev/null +++ b/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch @@ -0,0 +1,63 @@ +diff --git a/configure.ac b/configure.ac +index 626b4dd..2a8e87f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -948,6 +948,18 @@ if test "${with_crypto_library}" = "openssl"; then + EC_GROUP_order_bits + ] + ) ++ AC_CHECK_DECLS( ++ [ ++ SSL_CTX_get_min_proto_version, ++ SSL_CTX_get_max_proto_version, ++ SSL_CTX_set_min_proto_version, ++ SSL_CTX_set_max_proto_version, ++ ], ++ , ++ , ++ [[#include ]] ++ ++ ) + + CFLAGS="${saved_CFLAGS}" + LIBS="${saved_LIBS}" +diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h +index d375fab..340d452 100644 +--- a/src/openvpn/openssl_compat.h ++++ b/src/openvpn/openssl_compat.h +@@ -661,7 +661,7 @@ EC_GROUP_order_bits(const EC_GROUP *group) + #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT RSA_F_RSA_EAY_PRIVATE_ENCRYPT + #endif + +-#ifndef SSL_CTX_get_min_proto_version ++#if !HAVE_DECL_SSL_CTX_GET_MIN_PROTO_VERSION + /** Return the min SSL protocol version currently enabled in the context. + * If no valid version >= TLS1.0 is found, return 0. */ + static inline int +@@ -684,7 +684,7 @@ SSL_CTX_get_min_proto_version(SSL_CTX *ctx) + } + #endif /* SSL_CTX_get_min_proto_version */ + +-#ifndef SSL_CTX_get_max_proto_version ++#if !HAVE_DECL_SSL_CTX_GET_MAX_PROTO_VERSION + /** Return the max SSL protocol version currently enabled in the context. + * If no valid version >= TLS1.0 is found, return 0. */ + static inline int +@@ -707,7 +707,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) + } + #endif /* SSL_CTX_get_max_proto_version */ + +-#ifndef SSL_CTX_set_min_proto_version ++#if !HAVE_DECL_SSL_CTX_SET_MIN_PROTO_VERSION + /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ + static inline int + SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) +@@ -736,7 +736,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) + } + #endif /* SSL_CTX_set_min_proto_version */ + +-#ifndef SSL_CTX_set_max_proto_version ++#if !HAVE_DECL_SSL_CTX_SET_MAX_PROTO_VERSION + /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ + static inline int + SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) diff --git a/net-vpn/openvpn/openvpn-2.4.5.ebuild b/net-vpn/openvpn/openvpn-2.4.5.ebuild index 7143fb14c09..d93cd5da7e5 100644 --- a/net-vpn/openvpn/openvpn-2.4.5.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.5.ebuild @@ -49,6 +49,7 @@ CONFIG_CHECK="~TUN" PATCHES=( "${FILESDIR}/${PN}-external-cmocka.patch" + "${FILESDIR}/${P}-libressl-macro-fix.patch" ) pkg_setup() {