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 6AF3A138350 for ; Sat, 1 Feb 2020 00:30:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D569FE0866; Sat, 1 Feb 2020 00:30:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 A93C7E0866 for ; Sat, 1 Feb 2020 00:30:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C3E3A34E4F5 for ; Sat, 1 Feb 2020 00:30:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EC93103 for ; Sat, 1 Feb 2020 00:29:59 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1580516994.62034fa04d7370f9c19c9fda7a257cf9acb2c955.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/ettercap/ettercap-0.8.3.ebuild net-analyzer/ettercap/ettercap-9999.ebuild net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch X-VCS-Directories: net-analyzer/ettercap/ net-analyzer/ettercap/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 62034fa04d7370f9c19c9fda7a257cf9acb2c955 X-VCS-Branch: master Date: Sat, 1 Feb 2020 00:29:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 68856677-37c5-41bb-9f16-62cf208e717b X-Archives-Hash: d9839486437a784cbcef94d6702936ec commit: 62034fa04d7370f9c19c9fda7a257cf9acb2c955 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Feb 1 00:28:52 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Feb 1 00:29:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62034fa0 net-analyzer/ettercap: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707674 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/ettercap/ettercap-0.8.3.ebuild | 5 ++++- net-analyzer/ettercap/ettercap-9999.ebuild | 5 ++++- .../ettercap/files/ettercap-0.8.3-fno-common.patch | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild index 5a67e97e516..f49ef8cf2e4 100644 --- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild +++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,6 +47,9 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) sys-devel/flex virtual/yacc" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch +) src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild index 8db7873acf3..047be22f8f4 100644 --- a/net-analyzer/ettercap/ettercap-9999.ebuild +++ b/net-analyzer/ettercap/ettercap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,6 +46,9 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) sys-devel/flex virtual/yacc" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch +) src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch new file mode 100644 index 00000000000..eddca836905 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch @@ -0,0 +1,22 @@ +--- a/include/ec_threads.h ++++ b/include/ec_threads.h +@@ -12,7 +12,7 @@ + }; + + /* a value to be used to return errors in fuctcions using pthread_t values */ +-pthread_t EC_PTHREAD_NULL; ++extern pthread_t EC_PTHREAD_NULL; + #define EC_PTHREAD_SELF EC_PTHREAD_NULL + #define PTHREAD_ID(id) (*(unsigned long*)&(id)) + +--- a/src/ec_threads.c ++++ b/src/ec_threads.c +@@ -46,6 +46,8 @@ + #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock"); pthread_mutex_lock(&init_mtx); } while(0) + #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock"); pthread_mutex_unlock(&init_mtx); } while(0) + ++pthread_t EC_PTHREAD_NULL; ++ + /* protos... */ + + pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void *), void *args, int detached);