From 197d6bf6bb25c437e568df49c152b04fb70f239e Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Sat, 7 Jun 2003 10:42:26 +0000
Subject: Fix crash in -current: a thread was trying to wait for a condition
 using an unlocked mutex (thus triggering a libpthread assertion).  I'm not
 sure if this patch is completely right, but the program seems to work fine.
 Bump PKGREVISION to 2.

---
 net/ettercap/Makefile         |  4 ++--
 net/ettercap/distinfo         |  3 ++-
 net/ettercap/patches/patch-ad | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 net/ettercap/patches/patch-ad

(limited to 'net/ettercap')

diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index f0e61055994..e8047d7de35 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/06/07 10:34:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/07 10:42:26 jmmv Exp $
 
 DISTNAME=		ettercap-0.6.9
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security net
 MASTER_SITES=		http://ettercap.sourceforge.net/download/
 
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
index e339941c2a7..b83f31b2e12 100644
--- a/net/ettercap/distinfo
+++ b/net/ettercap/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/02/09 23:15:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/06/07 10:42:26 jmmv Exp $
 
 SHA1 (ettercap-0.6.9.tar.gz) = 2f70055af569cca75cf2460677229b7b4e4c38a5
 Size (ettercap-0.6.9.tar.gz) = 681245 bytes
 SHA1 (patch-aa) = 4096f767a61e96788b7bee33f51948c9006cc665
 SHA1 (patch-ab) = 107ef5dda9457313d7d939745a6a21dbe2b989ce
 SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
+SHA1 (patch-ad) = c7f997876c5b76fff77f70280f5b5fe523778abf
diff --git a/net/ettercap/patches/patch-ad b/net/ettercap/patches/patch-ad
new file mode 100644
index 00000000000..1c6620b5b43
--- /dev/null
+++ b/net/ettercap/patches/patch-ad
@@ -0,0 +1,37 @@
+$NetBSD: patch-ad,v 1.1 2003/06/07 10:42:27 jmmv Exp $
+
+--- src/ec_illithid.c.orig	2002-09-06 10:57:31.000000000 +0200
++++ src/ec_illithid.c
+@@ -87,8 +87,8 @@ int illithid_gwip;
+ int illithid_buffer = -1;
+ pthread_t decoder_pid;
+ 
+-pthread_mutex_t decoder_mtx = PTHREAD_MUTEX_INITIALIZER;
+-pthread_cond_t decoder_cond = PTHREAD_COND_INITIALIZER;
++pthread_mutex_t decoder_mtx;
++pthread_cond_t decoder_cond;
+ 
+ // protos...
+ 
+@@ -117,6 +117,11 @@ void * Illithid_Decoder(void *dummy)    
+ 
+    DEBUG_MSG("Illithid_Decoder -- running");
+ 
++   pthread_mutex_init(&decoder_mtx, NULL);
++   pthread_cond_init(&decoder_cond, NULL);
++
++   pthread_mutex_lock(&decoder_mtx);
++
+    LOOP {
+       pthread_testcancel();
+ 
+@@ -1110,6 +1115,9 @@ void Illithid_Reset_Conn(void *dummy)
+       hash_table[j] = 0;
+    }
+ 
++   pthread_mutex_lock(&decoder_mtx);
++   pthread_mutex_unlock(&decoder_mtx);
++
+    ECThread_destroy(decoder_pid);
+ 
+    Buffer_Flush(illithid_buffer);
-- 
cgit v1.2.3