rpms/wireshark/F-7 wireshark-0.99.7-path.patch, NONE, 1.1 wireshark-0.99.7-pie.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 wireshark.spec, 1.20, 1.21 wireshark-0.99.5-pie.patch, 1.1, NONE
Radek Vokál (rvokal)
fedora-extras-commits at redhat.com
Wed Dec 19 19:43:31 UTC 2007
Author: rvokal
Update of /cvs/extras/rpms/wireshark/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1914
Modified Files:
.cvsignore sources wireshark.spec
Added Files:
wireshark-0.99.7-path.patch wireshark-0.99.7-pie.patch
Removed Files:
wireshark-0.99.5-pie.patch
Log Message:
upgrade to 0.99.7
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);
wireshark-0.99.7-pie.patch:
--- NEW FILE wireshark-0.99.7-pie.patch ---
diff -up wireshark-0.99.7-SVN-23507/Makefile.in.pie wireshark-0.99.7-SVN-23507/Makefile.in
--- wireshark-0.99.7-SVN-23507/Makefile.in.pie 2007-11-20 05:34:36.000000000 -0500
+++ wireshark-0.99.7-SVN-23507/Makefile.in 2007-11-20 15:00:25.000000000 -0500
@@ -1004,7 +1004,7 @@ noinst_HEADERS = \
wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
@STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
- at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie
@ENABLE_STATIC_TRUE at wireshark_LDFLAGS = -Wl,-static -all-static
# Libraries and plugin flags with which to link wireshark.
@@ -1030,7 +1030,7 @@ wireshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@PORTAUDIO_LIBS@
- at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie
@ENABLE_STATIC_TRUE at tshark_LDFLAGS = -Wl,-static -all-static
# Libraries and plugin flags with which to link tshark.
@@ -1610,14 +1610,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version_info.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff -up wireshark-0.99.7-SVN-23507/gtk/Makefile.in.pie wireshark-0.99.7-SVN-23507/gtk/Makefile.in
--- wireshark-0.99.7-SVN-23507/gtk/Makefile.in.pie 2007-11-20 05:34:33.000000000 -0500
+++ wireshark-0.99.7-SVN-23507/gtk/Makefile.in 2007-11-20 15:01:33.000000000 -0500
@@ -979,14 +979,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wsp_stat.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 9 Jul 2007 17:21:57 -0000 1.12
+++ .cvsignore 19 Dec 2007 19:42:55 -0000 1.13
@@ -1 +1 @@
-wireshark-0.99.6.tar.gz
+wireshark-0.99.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 9 Jul 2007 17:21:57 -0000 1.12
+++ sources 19 Dec 2007 19:42:55 -0000 1.13
@@ -1 +1 @@
-d9c723032c424b3a210a0426167e9732 wireshark-0.99.6.tar.gz
+94fa5f58ccee12c1a298f9e0daca9a94 wireshark-0.99.7.tar.gz
Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-7/wireshark.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wireshark.spec 9 Jul 2007 17:33:43 -0000 1.20
+++ wireshark.spec 19 Dec 2007 19:42:55 -0000 1.21
@@ -4,7 +4,7 @@
Summary: Network traffic analyzer
Name: wireshark
-Version: 0.99.6
+Version: 0.99.7
Release: 1%{?dist}
License: GPL
Group: Applications/Internet
@@ -16,13 +16,13 @@
Source1: wireshark.pam
Source2: wireshark.console
Source3: wireshark.desktop
-Patch1: wireshark-0.99.5-pie.patch
+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
-BuildRequires: net-snmp-devel >= 5.4
-BuildRequires: net-snmp-utils >= 5.4
+BuildRequires: libsmi-devel
BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk2-devel
@@ -31,6 +31,7 @@
BuildRequires: gnutls-devel
BuildRequires: desktop-file-utils, automake, libtool
BuildRequires: htmlview
+Requires: libsmi
Obsoletes: ethereal
Provides: ethereal
@@ -41,7 +42,7 @@
Requires: gtk2
Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release}
-Requires: net-snmp >= 5.4, net-snmp-libs >= 5.4
+Requires: libsmi
Requires: htmlview
Obsoletes: ethereal-gnome
Provides: ethereal-gnome
@@ -67,6 +68,7 @@
%endif
%patch1 -p1 -b .pie
%patch3 -p1
+%patch4 -p1 -b .path
%build
%ifarch s390 s390x
@@ -79,7 +81,6 @@
export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export LDFLAGS="$LDFLAGS -lm -lcrypto"
-./autogen.sh
%configure \
--bindir=%{_sbindir} \
--enable-zlib \
@@ -185,6 +186,10 @@
%changelog
+* Wed Dec 19 2007 Radek Vokál <rvokal at redhat.com> 0.99.7-1
+- fix crash with consolehelper (#317681)
+- upgrade to 0.99.7 to fix multiple security issues
+
* Mon Jul 9 2007 Radek Vokál <rvokal at redhat.com> 0.99.6-1
- multiple security issues fixed
- Wireshark could crash when dissecting an HTTP chunked response
--- wireshark-0.99.5-pie.patch DELETED ---
More information about the fedora-extras-commits
mailing list