commit: 4b7479ee4fce3ca2a4597a9a9b95a693306e85f2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Fri Jun 7 04:25:01 2019 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Jun 7 04:25:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7479ee
app-admin/conserver: add libressl patch for 8.2.4 Closes: https://bugs.gentoo.org/687542 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> app-admin/conserver/conserver-8.2.4.ebuild | 2 ++ app-admin/conserver/files/8.2.4-libressl.patch | 27 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild index 54eae640841..6429ff850b3 100644 --- a/app-admin/conserver/conserver-8.2.4.ebuild +++ b/app-admin/conserver/conserver-8.2.4.ebuild @@ -32,6 +32,8 @@ RDEPEND="${DEPEND} DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts) +PATCHES=( "${FILESDIR}/${PV}-libressl.patch" ) + src_prepare() { default sed -e '/^INSTALL_PROGRAM/s:-s::' \ diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch new file mode 100644 index 00000000000..9151d697e75 --- /dev/null +++ b/app-admin/conserver/files/8.2.4-libressl.patch @@ -0,0 +1,27 @@ +From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001 +From: Stuart Henderson <s...@spacehopper.org> +Date: Wed, 27 Mar 2019 23:29:31 +0000 +Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0 + +--- + conserver/cutil.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/conserver/cutil.h b/conserver/cutil.h +index d21abc5..db4df7f 100644 +--- a/conserver/cutil.h ++++ b/conserver/cutil.h +@@ -12,10 +12,12 @@ + # include <openssl/err.h> + # if OPENSSL_VERSION_NUMBER < 0x10100000L + # define TLS_method SSLv23_method ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + # define CIPHER_SEC0 + # else + # define CIPHER_SEC0 ":@SECLEVEL=0" +-# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ + #endif + #if HAVE_GSSAPI + # include <gssapi/gssapi.h>
