public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Stefan Strogin" <steils@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
Date: Sat, 15 Aug 2020 05:34:21 +0000 (UTC)	[thread overview]
Message-ID: <1597469630.6ea1b718ba18f07813d789e591fdb43f1302603a.steils@gentoo> (raw)

commit:     6ea1b718ba18f07813d789e591fdb43f1302603a
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 05:31:52 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 05:33:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea1b718

net-analyzer/ettercap: add patch for LibreSSL

Closes: https://bugs.gentoo.org/736990
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 net-analyzer/ettercap/ettercap-0.8.3.1.ebuild      |  2 ++
 .../ettercap/files/ettercap-0.8.3.1-libressl.patch | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index f6f494b3507..bfaf4b447d3 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
 	cmake_src_prepare

diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
new file mode 100644
index 00000000000..ed5a49ce436
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
@@ -0,0 +1,37 @@
+From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan@steils.org>
+Date: Sat, 15 Aug 2020 07:18:31 +0300
+Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
+
+Disable taking over SNI extension from ClientHello and SSL configuration
+operations until LibreSSL supports the required API.
+
+Fixes: https://github.com/Ettercap/ettercap/issues/1068
+Upstream-Status: Submitted
+[https://github.com/Ettercap/ettercap/pull/1069]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/ec_sslwrap.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c
+index b9f26a14..1e4c24fc 100644
+--- a/src/ec_sslwrap.c
++++ b/src/ec_sslwrap.c
+@@ -71,11 +71,11 @@
+ #define TLS_server_method SSLv23_server_method
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_OPENSSL_1_1_0
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_OPENSSL_1_1_1
+ #endif
+ 
+-- 
+2.28.0
+


             reply	other threads:[~2020-08-15  5:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-15  5:34 Stefan Strogin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-10 16:38 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/ Sam James
2023-04-14  0:31 Sam James
2020-02-01  0:29 Jeroen Roovers
2019-11-01 19:57 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1597469630.6ea1b718ba18f07813d789e591fdb43f1302603a.steils@gentoo \
    --to=steils@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox