diff options
| -rw-r--r-- | app-admin/conserver/conserver-8.2.3-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-admin/conserver/files/8.2.3-libressl.patch | 31 |
2 files changed, 0 insertions, 33 deletions
diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild index bbd550947e0b..063cb719746d 100644 --- a/app-admin/conserver/conserver-8.2.3-r1.ebuild +++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild @@ -30,8 +30,6 @@ RDEPEND="${DEPEND} DOCS=( CHANGES FAQ PROTOCOL README 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.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch deleted file mode 100644 index 8b04acb7b88c..000000000000 --- a/app-admin/conserver/files/8.2.3-libressl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Thu, 6 Jun 2019 21:30:16 -0700 -Subject: [PATCH] libressl - -backport of https://github.com/conserver/conserver/pull/26 ---- - conserver/cutil.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/conserver/cutil.h b/conserver/cutil.h -index 63aef65..07aa6d4 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> --- -2.21.0 - |