From f115bf3e6134f6b770f0d09e0feb8b1c3ba42759 Mon Sep 17 00:00:00 2001
From: Radek Vokál <rvokal@fedoraproject.org>
Date: Dec 19 2007 13:21:46 +0000
Subject: - fix crash in unprivileged mode (#317681)


---

diff --git a/wireshark-0.99.7-path.patch b/wireshark-0.99.7-path.patch
new file mode 100644
index 0000000..3aa77c7
--- /dev/null
+++ b/wireshark-0.99.7-path.patch
@@ -0,0 +1,16 @@
+Nasty patch for consolehelper. Wireshark run from consolehelper in unprivileged
+mode wrongly detects path as /usr/bin instead of /usr/sbin. Causes few strange 
+crashes in GUI. 
+
+diff -up wireshark-0.99.7/capture_sync.c.old wireshark-0.99.7/capture_sync.c
+--- wireshark-0.99.7/capture_sync.c.old	2007-12-18 02:16:14.000000000 +0100
++++ wireshark-0.99.7/capture_sync.c	2007-12-19 13:50:17.000000000 +0100
+@@ -230,7 +230,7 @@ init_pipe_args(int *argc) {
+     *argv = NULL;
+ 
+     /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */
+-    exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir);
++    exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", "/usr/sbin");
+ 
+     /* Make that the first argument in the argument list (argv[0]). */
+     argv = sync_pipe_add_arg(argv, argc, exename);
diff --git a/wireshark.spec b/wireshark.spec
index 135cd3e..18ec919 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -6,7 +6,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.7
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -19,6 +19,7 @@ Source2:	wireshark.console
 Source3:	wireshark.desktop
 Patch1:		wireshark-0.99.7-pie.patch
 Patch3:		wireshark-nfsv4-opts.patch
+Patch4:		wireshark-0.99.7-path.patch
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpcap-devel >= 0.9
@@ -73,6 +74,7 @@ Contains wireshark for Gnome 2 and desktop integration file
 %endif
 %patch1 -p1 -b .pie
 %patch3 -p1 
+%patch4 -p1
 
 %build
 %ifarch s390 s390x
@@ -85,7 +87,7 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export LDFLAGS="$LDFLAGS -lm -lcrypto"
-./autogen.sh
+
 %configure \
    --bindir=%{_sbindir} \
    --enable-zlib \
@@ -196,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 19 2007 Radek Vokál <rvokal@redhat.com> 0.99.7-2
+- fix crash in unprivileged mode (#317681)
+
 * Tue Dec 18 2007 Radek Vokál <rvokal@redhat.com> 0.99.7-1
 - upgrade to 0.99.7