Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv15943
Modified Files:
wireshark.info
Added Files:
wireshark.patch
Log Message:
Work around crashing bug in wireshark 1.6.3
--- NEW FILE: wireshark.patch ---
diff -ru wireshark-1.6.3/gtk/main_welcome.c
wireshark-1.6.3-patched/gtk/main_welcome.c
--- wireshark-1.6.3/gtk/main_welcome.c 2011-11-01 17:35:08.000000000 +0100
+++ wireshark-1.6.3-patched/gtk/main_welcome.c 2011-11-11 16:29:40.000000000
+0100
@@ -94,7 +94,9 @@
static GSList *status_messages = NULL;
+#ifdef USE_THREADS
static GMutex *recent_mtx = NULL;
+#endif
/* The "scroll box dynamic" is a (complicated) pseudo widget to */
/* place a vertically list of widgets in (currently the interfaces and recent
files). */
@@ -456,7 +458,9 @@
* most OSes use.
*/
err = ws_stat64(ri_stat->filename, &stat_buf);
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
+#endif
ri_stat->err = err;
if(err == 0) {
if (stat_buf.st_size/1024/1024/1024 > 10) {
@@ -482,7 +486,9 @@
} else {
ri_stat->stat_done = TRUE;
}
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
+#endif
return NULL;
}
@@ -498,8 +504,9 @@
return FALSE;
}
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
-
+#endif
if (ri_stat->stat_done) {
again = FALSE;
gtk_label_set_markup(GTK_LABEL(ri_stat->label), ri_stat->str->str);
@@ -514,8 +521,9 @@
ri_stat->timer = 0;
}
/* Else append some sort of Unicode or ASCII animation to the label? */
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
-
+#endif
return again;
}
@@ -526,7 +534,9 @@
return;
}
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
+#endif
if (ri_stat->timer) {
g_source_remove(ri_stat->timer);
ri_stat->timer = 0;
@@ -541,7 +551,9 @@
} else {
ri_stat->label = NULL;
}
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
+#endif
}
/* a file link was pressed */
@@ -1106,7 +1118,9 @@
welcome_eb);
gtk_widget_show_all(welcome_scrollw);
+#ifdef USE_THREADS
recent_mtx = g_mutex_new();
+#endif
return welcome_scrollw;
}
Index: wireshark.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/wireshark.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wireshark.info 2 Nov 2011 16:07:16 -0000 1.11
+++ wireshark.info 11 Nov 2011 15:45:08 -0000 1.12
@@ -16,56 +16,58 @@
Package: wireshark
Version: 1.6.3
-Revision: 1
+Revision: 2
Maintainer: Max Horn <m...@quendi.de>
BuildDepends: <<
+ atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
expat1,
fink (>= 0.28),
fink-package-precedence,
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
+ gettext-bin,
+ gettext-tools,
+ glib2-dev (>= 2.14.0-1),
glitz,
- libgcrypt (>= 1.2.4-2),
gnutls26 (>= 2.2.2-3),
- libtasn1-3,
+ gtk+2-dev (>= 2.12.0-1),
+ libcares2,
+ libgcrypt (>= 1.2.4-2),
+ libgettext8-dev,
libgpg-error,
- pkgconfig (>= 0.21-1),
+ libiconv-dev,
libpcap1,
- libcares2,
+ libtasn1-3,
lua51-dev,
- portaudio,
- pcre,
- atk1 (>= 1.20.0-1),
- glib2-dev (>= 2.14.0-1),
pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pcre,
pixman (>= 0.10.0-1),
- gtk+2-dev (>= 2.12.0-1),
- libgettext8-dev,
- gettext-bin,
- gettext-tools,
- libiconv-dev,
+ pkgconfig (>= 0.21-1),
+ portaudio,
x11-dev,
xft2-dev
<<
Depends: <<
- libgcrypt-shlibs (>= 1.2.4-2),
+ glib2-shlibs (>= 2.14.0-1),
gnutls26-shlibs (>= 2.2.2-3),
+ gtk+2 (>= 2.12.0-1),
+ libcares2-shlibs,
+ libgcrypt-shlibs (>= 1.2.4-2),
+ libgettext8-shlibs,
libgpg-error-shlibs,
libpcap1-shlibs,
- libcares2-shlibs,
lua51-shlibs,
- portaudio-shlibs,
- pcre-shlibs,
- gtk+2 (>= 2.12.0-1),
- glib2-shlibs (>= 2.14.0-1),
pango1-xft2-ft219 (>= 1.18.4-4),
- libgettext8-shlibs
+ pcre-shlibs,
+ portaudio-shlibs
<<
Conflicts: wireshark-ssl (<< 1.6.3-1), ethereal (<< 1.0-1), ethereal-ssl (<<
1.0-1)
Replaces: wireshark-ssl (<< 1.6.3-1), ethereal (<< 1.0-1), ethereal-ssl (<<
1.0-1)
Source: mirror:sourceforge:wireshark/wireshark-%v.tar.bz2
Source-MD5: 5012c75c379ffd47fbcf395d9a6e417e
+PatchFile: %n.patch
+PatchFile-MD5: b379f25db9ea044c8dda065169a5b585
ConfigureParams: <<
--mandir=%p/share/man \
--with-lua=%p \
@@ -110,6 +112,8 @@
Might eventually link against and depend on geoip and libsmi.
Since the former is not in stable and the latter is not maintained,
I am not (yet) doing this.
+
+The patch fixes a bug in wireshark 1.6.3 that causes it to crash upon startup.
<<
Homepage: http://www.wireshark.org
License: GPL2
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
