gentoo resync : 05.02.2020

4 files changed, 33 insertions, 4 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 1faf6583dba4..af353520c98f 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,4 +1,5 @@
+AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
-EBUILD ettercap-0.8.3.ebuild 1769 BLAKE2B 48ce2bbbd78731ca8ed81942d7e4076372c5ce71f57b2fe992c5cef3169b17ef7fa55c158e91376d99a14a237d76d1ea3d482fb98d03bcbc60f3c624d9f69ca3 SHA512 0bb95b7563a38ecb7c141548b7d450de99f5bde8031fe681f0e13cbeeb47fac38cc0c2e963c1e76660c469b39292eac2e6e26d5ef64a0063f74618d08a7b2416
-EBUILD ettercap-9999.ebuild 1728 BLAKE2B 6349c5252483f16d8f2481d0bda8715113d373af5992638fcd384be8c0adfe9605a3004e5095e669b6e381feb3baccbba3a269b0d003ad6b03c4fbb23f6331a2 SHA512 8dcd83c19513d6770a4c6b3b1dcd7d1a2e6dbec9d879e1300aea26f1fe9f52cefb8ddd0f8635cd884454f72e47be6ed6ff0efbf267478222171ce774c13ec993
+EBUILD ettercap-0.8.3.ebuild 1825 BLAKE2B 67ea7421490b802862350501d505722efcfce8779a0e65a6815980ca4e25f3be75f8a50d94f3c2478375a79d04721d2b0ac9718932cb569a3050b5c91e6b592b SHA512 ef4f1d1488fd92569f42e699494eef056ed0252b287ec6c94eb21f92ef071772158a07fec18a1387c7a77d9ef01b4c3e73fb426df4886fa8eb8eecdf92c291f6
+EBUILD ettercap-9999.ebuild 1784 BLAKE2B fc95ad8135e4a4fa34c4b7ca09d1cb2279ce37b67a2aea48cd0a69502ebc8b610ab7d50b28b33bf27a1b885a3ba06551defba4258cdb6372a85c17ee59f800a4 SHA512 4aae70b5170b1edc944d1994d8a2729d8a8c17f0ab4a74c006b1b168002fe89c10d47cb03b67469854aed81449d4e3dcb0b822b9bf05af33bd0c7e4a5f882f98
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index 5a67e97e5162..f49ef8cf2e4f 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 8db7873acf3e..047be22f8f4c 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 000000000000..eddca836905f
--- /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);