diff --git a/wireshark-1.0.8-desktop.patch b/wireshark-1.0.8-desktop.patch index e3db282..22744b5 100644 --- a/wireshark-1.0.8-desktop.patch +++ b/wireshark-1.0.8-desktop.patch @@ -1,14 +1,16 @@ ---- wireshark.desktop +Index: wireshark.desktop +=================================================================== +--- wireshark.desktop.orig +++ wireshark.desktop -@@ -68,9 +68,10 @@ +@@ -68,9 +68,9 @@ Comment=Network traffic analyzer Comment[fi]=Verkkoliikenne analysaattori Comment[fr]=Analyseur de trafic réseau Comment[sv]=Nätverkstrafikanalysator -Icon=wireshark.png +Icon=wireshark TryExec=wireshark - Exec=wireshark -+X-KDE-SubstituteUID=true +-Exec=wireshark ++Exec=/usr/bin/xdg-su -c /usr/bin/wireshark Terminal=false # Categorie entry according to version 1.0 of # http://www.freedesktop.org/wiki/Specifications/menu-spec diff --git a/wireshark-1.2.0-asneeded.patch b/wireshark-1.2.0-asneeded.patch index da05fac..62b038f 100644 --- a/wireshark-1.2.0-asneeded.patch +++ b/wireshark-1.2.0-asneeded.patch @@ -1,6 +1,8 @@ ---- epan/Makefile.am +Index: epan/Makefile.am +=================================================================== +--- epan/Makefile.am.orig +++ epan/Makefile.am -@@ -130,6 +130,7 @@ +@@ -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@ \ @@ -8,7 +10,7 @@ ${top_builddir}/wsutil/libwsutil.la -lm libwireshark_la_DEPENDENCIES = \ -@@ -137,7 +138,8 @@ +@@ -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) \ @@ -18,9 +20,11 @@ #EXTRA_PROGRAMS = reassemble_test #reassemble_test_LDADD = $(GLIB_LIBS) ---- epan/Makefile.in +Index: epan/Makefile.in +=================================================================== +--- epan/Makefile.in.orig +++ epan/Makefile.in -@@ -776,6 +776,7 @@ +@@ -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@ \ @@ -28,7 +32,7 @@ ${top_builddir}/wsutil/libwsutil.la -lm libwireshark_la_DEPENDENCIES = \ -@@ -783,7 +784,8 @@ +@@ -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) \ @@ -38,9 +42,11 @@ RUNLEX = $(top_srcdir)/tools/runlex.sh LEMON = ../tools/lemon ---- wiretap/Makefile.am +Index: wiretap/Makefile.am +=================================================================== +--- wiretap/Makefile.am.orig +++ wiretap/Makefile.am -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) @@ -49,9 +55,11 @@ RUNLEX = $(top_srcdir)/tools/runlex.sh ---- wiretap/Makefile.in +Index: wiretap/Makefile.in +=================================================================== +--- wiretap/Makefile.in.orig +++ wiretap/Makefile.in -@@ -571,7 +571,7 @@ +@@ -589,7 +589,7 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) diff --git a/wireshark-1.2.0-disable-warning-dialog.patch b/wireshark-1.2.0-disable-warning-dialog.patch index b33ce25..6b5eb52 100644 --- a/wireshark-1.2.0-disable-warning-dialog.patch +++ b/wireshark-1.2.0-disable-warning-dialog.patch @@ -1,6 +1,8 @@ ---- gtk/main.c +Index: gtk/main.c +=================================================================== +--- gtk/main.c.orig +++ gtk/main.c -@@ -1227,11 +1227,11 @@ +@@ -1247,11 +1247,11 @@ set_display_filename(capture_file *cf) GtkWidget *close_dlg = NULL; @@ -17,7 +19,7 @@ #ifdef _WIN32 static void -@@ -1797,7 +1797,7 @@ +@@ -1817,7 +1817,7 @@ main(int argc, char *argv[]) e_prefs *prefs; char badopt; GtkWidget *splash_win = NULL; @@ -26,7 +28,7 @@ GLogLevelFlags log_flags; guint go_to_packet = 0; int optind_initial; -@@ -2559,17 +2559,17 @@ +@@ -2577,17 +2577,17 @@ main(int argc, char *argv[]) main_load_window_geometry(top_level); /* Tell the user not to run as root. */ diff --git a/wireshark-1.2.0-geoip.patch b/wireshark-1.2.0-geoip.patch index 5099910..671b5c4 100644 --- a/wireshark-1.2.0-geoip.patch +++ b/wireshark-1.2.0-geoip.patch @@ -1,6 +1,8 @@ ---- epan/geoip_db.c +Index: epan/geoip_db.c +=================================================================== +--- epan/geoip_db.c.orig +++ epan/geoip_db.c -@@ -160,6 +160,9 @@ +@@ -160,6 +160,9 @@ geoip_db_init(void) { geoip_dat_scan_dir(geoip_db_paths[i].path); } } diff --git a/wireshark-1.2.4.tar.bz2 b/wireshark-1.2.4.tar.bz2 deleted file mode 100644 index aef058d..0000000 --- a/wireshark-1.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2eb6902fb8ccdc1dd2c797b6a76e6383aca593f0c6ee16e835d0dcf89d63338 -size 15209570 diff --git a/wireshark-1.2.6.tar.bz2 b/wireshark-1.2.6.tar.bz2 new file mode 100644 index 0000000..922a4a9 --- /dev/null +++ b/wireshark-1.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72c8178dd0614d963173d667d5ecb39bc7102453ea09da7ef3302daee7733f3c +size 15340008 diff --git a/wireshark.changes b/wireshark.changes index 64f3bf1..c23b42a 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Mon Feb 1 14:29:26 CET 2010 - prusnak@suse.cz + +- update desktop file to use xdg-su [bnc#540627] + +------------------------------------------------------------------- +Mon Feb 1 14:26:27 CET 2010 - prusnak@suse.cz + +- updated to 1.2.6 + * Security Fixes: + o Babi discovered several buffer overflows in the LWRES + * Bug Fixes: + o Wireshark could crash while decrypting Kerberos data. + o Address display filters hang Wireshark. (Bug 658) + o PSML - structure context node missing. (Bug 1564) + o Wireshark doesn't dynamically update the packet list. (Bug 1605) + o LUA: There's no tvb_get_stringz() equivalent. (Bug 2244) + o tvb_new_real_data is prone to memory leak. (Bug 3917) + o Malformed OPC UA traffic makes Wireshark "freeze". (Bug 3986) + o Analyze->Expert... doesn't show IP "Bad Checksum" errors. (Bug 4177) + o Wireshark can't decrypt WPA(2)-PSK when passphrase is 63 bytes. (Bug 4183) + o RTP stream analysis: Wrong jitter values after clicking the refresh button. (Bug 4340) + o Wireshark decodes bootp option 2 incorrectly. (Bug 4342) + o Deleting SMI modules causes Wireshark to crash. (Bug 4354) + o Wireshark decodes kerberos AS-REQ PADATA incorrect. (Bug 4363) + o PDML output from TShark includes invalid characters. (Bug 4402) + o Empty GPRS LLC S frames cause truncated data exception. (Bug 4417) + * Updated Protocol Support + BJNP, BOOTP/DHCP, DHCPv6, FIP, GPRS LLC, IEEE 802.11, IP, + Kerberos, OPCUA, SCTP, SSL, ZRTP + +------------------------------------------------------------------- +Mon Feb 1 13:36:40 CET 2010 - prusnak@suse.cz + +- updated to 1.2.5 + * Security Fixes: + o The Daintree SNA file parser could overflow a buffer. (Bug 4294) + o The SMB and SMB2 dissectors could crash. (Bug 4301) + * Bug Fixes: + o Wireshark does not graph rtp streams. (Bug 3801) + o Wireshark showing extraneous data in a TCP stream. (Bug 3955) + o Wrong decoding of gtp.target identification. (Bug 3974) + o TTE dissector bug. (Bug 4247) + o Upper case in Lua pref symbol causes Wireshark to crash. (Bug 4255) + o Incorrect display of stream data using "Follow tcp stream" option. (Bug 4288) + o Custom RADIUS dictionary can cause a crash. (Bug 4316) + * Updated Protocol Support + DAP, eDonkey, GTP, IPMI, MIP, RADIUS, RANAP, SMB, SMB2, TCP, + TTE, VNC, X.509sat + * Updated Capture File Support + Daintree SNA + ------------------------------------------------------------------- Mon Nov 23 16:02:25 UTC 2009 - prusnak@suse.cz diff --git a/wireshark.spec b/wireshark.spec index b8f1cb9..2097a54 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,7 +1,7 @@ # -# spec file for package wireshark (Version 1.2.4) +# spec file for package wireshark (Version 1.2.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: wireshark -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.2.4 +Version: 1.2.6 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -102,7 +102,7 @@ Authors: and many others. For details see /usr/share/doc/packages/wireshark/AUTHORS %package devel -License: GPL v2 or later +License: GPLv2+ Summary: A Network Traffic Analyser Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} glibc-devel glib2-devel @@ -181,8 +181,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README README.linux README.vmware -%{_mandir}/man1/[^i]* -%{_mandir}/man4/* +%doc %{_mandir}/man1/[^i]* +%doc %{_mandir}/man4/* %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/wireshark.png %{_bindir}/[^i]*