From 1547428a2ac75a8cf86e0b60e29c76aedf5e4f1fc11a3d59541aec96a0269ee3 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 13 Aug 2014 22:18:19 +0000 Subject: [PATCH] Accepting request 244625 from home:AndreasStieger:branches:network:utilities Wireshark 1.12.0 OBS-URL: https://build.opensuse.org/request/show/244625 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=118 --- SIGNATURES-1.10.9.txt | 49 -------------------- SIGNATURES-1.12.0.txt | 39 ++++++++++++++++ wireshark-1.10.0-authors-pod2man.patch | 16 +++---- wireshark-1.10.9.tar.bz2 | 3 -- wireshark-1.12.0.tar.bz2 | 3 ++ wireshark-1.2.0-disable-warning-dialog.patch | 38 ++++++++------- wireshark-1.2.0-geoip.patch | 16 ++++--- wireshark.changes | 38 +++++++++++++++ wireshark.spec | 33 ++++++------- 9 files changed, 134 insertions(+), 101 deletions(-) delete mode 100644 SIGNATURES-1.10.9.txt create mode 100644 SIGNATURES-1.12.0.txt delete mode 100644 wireshark-1.10.9.tar.bz2 create mode 100644 wireshark-1.12.0.tar.bz2 diff --git a/SIGNATURES-1.10.9.txt b/SIGNATURES-1.10.9.txt deleted file mode 100644 index 919b601..0000000 --- a/SIGNATURES-1.10.9.txt +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -wireshark-1.10.9.tar.bz2: 26769965 bytes -MD5(wireshark-1.10.9.tar.bz2)=c8f0bf0f5bff39ae4ad0a48e41585cd2 -SHA1(wireshark-1.10.9.tar.bz2)=902b0eb6f3e007c9ffcf6f76c02403bd90319f96 -RIPEMD160(wireshark-1.10.9.tar.bz2)=4517b2e98cf41a00ff617a31c79626285d6722f2 - -Wireshark-win32-1.10.9.exe: 22166304 bytes -MD5(Wireshark-win32-1.10.9.exe)=fcfb3abc085b2d31bec470ddcd0dc2b4 -SHA1(Wireshark-win32-1.10.9.exe)=0d0e9c4af512029b61bc160783d34a41a21863f6 -RIPEMD160(Wireshark-win32-1.10.9.exe)=9bbd2d443901e17472ac4d2b4d5918e226175e5d - -Wireshark-win64-1.10.9.exe: 28016536 bytes -MD5(Wireshark-win64-1.10.9.exe)=975a95308570873bb71f1663c4706fcd -SHA1(Wireshark-win64-1.10.9.exe)=848b7ea90f398c005a9d1986dbaa9be47476a4a6 -RIPEMD160(Wireshark-win64-1.10.9.exe)=c9bc0f52eab4c9e90dfb493ce0e7d8a87fe8f509 - -Wireshark-1.10.9.u3p: 30653536 bytes -MD5(Wireshark-1.10.9.u3p)=4074efd56c5757535f9dfaa7f74d9526 -SHA1(Wireshark-1.10.9.u3p)=c298e23248a3b58b6ecdd7dbb2532969e9fbf293 -RIPEMD160(Wireshark-1.10.9.u3p)=8bda60a20959e9f437d6855ec1c73a6744f21af4 - -WiresharkPortable-1.10.9.paf.exe: 23537080 bytes -MD5(WiresharkPortable-1.10.9.paf.exe)=6f5e168cf2f1ca8ab8740b06fd12ebfd -SHA1(WiresharkPortable-1.10.9.paf.exe)=5d8c131b138b4d8eeefc26788e5a57191ac89d97 -RIPEMD160(WiresharkPortable-1.10.9.paf.exe)=2772a6e75cc0aba1c2a015b08226cc18bae46038 - -Wireshark 1.10.9 Intel 32.dmg: 20461818 bytes -MD5(Wireshark 1.10.9 Intel 32.dmg)=e44028439e7ad12b2d1f015203d520cf -SHA1(Wireshark 1.10.9 Intel 32.dmg)=467b18c9b000dd9bec4534d54afc3c1804ee54c2 -RIPEMD160(Wireshark 1.10.9 Intel 32.dmg)=ee9045341aa810f32b588ece0598e2e26ce1d640 - -Wireshark 1.10.9 Intel 64.dmg: 24787099 bytes -MD5(Wireshark 1.10.9 Intel 64.dmg)=f84f2aaef059241705e4456bc15e968e -SHA1(Wireshark 1.10.9 Intel 64.dmg)=8d0e89971d5ae4bc909cdd5f2b6c17972008d2e3 -RIPEMD160(Wireshark 1.10.9 Intel 64.dmg)=20e4526b0865f38a114da8451351144d01d394e8 - -patch-wireshark-1.10.8-to-1.10.9.bz2: 189834 bytes -MD5(patch-wireshark-1.10.8-to-1.10.9.bz2)=8ad5f6a31dbc4484182f9403cc2abab1 -SHA1(patch-wireshark-1.10.8-to-1.10.9.bz2)=65b680175698eb15e8904847f2e81d613c655453 -RIPEMD160(patch-wireshark-1.10.8-to-1.10.9.bz2)=586b624493e329aad35152fedad739fe051f5bd4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (Darwin) - -iEYEARECAAYFAlParOcACgkQpw8IXSHylJpq7gCg2tqXKKEqw9xLcbL8rkJnEyda -BJUAoLNp8HRdDlx42qalIWVpcHStN41G -=JTox ------END PGP SIGNATURE----- diff --git a/SIGNATURES-1.12.0.txt b/SIGNATURES-1.12.0.txt new file mode 100644 index 0000000..dc5f9f5 --- /dev/null +++ b/SIGNATURES-1.12.0.txt @@ -0,0 +1,39 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +wireshark-1.12.0.tar.bz2: 29033823 bytes +MD5(wireshark-1.12.0.tar.bz2)=8dcfe451d8769901129809d2e19c1fb7 +SHA1(wireshark-1.12.0.tar.bz2)=c7a94a9ec90c1ff9be2a7d7b813276e433509df9 +RIPEMD160(wireshark-1.12.0.tar.bz2)=e4d398b1fc3b55b0b4b630ba69a2ab0547124e4a + +Wireshark-win32-1.12.0.exe: 28419192 bytes +MD5(Wireshark-win32-1.12.0.exe)=81c8f3ec05338f721a3c17a281f91b92 +SHA1(Wireshark-win32-1.12.0.exe)=becdb61e0502343d9a402498e9a9a17481d25e01 +RIPEMD160(Wireshark-win32-1.12.0.exe)=bee348b7b7b8c7e1380cf456a65f56080e1b4a78 + +Wireshark-win64-1.12.0.exe: 35531552 bytes +MD5(Wireshark-win64-1.12.0.exe)=4ab55583c53abf719d33c76d6f92ccd7 +SHA1(Wireshark-win64-1.12.0.exe)=91fc8bde4680fe283d325cd053fa2b3813cccebf +RIPEMD160(Wireshark-win64-1.12.0.exe)=d56ef9b64dc63ba3fb9613c904741730571d7a45 + +WiresharkPortable-1.12.0.paf.exe: 29848288 bytes +MD5(WiresharkPortable-1.12.0.paf.exe)=ca09838c3f8634ed683b9fa4a51607a8 +SHA1(WiresharkPortable-1.12.0.paf.exe)=c84a9eb6b29a61106badc053fb58f8fb6dc08bfd +RIPEMD160(WiresharkPortable-1.12.0.paf.exe)=c1b9cb2ff36868fbb6cc6bf1661e3056852597e6 + +Wireshark 1.12.0 Intel 64.dmg: 26335736 bytes +MD5(Wireshark 1.12.0 Intel 64.dmg)=f1a91022042d39e0a8a68fb5d61c07db +SHA1(Wireshark 1.12.0 Intel 64.dmg)=702f8eae3ad04b09a531fe2756857fdeba3d2481 +RIPEMD160(Wireshark 1.12.0 Intel 64.dmg)=1aa31348f61c12367c25e77cd3474a05207c0886 + +Wireshark 1.12.0 Intel 32.dmg: 30160 bytes +MD5(Wireshark 1.12.0 Intel 32.dmg)=6fae2bfa59532972e7f4dc4a7408354d +SHA1(Wireshark 1.12.0 Intel 32.dmg)=c06f7a2ba0ffda44e241788c0b9696b1b9a3af42 +RIPEMD160(Wireshark 1.12.0 Intel 32.dmg)=5575194018cbdbe211d4364a01a04915df9a8983 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.14 (Darwin) + +iEYEARECAAYFAlParK0ACgkQpw8IXSHylJqa+gCeKtQWTmwOxI4JGEqjns3laLDp +5OUAnRt4FWTWmycxHsuuYoNZbZVQ9+X4 +=IVoP +-----END PGP SIGNATURE----- diff --git a/wireshark-1.10.0-authors-pod2man.patch b/wireshark-1.10.0-authors-pod2man.patch index a190798..0f430ba 100644 --- a/wireshark-1.10.0-authors-pod2man.patch +++ b/wireshark-1.10.0-authors-pod2man.patch @@ -17,11 +17,11 @@ error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build) AUTHORS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: wireshark-1.10.0/AUTHORS +Index: wireshark-1.12.0/AUTHORS =================================================================== ---- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100 -+++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100 -@@ -3509,7 +3509,7 @@ Peter Hatina { +--- wireshark-1.12.0.orig/AUTHORS 2014-08-04 23:51:44.000000000 +0100 ++++ wireshark-1.12.0/AUTHORS 2014-08-04 23:53:31.000000000 +0100 +@@ -3520,7 +3520,7 @@ Peter Hatina { Gtk3 Wireshark fixes } @@ -30,7 +30,7 @@ Index: wireshark-1.10.0/AUTHORS USBPcap support } -@@ -3612,7 +3612,7 @@ Cvetan Ivanov +@@ -3662,7 +3662,7 @@ Cvetan Ivanov Vasanth Manickam Julian Onions Samuel Thibault @@ -39,12 +39,12 @@ Index: wireshark-1.10.0/AUTHORS Paul Ollis Dominik Kuhlen Karl Knoebl -@@ -3703,7 +3703,7 @@ Paul Stath +@@ -3753,7 +3753,7 @@ Paul Stath DeCount Andras Veres-Szentkiralyi Jakob Hirsch --Роман Донченко -+Roman Donchenko +-Роман Донченко ++Roman Donchenko Evan Huus Tom Cook diff --git a/wireshark-1.10.9.tar.bz2 b/wireshark-1.10.9.tar.bz2 deleted file mode 100644 index c4b9b08..0000000 --- a/wireshark-1.10.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f985db5ea99f4b285ae2eceab42327058f7ba5272d22338152dd79e7601441c -size 26769965 diff --git a/wireshark-1.12.0.tar.bz2 b/wireshark-1.12.0.tar.bz2 new file mode 100644 index 0000000..9832c2d --- /dev/null +++ b/wireshark-1.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7 +size 29033823 diff --git a/wireshark-1.2.0-disable-warning-dialog.patch b/wireshark-1.2.0-disable-warning-dialog.patch index e442b76..f50dd11 100644 --- a/wireshark-1.2.0-disable-warning-dialog.patch +++ b/wireshark-1.2.0-disable-warning-dialog.patch @@ -1,8 +1,12 @@ -Index: ui/gtk/main.c +--- + ui/gtk/main.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: wireshark-1.12.0/ui/gtk/main.c =================================================================== ---- ui/gtk/main.c.orig 2012-08-10 01:35:00.000000000 +0100 -+++ ui/gtk/main.c 2012-08-15 20:28:59.000000000 +0100 -@@ -1399,11 +1399,13 @@ main_colorize_changed(gboolean packet_li +--- wireshark-1.12.0.orig/ui/gtk/main.c 2014-08-04 23:46:11.000000000 +0100 ++++ wireshark-1.12.0/ui/gtk/main.c 2014-08-04 23:51:21.000000000 +0100 +@@ -1378,11 +1378,13 @@ main_colorize_changed(gboolean packet_li static GtkWidget *close_dlg = NULL; @@ -16,23 +20,23 @@ Index: ui/gtk/main.c #ifdef _WIN32 static void -@@ -2081,9 +2083,10 @@ check_and_warn_user_startup(gchar *cf_na +@@ -2074,9 +2076,10 @@ check_and_warn_user_startup(gchar *cf_na #endif { - gchar *cur_user, *cur_group; -- gpointer priv_warning_dialog; -+// gpointer priv_warning_dialog; + gchar *cur_user, *cur_group; +- gpointer priv_warning_dialog; ++// gpointer priv_warning_dialog; - /* Tell the user not to run as root. */ + /* Tell the user not to run as root. */ +/* - if (running_with_special_privs() && recent.privs_warn_if_elevated) { - cur_user = get_cur_username(); - cur_group = get_cur_groupname(); -@@ -2098,6 +2101,7 @@ check_and_warn_user_startup(gchar *cf_na - simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); - simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); - } + if (running_with_special_privs() && recent.privs_warn_if_elevated) { + cur_user = get_cur_username(); + cur_group = get_cur_groupname(); +@@ -2091,6 +2094,7 @@ check_and_warn_user_startup(gchar *cf_na + simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); + simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); + } +*/ #ifdef _WIN32 - /* Warn the user if npf.sys isn't loaded. */ + /* Warn the user if npf.sys isn't loaded. */ diff --git a/wireshark-1.2.0-geoip.patch b/wireshark-1.2.0-geoip.patch index d15d9a9..2a976cf 100644 --- a/wireshark-1.2.0-geoip.patch +++ b/wireshark-1.2.0-geoip.patch @@ -1,8 +1,12 @@ -Index: epan/geoip_db.c +--- + epan/geoip_db.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: wireshark-1.12.0/epan/geoip_db.c =================================================================== ---- epan/geoip_db.c.orig 2012-06-05 17:33:40.000000000 +0100 -+++ epan/geoip_db.c 2012-06-21 21:55:14.000000000 +0100 -@@ -177,6 +177,9 @@ geoip_db_init(void) { +--- wireshark-1.12.0.orig/epan/geoip_db.c 2014-07-31 20:22:47.000000000 +0100 ++++ wireshark-1.12.0/epan/geoip_db.c 2014-08-04 23:44:43.000000000 +0100 +@@ -175,6 +175,9 @@ static void geoip_db_post_update_cb(void geoip_dat_scan_dir(geoip_db_paths[i].path); } } @@ -10,5 +14,5 @@ Index: epan/geoip_db.c + geoip_dat_scan_dir("/var/lib/GeoIP"); + } - /* add fake databases for latitude and longitude (using "City" in reality) */ - { + /* add fake databases for latitude and longitude + * (using "City" in reality) */ diff --git a/wireshark.changes b/wireshark.changes index d6226df..1fd7b23 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Aug 13 22:03:39 UTC 2014 - andreas.stieger@gmx.de + +- Wireshark 1.12.0 +- new and updated features since 1.10: + * When manipulating packets with editcap using the -C + and/or -s options, it is now possible + to also adjust the original frame length using the -L + option. + * You can now pass the -C option to editcap + multiple times, which allows you to chop bytes from the + beginning of a packet as well as at the end of a packet in + a single step. + * You can now specify an optional offset to the -C option for + editcap, which allows you to start chopping from that + offset instead of from the absolute packet beginning or + end. + * "malformed" display filter has been renamed to + "_ws.malformed". A handful of other filters have been given + the "_ws." prefix to note they are Wireshark application + specific filters and not dissector filters. + * The Kerberos dissector has been replaced with an auto + generated one from ASN1 protocol description, changing a + lot of filter names. + * Transport name resolution is now disabled by default. + * Dissector output may be encoded as UTF-8. This includes + TShark output. +- New and updated protocol and capture file support as listed in + https://www.wireshark.org/docs/relnotes/wireshark-1.12.0.html +- major API changes +- packaging changes: + * build with GTK+ 3 for openSUSE, GTK+ 2 on SLE 11 + * disable building wireshark-qt + * refreshed patches: + wireshark-1.2.0-geoip.patch for context changes + wireshark-1.2.0-disable-warning-dialog.patch, same + wireshark-1.10.0-authors-pod2man.patch, same + ------------------------------------------------------------------- Thu Jul 31 23:28:38 UTC 2014 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index 4a98fd9..605042d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -19,11 +19,10 @@ # disable caps for now %define use_caps 0 -# openSUSE Factory gtk3 deprecates gtk2 elements used -%define use_gtk3 0 +%define use_gtk3 0%{?suse_version} > 1140 Name: wireshark -Version: 1.10.9 +Version: 1.12.0 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+ @@ -41,19 +40,15 @@ Patch5: wireshark-1.10.0-authors-pod2man.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex -%if 0%{?suse_version} <= 1140 -BuildRequires: gtk2-devel -%else %if 0%{?use_gtk3} -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= 3.0.0 %else -BuildRequires: gtk2-devel -%endif +BuildRequires: gtk2-devel >= 2.12.0 %endif BuildRequires: krb5-devel BuildRequires: libcap-devel BuildRequires: libcares-devel -BuildRequires: libgcrypt-devel +BuildRequires: libgcrypt-devel >= 1.1.92 BuildRequires: libgnutls-devel BuildRequires: libpcap-devel BuildRequires: libsmi-devel @@ -67,7 +62,7 @@ BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: portaudio-devel -BuildRequires: python-devel +BuildRequires: python-devel >= 2.5 BuildRequires: tcpd-devel BuildRequires: xdg-utils %if 0%{?suse_version} > 1220 @@ -119,13 +114,13 @@ echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep MD5 | head -n1 | cut -d= -f echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep SHA1 | head -n1 | cut -d= -f2` %{S:0}" | sha1sum -c %setup -q -%patch2 +%patch2 -p1 %patch4 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 %if ! %{use_caps} -%patch1 +%patch1 -p1 sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop %endif @@ -138,15 +133,18 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark %if 0%{?suse_version} < 1220 --without-zlib \ %endif -%if 0%{?suse_version} > 1140 %if 0%{?use_gtk3} - --with-gtk3 \ -%endif + --with-gtk3=yes \ + --with-gtk2=no \ +%else + --with-gtk3=no \ + --with-gtk2=yes \ %endif --with-ssl \ --with-gnutls=yes \ --with-gcrypt=yes \ --with-python \ + --with-qt=no \ --with-plugins=%{_libdir}/%{name}/plugins/%{version} make %{?_smp_mflags} @@ -172,8 +170,6 @@ mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" install -m 644 color.h config.h register.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" -install -m 644 frame_data_sequence.h "${IDIR}/" -install -m 644 packet-range.h print.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" @@ -219,6 +215,7 @@ getent group wireshark >/dev/null || groupadd wireshark %{_bindir}/text2pcap %{_bindir}/dftest %{_bindir}/capinfos +%{_bindir}/captype %{_bindir}/randpkt %if %{use_caps} %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap