rpms/wireshark/devel wireshark-0.99.7-path.patch, NONE, 1.1 wireshark.spec, 1.27, 1.28
Radek Vokál (rvokal)
fedora-extras-commits at redhat.com
Wed Dec 19 13:22:26 UTC 2007
Author: rvokal
Update of /cvs/extras/rpms/wireshark/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2163
Modified Files:
wireshark.spec
Added Files:
wireshark-0.99.7-path.patch
Log Message:
- fix crash in unprivileged mode (#317681)
wireshark-0.99.7-path.patch:
--- NEW FILE wireshark-0.99.7-path.patch ---
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);
Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wireshark.spec 18 Dec 2007 22:51:06 -0000 1.27
+++ wireshark.spec 19 Dec 2007 13:21:46 -0000 1.28
@@ -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 @@
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 @@
%endif
%patch1 -p1 -b .pie
%patch3 -p1
+%patch4 -p1
%build
%ifarch s390 s390x
@@ -85,7 +87,7 @@
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 @@
%changelog
+* Wed Dec 19 2007 Radek Vokál <rvokal at redhat.com> 0.99.7-2
+- fix crash in unprivileged mode (#317681)
+
* Tue Dec 18 2007 Radek Vokál <rvokal at redhat.com> 0.99.7-1
- upgrade to 0.99.7
More information about the scm-commits
mailing list