| 1 |
commit: 62034fa04d7370f9c19c9fda7a257cf9acb2c955 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 00:28:52 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 00:29:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62034fa0 |
| 7 |
|
| 8 |
net-analyzer/ettercap: Fix CFLAGS=-fno-common |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707674 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
net-analyzer/ettercap/ettercap-0.8.3.ebuild | 5 ++++- |
| 15 |
net-analyzer/ettercap/ettercap-9999.ebuild | 5 ++++- |
| 16 |
.../ettercap/files/ettercap-0.8.3-fno-common.patch | 22 ++++++++++++++++++++++ |
| 17 |
3 files changed, 30 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild |
| 20 |
index 5a67e97e516..f49ef8cf2e4 100644 |
| 21 |
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild |
| 22 |
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -47,6 +47,9 @@ DEPEND="${RDEPEND} |
| 30 |
test? ( dev-libs/check ) |
| 31 |
sys-devel/flex |
| 32 |
virtual/yacc" |
| 33 |
+PATCHES=( |
| 34 |
+ "${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
| 35 |
+) |
| 36 |
|
| 37 |
src_prepare() { |
| 38 |
sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die |
| 39 |
|
| 40 |
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild |
| 41 |
index 8db7873acf3..047be22f8f4 100644 |
| 42 |
--- a/net-analyzer/ettercap/ettercap-9999.ebuild |
| 43 |
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 1999-2019 Gentoo Authors |
| 46 |
+# Copyright 1999-2020 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
EAPI=6 |
| 50 |
@@ -46,6 +46,9 @@ DEPEND="${RDEPEND} |
| 51 |
test? ( dev-libs/check ) |
| 52 |
sys-devel/flex |
| 53 |
virtual/yacc" |
| 54 |
+PATCHES=( |
| 55 |
+ "${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
| 56 |
+) |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die |
| 60 |
|
| 61 |
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 |
| 62 |
new file mode 100644 |
| 63 |
index 00000000000..eddca836905 |
| 64 |
--- /dev/null |
| 65 |
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch |
| 66 |
@@ -0,0 +1,22 @@ |
| 67 |
+--- a/include/ec_threads.h |
| 68 |
++++ b/include/ec_threads.h |
| 69 |
+@@ -12,7 +12,7 @@ |
| 70 |
+ }; |
| 71 |
+ |
| 72 |
+ /* a value to be used to return errors in fuctcions using pthread_t values */ |
| 73 |
+-pthread_t EC_PTHREAD_NULL; |
| 74 |
++extern pthread_t EC_PTHREAD_NULL; |
| 75 |
+ #define EC_PTHREAD_SELF EC_PTHREAD_NULL |
| 76 |
+ #define PTHREAD_ID(id) (*(unsigned long*)&(id)) |
| 77 |
+ |
| 78 |
+--- a/src/ec_threads.c |
| 79 |
++++ b/src/ec_threads.c |
| 80 |
+@@ -46,6 +46,8 @@ |
| 81 |
+ #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock"); pthread_mutex_lock(&init_mtx); } while(0) |
| 82 |
+ #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock"); pthread_mutex_unlock(&init_mtx); } while(0) |
| 83 |
+ |
| 84 |
++pthread_t EC_PTHREAD_NULL; |
| 85 |
++ |
| 86 |
+ /* protos... */ |
| 87 |
+ |
| 88 |
+ pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void *), void *args, int detached); |
Archives