diff options
| author |   Chen, Chih-Chia <pigfoot@gmail.com> | 2016-06-02 14:30:38 +0800 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2016-06-08 20:42:16 -0400 |
| commit | 8f6b6be69698abccbd6b5d341f764776422d7f31 (patch) | |
| tree | d8940af45659e55835cdb65fcb28302f1e061c16 /net-misc/socat | |
| parent | Merge pull request #152 from csmk/spamassassin (diff) | |
| download | libressl-8f6b6be69698abccbd6b5d341f764776422d7f31.tar.gz libressl-8f6b6be69698abccbd6b5d341f764776422d7f31.tar.bz2 libressl-8f6b6be69698abccbd6b5d341f764776422d7f31.zip | |
net-misc/socat: support libressl >= 2.3.0
Diffstat (limited to 'net-misc/socat')
| -rw-r--r-- | net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch | 70 | ||||
| -rw-r--r-- | net-misc/socat/socat-1.7.3.1-r1.ebuild | 4 |
2 files changed, 74 insertions, 0 deletions
diff --git a/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch b/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch new file mode 100644 index 0000000..847dd4f --- /dev/null +++ b/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch @@ -0,0 +1,70 @@ +diff --git a/sslcls.c.orig b/sslcls.c +index 6ddc077..cc07220 100644 +--- a/sslcls.c.orig ++++ b/sslcls.c +@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) { + } + #endif + ++#if HAVE_SSLv3_client_method + const SSL_METHOD *sycSSLv3_client_method(void) { + const SSL_METHOD *result; + Debug("SSLv3_client_method()"); +@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) { + Debug1("SSLv3_client_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_SSLv3_server_method + const SSL_METHOD *sycSSLv3_server_method(void) { + const SSL_METHOD *result; + Debug("SSLv3_server_method()"); +@@ -70,7 +73,9 @@ const SSL_METHOD *sycSSLv3_server_method(void) { + Debug1("SSLv3_server_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_SSLv23_client_method + const SSL_METHOD *sycSSLv23_client_method(void) { + const SSL_METHOD *result; + Debug("SSLv23_client_method()"); +@@ -78,7 +83,9 @@ const SSL_METHOD *sycSSLv23_client_method(void) { + Debug1("SSLv23_client_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_SSLv23_server_method + const SSL_METHOD *sycSSLv23_server_method(void) { + const SSL_METHOD *result; + Debug("SSLv23_server_method()"); +@@ -86,7 +93,9 @@ const SSL_METHOD *sycSSLv23_server_method(void) { + Debug1("SSLv23_server_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_TLSv1_client_method + const SSL_METHOD *sycTLSv1_client_method(void) { + const SSL_METHOD *result; + Debug("TLSv1_client_method()"); +@@ -94,7 +103,9 @@ const SSL_METHOD *sycTLSv1_client_method(void) { + Debug1("TLSv1_client_method() -> %p", result); + return result; + } ++#endif + ++#if HAVE_TLSv1_server_method + const SSL_METHOD *sycTLSv1_server_method(void) { + const SSL_METHOD *result; + Debug("TLSv1_server_method()"); +@@ -102,6 +113,7 @@ const SSL_METHOD *sycTLSv1_server_method(void) { + Debug1("TLSv1_server_method() -> %p", result); + return result; + } ++#endif + + #if HAVE_TLSv1_1_client_method + const SSL_METHOD *sycTLSv1_1_client_method(void) { diff --git a/net-misc/socat/socat-1.7.3.1-r1.ebuild b/net-misc/socat/socat-1.7.3.1-r1.ebuild index 25fe724..b4897ba 100644 --- a/net-misc/socat/socat-1.7.3.1-r1.ebuild +++ b/net-misc/socat/socat-1.7.3.1-r1.ebuild @@ -36,6 +36,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch use libressl && epatch "${FILESDIR}"/0001-remove-openssl-comp.patch + + # Fix for LibreSSL >= 2.3.0 + epatch "${FILESDIR}"/${PN}-1.7.3.1-no-ssl3.patch + epatch_user eautoreconf } |