diff --git a/wireshark-1.2.0-asneeded.patch b/wireshark-1.2.0-asneeded.patch deleted file mode 100644 index 62b038f..0000000 --- a/wireshark-1.2.0-asneeded.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: epan/Makefile.am -=================================================================== ---- epan/Makefile.am.orig -+++ epan/Makefile.am -@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \ - dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -+ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ - ${top_builddir}/wsutil/libwsutil.la -lm - - libwireshark_la_DEPENDENCIES = \ -@@ -137,7 +138,8 @@ libwireshark_la_DEPENDENCIES = \ - libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la $(wslua_lib) \ -- ${top_builddir}/wsutil/libwsutil.la -+ ${top_builddir}/wsutil/libwsutil.la \ -+ ${top_builddir}/wiretap/libwiretap.la - - #EXTRA_PROGRAMS = reassemble_test - #reassemble_test_LDADD = $(GLIB_LIBS) -Index: epan/Makefile.in -=================================================================== ---- epan/Makefile.in.orig -+++ epan/Makefile.in -@@ -791,6 +791,7 @@ libwireshark_la_LIBADD = \ - dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -+ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ - ${top_builddir}/wsutil/libwsutil.la -lm - - libwireshark_la_DEPENDENCIES = \ -@@ -798,7 +799,8 @@ libwireshark_la_DEPENDENCIES = \ - libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la $(wslua_lib) \ -- ${top_builddir}/wsutil/libwsutil.la -+ ${top_builddir}/wsutil/libwsutil.la \ -+ ${top_builddir}/wiretap/libwiretap.la - - RUNLEX = $(top_srcdir)/tools/runlex.sh - LEMON = ../tools/lemon -Index: wiretap/Makefile.am -=================================================================== ---- wiretap/Makefile.am.orig -+++ wiretap/Makefile.am -@@ -68,7 +68,7 @@ EXTRA_DIST = \ - $(GENERATOR_FILES) \ - $(GENERATED_FILES) - --libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la -+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) - - RUNLEX = $(top_srcdir)/tools/runlex.sh - -Index: wiretap/Makefile.in -=================================================================== ---- wiretap/Makefile.in.orig -+++ wiretap/Makefile.in -@@ -589,7 +589,7 @@ EXTRA_DIST = \ - $(GENERATOR_FILES) \ - $(GENERATED_FILES) - --libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la -+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) - RUNLEX = $(top_srcdir)/tools/runlex.sh - all: all-am - diff --git a/wireshark-1.2.10.tar.bz2 b/wireshark-1.2.10.tar.bz2 deleted file mode 100644 index aceee19..0000000 --- a/wireshark-1.2.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37d6977eedb174225dcf8e940cfcaa4341a142afef34da4eb61a72cc27c47d21 -size 15401498 diff --git a/wireshark-1.4.0.tar.bz2 b/wireshark-1.4.0.tar.bz2 new file mode 100644 index 0000000..2dff9c9 --- /dev/null +++ b/wireshark-1.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743 +size 20481773 diff --git a/wireshark-corosync-packet-dissector.patch b/wireshark-corosync-packet-dissector.patch index 0e7784c..cefc339 100644 --- a/wireshark-corosync-packet-dissector.patch +++ b/wireshark-corosync-packet-dissector.patch @@ -1,9 +1,9 @@ -Index: wireshark-1.2.8/epan/dissectors/Makefile.common +Index: wireshark-1.4.0/epan/dissectors/Makefile.common =================================================================== ---- wireshark-1.2.8.orig/epan/dissectors/Makefile.common -+++ wireshark-1.2.8/epan/dissectors/Makefile.common -@@ -293,6 +293,8 @@ DISSECTOR_SRC = \ - packet-cmpp.c \ +--- wireshark-1.4.0.orig/epan/dissectors/Makefile.common ++++ wireshark-1.4.0/epan/dissectors/Makefile.common +@@ -307,6 +307,8 @@ DISSECTOR_SRC = \ + packet-collectd.c \ packet-componentstatus.c \ packet-cops.c \ + packet-corosync-totemnet.c \ @@ -11,10 +11,10 @@ Index: wireshark-1.2.8/epan/dissectors/Makefile.common packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemnet.c +Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c =================================================================== --- /dev/null -+++ wireshark-1.2.8/epan/dissectors/packet-corosync-totemnet.c ++++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c @@ -0,0 +1,1274 @@ +/* packet-corosync-totemnet.c + * Routines for the lowest level(encryption/decryption) protocol used in Corosync cluster engine @@ -1290,10 +1290,10 @@ Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemnet.c +} + +/* packet-corosync-totemnet.c ends here */ -Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.c +Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c =================================================================== --- /dev/null -+++ wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.c ++++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c @@ -0,0 +1,1379 @@ +/* packet-corosync-totemsrp.c + * Dissectors for totem single ring protocol implementated in corosync cluster engine @@ -2674,10 +2674,10 @@ Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.c + corosync_totemsrp_is_little_endian(pinfo)); +} + -Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.h +Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h =================================================================== --- /dev/null -+++ wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.h ++++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h @@ -0,0 +1,53 @@ +/* packet-corosync-totemsrp.h + * Dissectors for totem single ring protocol implemented in corosync cluster engine @@ -2732,12 +2732,12 @@ Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.h + + +#endif /* packet-totemsrp.h */ -Index: wireshark-1.2.8/epan/dissectors/Makefile.in +Index: wireshark-1.4.0/epan/dissectors/Makefile.in =================================================================== ---- wireshark-1.2.8.orig/epan/dissectors/Makefile.in -+++ wireshark-1.2.8/epan/dissectors/Makefile.in -@@ -215,6 +215,8 @@ am__objects_4 = libdissectors_la-packet- - libdissectors_la-packet-cmpp.lo \ +--- wireshark-1.4.0.orig/epan/dissectors/Makefile.in ++++ wireshark-1.4.0/epan/dissectors/Makefile.in +@@ -224,6 +224,8 @@ am__objects_3 = libdissectors_la-packet- + libdissectors_la-packet-collectd.lo \ libdissectors_la-packet-componentstatus.lo \ libdissectors_la-packet-cops.lo \ + libdissectors_la-packet-corosync-totemnet.lo \ @@ -2745,8 +2745,8 @@ Index: wireshark-1.2.8/epan/dissectors/Makefile.in libdissectors_la-packet-cosine.lo \ libdissectors_la-packet-cpfi.lo \ libdissectors_la-packet-cpha.lo \ -@@ -1391,6 +1393,8 @@ DISSECTOR_SRC = \ - packet-cmpp.c \ +@@ -1486,6 +1488,8 @@ DISSECTOR_SRC = \ + packet-collectd.c \ packet-componentstatus.c \ packet-cops.c \ + packet-corosync-totemnet.c \ @@ -2754,8 +2754,8 @@ Index: wireshark-1.2.8/epan/dissectors/Makefile.in packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -@@ -2618,6 +2622,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cms.Plo@am__quote@ +@@ -2773,6 +2777,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-collectd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-componentstatus.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cops.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-corosync-totemnet.Plo@am__quote@ @@ -2763,7 +2763,7 @@ Index: wireshark-1.2.8/epan/dissectors/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cosine.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpfi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpha.Plo@am__quote@ -@@ -4124,6 +4130,20 @@ libdissectors_la-packet-cops.lo: packet- +@@ -4406,6 +4412,20 @@ libdissectors_la-packet-cops.lo: packet- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdissectors_la_CFLAGS) $(CFLAGS) -c -o libdissectors_la-packet-cops.lo `test -f 'packet-cops.c' || echo '$(srcdir)/'`packet-cops.c diff --git a/wireshark.changes b/wireshark.changes index 857ad6b..8593cde 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu Sep 9 18:34:09 CEST 2010 - dimstar@opensuse.org + +- Update to version 1.4.0: + + The packet list internals have been rewritten and are now more + efficient. + + Columns are easier to use. You can add a protocol field as a + column by right-clicking on its packet detail item, and you + can adjust some column preferences by right-clicking the + column header. + + Preliminary Python scripting support has been added. + + Many memory leaks have been fixed. + + Packets can now be ignored (excluded from dissection), similar + to the way they can be marked. + + Manual IP address resolution is now supported. + + Columns with seconds can now be displayed as hours, minutes + and seconds. + + You can now set the capture buffer size on UNIX and Linux if + you have libpcap 1.0.0 or greater. + + TShark no longer needs elevated privileges on UNIX or Linux to + list interfaces. Only dumpcap requires privileges now. + + Wireshark and TShark can enable 802.11 monitor mode directly + if you have libpcap 1.0.0 or greater. + + You can play RTP streams directly from the RTP Analysis + window. + + Capinfos and editcap now respectively support time order + checking and forcing. + + Wireshark now has a "jump to timestamp" command-line option. + + You can open JPEG files directly in Wireshark. + + Many new and updated protocols. + + See NEWS for a full list of changes. +- Drop wireshark-1.2.0-asneeded.patch, fixed upstream. +- Rebase wireshark-corosync-packet-dissector.patch. + ------------------------------------------------------------------- Wed Aug 25 16:53:31 UTC 2010 - prusnak@opensuse.org diff --git a/wireshark.spec b/wireshark.spec index 5da146e..f2fb5a9 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 1.2.10) +# spec file for package wireshark (Version 1.4.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ Name: wireshark License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.2.10 +Version: 1.4.0 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -31,12 +31,10 @@ Source1: include.filelist Patch0: %{name}-1.0.8-desktop.patch # PATCH-FIX-OPENSUSE wireshark-1.2.0-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root Patch1: %{name}-1.2.0-disable-warning-dialog.patch -# PATCH-FIX-OPENSUSE wireshark-1.2.0-asneeded.patch cmorve69@yahoo.es -- compile with --as-needed -Patch2: %{name}-1.2.0-asneeded.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders -Patch3: %{name}-1.2.0-geoip.patch +Patch2: %{name}-1.2.0-geoip.patch # PATCH-FEATURE-UPSTREAM wireshark-corosync-packet-dissector.patch tserong@novell.com -- add corosync packet dissector -Patch4: %{name}-corosync-packet-dissector.patch +Patch3: %{name}-corosync-packet-dissector.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-utils Provides: ethereal = %{version} @@ -96,8 +94,7 @@ view the reconstructed stream of a TCP session. %patch0 %patch1 %patch2 -%patch3 -%patch4 -p1 +%patch3 -p1 %build %configure @@ -105,12 +102,12 @@ make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install +find $RPM_BUILD_ROOT -name "*.la" -delete -print ln -fs wireshark $RPM_BUILD_ROOT%{_bindir}/ethereal ln -fs tshark $RPM_BUILD_ROOT%{_bindir}/tethereal install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir} install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -m 0644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; +#install -m 0644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/wireshark for i in `cat %{SOURCE1}`; do install -m 644 $i $RPM_BUILD_ROOT%{_includedir}/wireshark