On Tue, Jan 22, 2013 at 07:45:22PM +0100, Matthias Kilian wrote:
> This is better for now (smaller diff, probably easier to convince
> upstream about this). The other glitches (missing return code checks,
> useless use of macros etc.) should be done separately with upstream.
Same, with an update to ettercap-0.7.5.3 (includes a fix for
CVE-2013-0722). Of course it needs yet another dirty hack to let
it compile, because upstream appears to abuse some macros found in
arpa/nameser.h on some systems.
Please note that I do not use ettercap, so if anyone wants it to
be fixed, please test.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ettercap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 10 Jan 2013 18:11:14 -0000 1.57
+++ Makefile 1 Feb 2013 19:45:37 -0000
@@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2013/01/10 18:11:14 sthen Exp $
-BROKEN= broken mutex locking
-# see http://marc.info/?l=openbsd-ports&m=135577437106908&w=2
-
SHARED_ONLY= Yes
COMMENT= multi-purpose sniffer/interceptor/logger
-DISTNAME= ettercap-0.7.5.1
+DISTNAME= ettercap-0.7.5.3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/}
@@ -31,6 +28,14 @@ LIB_DEPENDS= net/libnet/1.1 \
FLAVORS= no_x11
FLAVOR?=
+
+# Crude hack to let src/ec_inet.c compile. Those two symbols where
+# defined in an enum in include/ec_inet.h before ettercap-0.7.5.2.
+# They are currently also defined in include/missing/nameser.h, but this
+# can't be used because it introduces other errors, and, more
+# importantly, because using those NS_* macros in src/ec_inet.c is just
+# wrong.
+CFLAGS+= -DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2
CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-DMAN_INSTALLDIR="${TRUEPREFIX}/man"
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ettercap/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 10 Jan 2013 18:11:14 -0000 1.14
+++ distinfo 1 Feb 2013 19:45:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (ettercap-0.7.5.1.tar.gz) = cxPrAwlZmK/L29TZgbCaGjLSR+x4y1M6+/U1eaocovE=
-SIZE (ettercap-0.7.5.1.tar.gz) = 721872
+SHA256 (ettercap-0.7.5.3.tar.gz) = bstbYnQeSYYhXrVffr5Zb5ujd/xoFysQ0l1O886ENiM=
+SIZE (ettercap-0.7.5.3.tar.gz) = 722784
Index: patches/patch-src_ec_threads_c
===================================================================
RCS file: patches/patch-src_ec_threads_c
diff -N patches/patch-src_ec_threads_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ec_threads_c 1 Feb 2013 19:45:37 -0000
@@ -0,0 +1,81 @@
+$OpenBSD$
+
+Use proper synchronization instead of unportable and dubious default
+behaviour of mutexes on certain operating systems. While here,
+correct the error message when pthread_create(3) fails.
+
+--- src/ec_threads.c.orig Thu Jan 3 05:56:19 2013
++++ src/ec_threads.c Tue Jan 22 19:03:52 2013
+@@ -42,6 +42,7 @@ static pthread_mutex_t threads_mutex = PTHREAD_MUTEX_I
+ #define THREADS_UNLOCK do{ pthread_mutex_unlock(&threads_mutex); } while(0)
+
+ static pthread_mutex_t init_mtx = PTHREAD_MUTEX_INITIALIZER;
++static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
+ #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)
+
+@@ -196,35 +197,35 @@ pthread_t ec_thread_new(char *name, char *desc, void *
+ pthread_t ec_thread_new_detached(char *name, char *desc, void
*(*function)(void *), void *args, int detached)
+ {
+ pthread_t id;
++ int e;
+
+ DEBUG_MSG("ec_thread_new -- %s detached %d", name, detached);
+
+ /*
+ * lock the mutex to syncronize with the new thread.
+- * the newly created thread will perform INIT_UNLOCK
++ * the newly created thread will call ec_thread_init(),
+ * so at the end of this function we are sure that the
+ * thread had be initialized
+ */
+ INIT_LOCK;
+
+-
+ if (detached == DETACHED_THREAD) {
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+- if (pthread_create(&id, &attr, function, args) != 0)
+- ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(errno));
++ if ((e = pthread_create(&id, &attr, function, args) != 0))
++ ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(e));
+ }else {
+- if (pthread_create(&id, NULL, function, args) != 0)
+- ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(errno));
++ if ((e = pthread_create(&id, NULL, function, args) != 0))
++ ERROR_MSG("not enough resources to create a new thread in this
process: %s", strerror(e));
+ }
+
+ ec_thread_register_detached(id, name, desc, detached);
+
+ DEBUG_MSG("ec_thread_new -- %lu created ", PTHREAD_ID(id));
+
+- /* the new thread will unlock this */
+- INIT_LOCK;
++ if ((e = pthread_cond_wait(&init_cond, &init_mtx)))
++ ERROR_MSG("waiting on init_cond: %s", strerror(e));
+ INIT_UNLOCK;
+
+ return id;
+@@ -237,8 +238,11 @@ pthread_t ec_thread_new_detached(char *name, char *des
+ void ec_thread_init(void)
+ {
+ pthread_t id = pthread_self();
++ int e;
+
+ DEBUG_MSG("ec_thread_init -- %lu", PTHREAD_ID(id));
++
++ INIT_LOCK;
+
+ /*
+ * allow a thread to be cancelled as soon as the
+@@ -248,6 +252,8 @@ void ec_thread_init(void)
+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+
+ /* sync with the creator */
++ if ((e = pthread_cond_signal(&init_cond)))
++ ERROR_MSG("raising init_cond: %s", strerror(e));
+ INIT_UNLOCK;
+
+ DEBUG_MSG("ec_thread_init -- (%lu) ready and syncronized",
PTHREAD_ID(id));
