Accepting request 49900 from network:utilities

checked in (request 49900)

OBS-URL: https://build.opensuse.org/request/show/49900
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=23

corosync-packet-dissector.patch

@@ -1,9 +1,9 @@
-Index: wireshark-1.4.0/epan/dissectors/Makefile.common
+Index: wireshark-1.2.8/epan/dissectors/Makefile.common
 ===================================================================
---- wireshark-1.4.0.orig/epan/dissectors/Makefile.common
+--- wireshark-1.2.8.orig/epan/dissectors/Makefile.common
-+++ wireshark-1.4.0/epan/dissectors/Makefile.common
++++ wireshark-1.2.8/epan/dissectors/Makefile.common
-@@ -307,6 +307,8 @@ DISSECTOR_SRC = \
+@@ -293,6 +293,8 @@ DISSECTOR_SRC = \
- 	packet-collectd.c	\
+ 	packet-cmpp.c		\
  	packet-componentstatus.c \
  	packet-cops.c 		\
 +	packet-corosync-totemnet.c \
@@ -11,10 +11,10 @@ Index: wireshark-1.4.0/epan/dissectors/Makefile.common
  	packet-cosine.c		\
  	packet-cpfi.c		\
  	packet-cpha.c		\
-Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
+Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemnet.c
 ===================================================================
 --- /dev/null
-+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
++++ wireshark-1.2.8/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.4.0/epan/dissectors/packet-corosync-totemnet.c
 +}
 +
 +/* packet-corosync-totemnet.c ends here */
-Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c
+Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.c
 ===================================================================
 --- /dev/null
-+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c
++++ wireshark-1.2.8/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.4.0/epan/dissectors/packet-corosync-totemsrp.c
 +                                             corosync_totemsrp_is_little_endian(pinfo));
 +}
 +
-Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h
+Index: wireshark-1.2.8/epan/dissectors/packet-corosync-totemsrp.h
 ===================================================================
 --- /dev/null
-+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h
++++ wireshark-1.2.8/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.4.0/epan/dissectors/packet-corosync-totemsrp.h
 +
 +
 +#endif /* packet-totemsrp.h */
-Index: wireshark-1.4.0/epan/dissectors/Makefile.in
+Index: wireshark-1.2.8/epan/dissectors/Makefile.in
 ===================================================================
---- wireshark-1.4.0.orig/epan/dissectors/Makefile.in
+--- wireshark-1.2.8.orig/epan/dissectors/Makefile.in
-+++ wireshark-1.4.0/epan/dissectors/Makefile.in
++++ wireshark-1.2.8/epan/dissectors/Makefile.in
-@@ -224,6 +224,8 @@ am__objects_3 = libdissectors_la-packet-
+@@ -215,6 +215,8 @@ am__objects_4 = libdissectors_la-packet-
- 	libdissectors_la-packet-collectd.lo \
+ 	libdissectors_la-packet-cmpp.lo \
  	libdissectors_la-packet-componentstatus.lo \
  	libdissectors_la-packet-cops.lo \
 +	libdissectors_la-packet-corosync-totemnet.lo \
@@ -2745,8 +2745,8 @@ Index: wireshark-1.4.0/epan/dissectors/Makefile.in
  	libdissectors_la-packet-cosine.lo \
  	libdissectors_la-packet-cpfi.lo \
  	libdissectors_la-packet-cpha.lo \
-@@ -1486,6 +1488,8 @@ DISSECTOR_SRC = \
+@@ -1391,6 +1393,8 @@ DISSECTOR_SRC = \
- 	packet-collectd.c	\
+ 	packet-cmpp.c		\
  	packet-componentstatus.c \
  	packet-cops.c 		\
 +	packet-corosync-totemnet.c 		\
@@ -2754,8 +2754,8 @@ Index: wireshark-1.4.0/epan/dissectors/Makefile.in
  	packet-cosine.c		\
  	packet-cpfi.c		\
  	packet-cpha.c		\
-@@ -2773,6 +2777,8 @@ distclean-compile:
+@@ -2618,6 +2622,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-cms.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.4.0/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@
-@@ -4406,6 +4412,20 @@ libdissectors_la-packet-cops.lo: packet-
+@@ -4124,6 +4130,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
  

wireshark-1.2.0-asneeded.patch

@@ -0,0 +1,70 @@
+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
+ 

wireshark-1.2.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ec4391e198105e1d48b209ca2e366b3a53aacc80856d514f5fb66a98cbdba10
+size 15384912

wireshark-1.4.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743
-size 20481773

wireshark.changes

@@ -1,95 +1,3 @@
--------------------------------------------------------------------
-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
-
-- updated to 1.2.10 [bnc#630599]
-  * Security fixes:
-    o The SigComp Universal Decompressor Virtual Machine could overrun a buffer. (Bug 4867)
-    o The GSM A RR dissector could crash. (Bug 4897)
-    o Due to a regression the ASN.1 BER dissector could overrun the stack.
-    o The IPMI dissector could go into an infinite loop.
-    o CVE-2010-2993
-  * Bug fixes:
-    o Wireshark crashes after configuring new Information column. (Bug 4854)
-    o Crash triggered when changing display filter from right-mouse pop-up menu via packet-list. (Bug 4860)
-    o Wireshark crash selecting Inter-Asterisk exchange v2 packet data. (Bug 4868)
-    o zlib-1.2.5 cause tshark to stop live capture. (Bug 4916)
-    o Crash when adding SNMP users. (Bug 4926)
-    o Wireshark via ssh -X on ipv6 link-local address fails to allow capture. (Bug 4945)
-    o OMAPI dissector fails to parse combined initialization messages. (Bug 4982)
-    o QUERY_FS_INFO for Macintosh level 0x301 - MacSupportFlags decodes wrong. (Bug 4993)
-    o SCSI dissector misidentifies ATA PASSTHROUGH command as ACCESS CONTROL IN. (Bug 5037)
-    o Wrong decoding of GTP Prime (GTP') packets. (Bug 5055)
-  * Updated Protocol Support
-    ASN.1 BER, GSM A RR, GTP, IAX2, IPMI, OMAPI, PRES, SCSI, SMB, UNISTIM
-
--------------------------------------------------------------------
-Wed Aug 25 16:53:31 UTC 2010 - prusnak@opensuse.org
-
-- updated to 1.2.9 [bnc#613487]
-  * Security fixes:
-    o The SMB dissector could dereference a NULL pointer. (Bug 4734)
-    o J. Oquendo discovered that the ASN.1 BER dissector could overrun the stack.
-    o The SMB PIPE dissector could dereference a NULL pointer on some platforms.
-    o The SigComp Universal Decompressor Virtual Machine could go into an infinite loop. (Bug 4826)
-    o The SigComp Universal Decompressor Virtual Machine could overrun a buffer. (Bug 4837)
-  * Bug fixes:
-    o Cannot open file with File -> Open. (Bug 1791)
-    o Application crash when changing real-time option. (Bug 4035)
-    o Crash in filter autocompletion. (Bug 4306)
-    o The XML dissector doesn't allow dots (".") in tags. (Bug 4405)
-    o Live capture stops when using zlib 1.2.5. (Bug 4708)
-    o Want to be able to apply decode as to Data Portion of Lan Trace. (Bug 4721)
-    o SABP short pdu (packet_per.c). (Bug 4743)
-    o Kerberos pre-auth type constants - MS extensions are wrong. (Bug 4752)
-    o Check HTTP Content-Length parsing for overflow. (Bug 4758)
-    o Wrong variable used for proto_tree_add_text() in ptp dissector. (Bug 4773)
-    o Crash when close window frame of gtk file chooser. (Bug 4778)
-    o text2pcap expects \n delimited text (instead of \r\n) on win32. (Bug 4780)
-    o Wrong decoding for BGP ORF. (Bug 4782)
-    o Crash when Ctrl-Backspacing the display filter. (Bug 4797)
-    o Acker AFI field incorrect size in PGM dissector. (Bug 4798)
-    o Fedora 13: wireshark fails to build (linking problem). (Bug 4815)
-    o The NFS FH hash (nfs.fh.hash) incorrectly matches multiple filehandles. (Bug 4839)
-    o AES-CTR decoding not working, (dissectors/packet_ipsec.c using gcrypt). (Bug 4838)
-  * Updated Protocol Support
-    ASN.1 BER, BGP, HTTP, IGMP, IPsec, Kerberos, NFS, PGM, PTP, SABP, SigComp, SMB, TCAP, XML,
-  * Updated Capture File Support
-    ERF, PacketLogger.
-
 -------------------------------------------------------------------
 Thu Jun  3 06:41:23 UTC 2010 - tserong@novell.com
 

wireshark.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package wireshark (Version 1.4.0)
+# spec file for package wireshark (Version 1.2.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,8 +22,8 @@ Name:           wireshark
 License:        GPLv2+
 Group:          Productivity/Networking/Diagnostic
 Summary:        A Network Traffic Analyser
-Version:        1.4.0
+Version:        1.2.8
-Release:        1
+Release:        2
 Url:            http://www.wireshark.org/
 Source:         http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
 Source1:        include.filelist
@@ -31,10 +31,11 @@ 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
-Patch2:         %{name}-1.2.0-geoip.patch
+Patch3:         %{name}-1.2.0-geoip.patch
-# PATCH-FEATURE-UPSTREAM wireshark-corosync-packet-dissector.patch tserong@novell.com -- add corosync packet dissector
+Patch4:         corosync-packet-dissector.patch
-Patch3:         %{name}-corosync-packet-dissector.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       xdg-utils
 Provides:       ethereal = %{version}
@@ -47,6 +48,10 @@ BuildRequires:  krb5-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcares-devel
 BuildRequires:  libgcrypt-devel
+%if 0%{?suse_version} > 1100
+BuildRequires:  libGeoIP-devel
+Recommends:     GeoIP
+%endif
 BuildRequires:  libgnutls-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libsmi-devel
@@ -61,8 +66,6 @@ BuildRequires:  xdg-utils
 BuildRequires:  zlib-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
-BuildRequires:  libGeoIP-devel
-Recommends:     GeoIP
 %endif
 
 %description
@@ -94,7 +97,8 @@ view the reconstructed stream of a TCP session.
 %patch0
 %patch1
 %patch2
-%patch3 -p1
+%patch3
+%patch4 -p1
 
 %build
 %configure
@@ -102,12 +106,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/
+install -m 0644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 install -d -m 0755  $RPM_BUILD_ROOT%{_includedir}/wireshark
 for i in `cat %{SOURCE1}`; do
     install -m 644 $i $RPM_BUILD_ROOT%{_includedir}/wireshark