From 75a28cde549f3fbc2314ab40dd77dd362b9509e5 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 9 Sep 2011 10:25:06 +0200 Subject: [PATCH 01/15] upgrade to 1.6.2 --- .gitignore | 1 + sources | 2 +- wireshark.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cc76759..101c87c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.4.7.tar.bz2 /wireshark-1.6.0.tar.bz2 /wireshark-1.6.1.tar.bz2 +/wireshark-1.6.2.tar.bz2 diff --git a/sources b/sources index a17f157..7ad25fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc1e8c9800b64130674b120a183e2308 wireshark-1.6.1.tar.bz2 +301677b5f8150265315632fb6247e06e wireshark-1.6.2.tar.bz2 diff --git a/wireshark.spec b/wireshark.spec index 06416c3..a70b8d7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -10,7 +10,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} License: GPL+ Group: Applications/Internet @@ -328,6 +328,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Fri Sep 9 2011 Jan Safranek - 1.6.2-1 +- upgrade to 1.6.2 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html + * Thu Jul 21 2011 Jan Safranek - 1.6.1-1 - upgrade to 1.6.1 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.1.html From 171ff323e7c44469c4eebb1bd00bd93359d52603 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 13 Sep 2011 10:06:17 +0200 Subject: [PATCH 02/15] Fix spelling of the security message --- wireshark-1.6.1-group-msg.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wireshark-1.6.1-group-msg.patch b/wireshark-1.6.1-group-msg.patch index 1457742..c5b6ccd 100644 --- a/wireshark-1.6.1-group-msg.patch +++ b/wireshark-1.6.1-group-msg.patch @@ -25,7 +25,7 @@ diff -up wireshark-1.6.1/capture_sync.c.group-msg wireshark-1.6.1/capture_sync.c - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ securitymsg = "\nAre you a memeber of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; + g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); @@ -46,7 +46,7 @@ diff -up wireshark-1.6.1/capture_sync.c.group-msg wireshark-1.6.1/capture_sync.c - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ securitymsg = "\nAre you a memeber of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; + g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); From 5a23b45c813a248f8def270903f34df65a430413 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Mon, 17 Oct 2011 13:12:35 -0400 Subject: [PATCH 03/15] - Fixed a regression introduce by upstream patch r38306 which caused v4.1 traffic not to be displayed. - Added v4 error status to packet detail window. Signed-off-by: Steve Dickson --- wireshark-1.6.2-nfsv41-addstatus.patch | 59 ++++++++++++++++++++++++++ wireshark.spec | 11 ++++- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 wireshark-1.6.2-nfsv41-addstatus.patch diff --git a/wireshark-1.6.2-nfsv41-addstatus.patch b/wireshark-1.6.2-nfsv41-addstatus.patch new file mode 100644 index 0000000..9eb9405 --- /dev/null +++ b/wireshark-1.6.2-nfsv41-addstatus.patch @@ -0,0 +1,59 @@ +diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/dissectors/packet-nfs.c +--- wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig 2011-09-07 21:54:18.000000000 -0400 ++++ wireshark-1.6.2/epan/dissectors/packet-nfs.c 2011-10-17 12:43:30.116761420 -0400 +@@ -768,7 +768,7 @@ static int nfsv4_operation_tiers[] = { + 1 /* 50, NFS4_OP_LAYOUTGET */, + 1 /* 51, NFS4_OP_LAYOUTRETURN */, + 1 /* 52, NFS4_OP_SECINFO_NO_NAME */, +- 1 /* 53, NFS4_OP_SEQUENCE */, ++ 4 /* 53, NFS4_OP_SEQUENCE */, + 1 /* 54, NFS4_OP_SET_SSV */, + 1 /* 55, NFS4_OP_TEST_STATEID */, + 1 /* 56, NFS4_OP_WANT_DELEGATION */, +@@ -8077,7 +8077,6 @@ static value_string_ext names_nfsv4_oper + static gint *nfsv4_operation_ett[] = + { + &ett_nfs_access4 , +- &ett_nfs_access_supp4, + &ett_nfs_close4 , + &ett_nfs_commit4 , + &ett_nfs_create4 , +@@ -8970,6 +8969,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of + ftree = proto_item_add_subtree(fitem, ett_nfs_argop4); + } + ++ proto_item_append_text(tree, ", Ops(%d):", ops); ++ + for (ops_counter=0; ops_counter/dev/null || : %{_sbindir}/idl2wrs %changelog +* Mon Oct 17 2011 Steve Dickson - 1.6.2-2 +- Fixed a regression introduce by upstream patch r38306 + which caused v4.1 traffic not to be displayed. +- Added v4 error status to packet detail window. + * Fri Sep 9 2011 Jan Safranek - 1.6.2-1 - upgrade to 1.6.2 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html From c5c3b02f2120b9ce8ab94dc2951dacb4b9e5f8de Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 3 Oct 2011 13:10:34 +0200 Subject: [PATCH 04/15] fixed a typo --- wireshark-1.6.1-group-msg.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wireshark-1.6.1-group-msg.patch b/wireshark-1.6.1-group-msg.patch index c5b6ccd..6e65677 100644 --- a/wireshark-1.6.1-group-msg.patch +++ b/wireshark-1.6.1-group-msg.patch @@ -25,7 +25,7 @@ diff -up wireshark-1.6.1/capture_sync.c.group-msg wireshark-1.6.1/capture_sync.c - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a memeber of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; + g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); @@ -46,7 +46,7 @@ diff -up wireshark-1.6.1/capture_sync.c.group-msg wireshark-1.6.1/capture_sync.c - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a memeber of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; + g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); From feabc146219d2dd700779e618edeb1e648aecf3c Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 24 Oct 2011 09:37:20 +0200 Subject: [PATCH 05/15] updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h Resolves: #746655 --- wireshark-autoconf.m4 | 2 +- wireshark.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wireshark-autoconf.m4 b/wireshark-autoconf.m4 index 56bb7ab..d8015d8 100644 --- a/wireshark-autoconf.m4 +++ b/wireshark-autoconf.m4 @@ -10,7 +10,7 @@ AC_DEFUN([AM_PATH_WIRESHARK],[ wireshark_found=no if test "$wireshark_config_prefix" != "" ; then AM_PATH_GLIB_2_0(,,,[gmodule]) - WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS" + WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -DWS_MSVC_NORETURN= -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS" WIRESHARK_LIBS="-L$wireshark_config_prefix/lib -lwireshark -lwiretap $GLIB_LIBS" wireshark_found=yes else diff --git a/wireshark.spec b/wireshark.spec index 8bb88fb..39d90c5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -11,7 +11,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -214,7 +214,7 @@ cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF" Version: %{version} Requires: glib-2.0 gmodule-2.0 Libs: -L${libdir} -lwireshark -lwiretap - Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan + Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -DWS_MSVC_NORETURN= -I${includedir}/wireshark -I${includedir}/wireshark/epan EOF # Install the autoconf macro. @@ -330,6 +330,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Fri Oct 21 2011 Jan Safranek - 1.6.2-3 +- updated autoconf macros and pkgconfig file in wireshark-devel to reflect + current config.h (#746655) + * Mon Oct 17 2011 Steve Dickson - 1.6.2-2 - Fixed a regression introduce by upstream patch r38306 which caused v4.1 traffic not to be displayed. From 865fdb239b9662f908958fba84ebfb901d262db0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 20:38:12 -0500 Subject: [PATCH 06/15] - Rebuilt for glibc bug#747377 --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 39d90c5..435a396 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -11,7 +11,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -330,6 +330,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 1.6.2-4 +- Rebuilt for glibc bug#747377 + * Fri Oct 21 2011 Jan Safranek - 1.6.2-3 - updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h (#746655) From d066eab76b8680e90e2b2f3f7a5a43617299bf98 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 2 Nov 2011 09:08:18 +0100 Subject: [PATCH 07/15] upgrade to 1.6.3 --- .gitignore | 1 + sources | 2 +- wireshark.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 101c87c..f3bff7d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.6.0.tar.bz2 /wireshark-1.6.1.tar.bz2 /wireshark-1.6.2.tar.bz2 +/wireshark-1.6.3.tar.bz2 diff --git a/sources b/sources index 7ad25fb..a80fb27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -301677b5f8150265315632fb6247e06e wireshark-1.6.2.tar.bz2 +5012c75c379ffd47fbcf395d9a6e417e wireshark-1.6.3.tar.bz2 diff --git a/wireshark.spec b/wireshark.spec index 435a396..177b298 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -10,8 +10,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -330,6 +330,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Wed Nov 2 2011 Jan Safranek - 1.6.3-1 +- upgrade to 1.6.3 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html + * Wed Oct 26 2011 Fedora Release Engineering - 1.6.2-4 - Rebuilt for glibc bug#747377 From fca7422ce5afb1308703bf175fa1a06a390be67c Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 14 Nov 2011 10:07:12 +0100 Subject: [PATCH 08/15] added Requires: shadow-utils removed usermode moved Requires: adns to wireshark.rpm --- wireshark.pam | 8 -------- wireshark.spec | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 wireshark.pam diff --git a/wireshark.pam b/wireshark.pam deleted file mode 100644 index 68f4214..0000000 --- a/wireshark.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -#auth sufficient pam_timestamp.so -auth include system-auth -account required pam_permit.so -session required pam_permit.so -session optional pam_xauth.so -#session optional pam_timestamp.so diff --git a/wireshark.spec b/wireshark.spec index 177b298..aaa8d76 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -11,11 +11,10 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 -Source1: wireshark.pam Source2: wireshark.console Source3: wireshark.desktop Source4: wireshark-autoconf.m4 @@ -56,18 +55,20 @@ BuildRequires: portaudio-devel BuildRequires: lua-devel %endif -%package gnome -Summary: Gnome desktop integration for wireshark and wireshark-usermode -Group: Applications/Internet -Requires: gtk2 -Requires: usermode >= 1.37 -Requires: wireshark = %{version}-%{release} -Requires: xdg-utils, usermode-gtk -Requires: GeoIP -Requires: hicolor-icon-theme +Requires(pre): shadow-utils %if %{with_adns} Requires: adns %endif + +%package gnome +Summary: Gnome desktop integration for wireshark +Group: Applications/Internet +Requires: gtk2 +Requires: wireshark = %{version}-%{release} +Requires: xdg-utils +Requires: GeoIP +Requires: hicolor-icon-theme + %if %{with_portaudio} Requires: portaudio %endif @@ -159,10 +160,6 @@ perl -pi -e 's|-L../../epan|-L../../epan/.libs|' plugins/*/*.la make DESTDIR=$RPM_BUILD_ROOT install -# install support files for usermode, gnome and kde -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark - # Install python stuff. mkdir -p $RPM_BUILD_ROOT%{python_sitearch} install -m 644 tools/wireshark_be.py tools/wireshark_gen.py $RPM_BUILD_ROOT%{python_sitearch} @@ -295,7 +292,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/rawshark.* %{_mandir}/man1/dftest.* %{_mandir}/man1/randpkt.* -%config(noreplace) %{_sysconfdir}/pam.d/wireshark %{_datadir}/wireshark %if %{with_lua} %exclude %{_datadir}/wireshark/init.lua @@ -330,6 +326,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Mon Nov 14 2011 Jan Safranek - 1.6.3-2 +- added dependency on shadow-utils (#753293) +- removed usermode support + * Wed Nov 2 2011 Jan Safranek - 1.6.3-1 - upgrade to 1.6.3 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html From 1ec46ade89242566758fcc86a0c4137229862a19 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 2 Dec 2011 09:01:00 +0100 Subject: [PATCH 09/15] upgrade to 1.6.4 build with c-ares and libpcap Resolves: #759305 --- .gitignore | 1 + sources | 2 +- wireshark.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3bff7d..5b71ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.6.1.tar.bz2 /wireshark-1.6.2.tar.bz2 /wireshark-1.6.3.tar.bz2 +/wireshark-1.6.4.tar.bz2 diff --git a/sources b/sources index a80fb27..be7ea80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5012c75c379ffd47fbcf395d9a6e417e wireshark-1.6.3.tar.bz2 +a348521c514fcdd890d974f2a0b59db3 wireshark-1.6.4.tar.bz2 diff --git a/wireshark.spec b/wireshark.spec index aaa8d76..cc0d768 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -10,8 +10,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.6.3 -Release: 2%{?dist} +Version: 1.6.4 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Patch3: wireshark-libtool-pie.patch Patch4: wireshark-1.6.1-group-msg.patch Patch5: wireshark-1.6.0-soname.patch Patch6: wireshark-1.6.2-nfsv41-addstatus.patch +Patch7: wireshark-gnome3-msgbox.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,8 +46,11 @@ BuildRequires: desktop-file-utils BuildRequires: xdg-utils BuildRequires: flex, bison, python, python-devel BuildRequires: GeoIP-devel +BuildRequires: libcap-devel %if %{with_adns} BuildRequires: adns-devel +%else +BuildRequires: c-ares-devel %endif %if %{with_portaudio} BuildRequires: portaudio-devel @@ -109,6 +113,7 @@ and plugins. %patch4 -p1 -b .group-msg %patch5 -p1 -b .soname %patch6 -p1 -b .v4staus +%patch7 -p1 -b .gnome3 %build %ifarch s390 s390x sparcv9 sparc64 From 7bfaf9650bf3fbdbca552ed15aec005c27df753f Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 2 Dec 2011 09:02:45 +0100 Subject: [PATCH 10/15] fixed display of error message boxes on startup in gnome3 Resolves: #752559 --- wireshark-gnome3-msgbox.patch | 24 ++++++++++++++++++++++++ wireshark.spec | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 wireshark-gnome3-msgbox.patch diff --git a/wireshark-gnome3-msgbox.patch b/wireshark-gnome3-msgbox.patch new file mode 100644 index 0000000..e16370e --- /dev/null +++ b/wireshark-gnome3-msgbox.patch @@ -0,0 +1,24 @@ +bz#752559 - Disable the dialog on start + +Reported ans accepted upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6559 + +diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c +index ff7d283..8ee40cf 100644 +--- a/gtk/simple_dialog.c ++++ b/gtk/simple_dialog.c +@@ -316,10 +316,11 @@ vsimple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, va_list + state = gdk_window_get_state(top_level->window); + } + +- /* If we don't yet have a main window or it's iconified, don't show the +- dialog. If showing up a dialog, while main window is iconified, program +- will become unresponsive! */ +- if (top_level == NULL || state & GDK_WINDOW_STATE_ICONIFIED) { ++ /* If we don't yet have a main window or it's iconified or hidden (i.e. not ++ yet ready, don't show the dialog. If showing up a dialog, while main ++ window is iconified, program will become unresponsive! */ ++ if (top_level == NULL || state & GDK_WINDOW_STATE_ICONIFIED ++ || state & GDK_WINDOW_STATE_WITHDRAWN) { + + queued_message = g_malloc(sizeof (queued_message_t)); + queued_message->type = type; diff --git a/wireshark.spec b/wireshark.spec index cc0d768..8534c83 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -331,6 +331,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Fri Dec 2 2011 Jan Safranek - 1.6.4-1 +- upgrade to 1.6.4 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.4.html +- build with c-ares and libpcap (#759305) +- fixed display of error message boxes on startup in gnome3 (#752559) + * Mon Nov 14 2011 Jan Safranek - 1.6.3-2 - added dependency on shadow-utils (#753293) - removed usermode support From f9f018e909e5a430a0d5fc93bffcfec4bd7b7b7f Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 11 Jan 2012 09:22:05 +0100 Subject: [PATCH 11/15] upgrade to 1.6.5 --- .gitignore | 1 + sources | 2 +- wireshark.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b71ea0..c0c3b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.6.2.tar.bz2 /wireshark-1.6.3.tar.bz2 /wireshark-1.6.4.tar.bz2 +/wireshark-1.6.5.tar.bz2 diff --git a/sources b/sources index be7ea80..68ae3e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a348521c514fcdd890d974f2a0b59db3 wireshark-1.6.4.tar.bz2 +794948a10d387fc8e37d824ea11dbac9 wireshark-1.6.5.tar.bz2 diff --git a/wireshark.spec b/wireshark.spec index 8534c83..81fe145 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -10,7 +10,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.6.4 +Version: 1.6.5 Release: 1%{?dist} License: GPL+ Group: Applications/Internet @@ -331,6 +331,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Wed Jan 11 2012 Jan Safranek - 1.6.5-1 +- upgrade to 1.6.5 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.5.html + * Fri Dec 2 2011 Jan Safranek - 1.6.4-1 - upgrade to 1.6.4 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.4.html From fbc8cc4cb662154d77590b7de518bda45940f63f Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 9 Mar 2012 17:33:40 +0100 Subject: [PATCH 12/15] fixed wireshark crashing when using combo box in import dialog Resolves: #773290 --- wireshark-import-crash.patch | 26 ++++++++++++++++++++++++++ wireshark.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 wireshark-import-crash.patch diff --git a/wireshark-import-crash.patch b/wireshark-import-crash.patch new file mode 100644 index 0000000..9e96e13 --- /dev/null +++ b/wireshark-import-crash.patch @@ -0,0 +1,26 @@ +773290 - crashes on using combo box in import dialog + +commit b313621b783a20281c32ccc11625bf08d6f88048 +Author: etxrab +Date: Fri Jan 13 06:22:56 2012 +0000 + + From Edward Sheldrake: + Wireshark crashes if you open the file import dialog and choose something from the "Encapsulation type" list. + + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6729 + + git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40448 f5534014-38df-0310-8fa8-9805f1628bb7 + +diff --git a/gtk/file_import_dlg.c b/gtk/file_import_dlg.c +index 5ee9f3f..1d7535d 100644 +--- a/gtk/file_import_dlg.c ++++ b/gtk/file_import_dlg.c +@@ -203,7 +203,7 @@ encap_co_changed(GtkComboBox *widget, gpointer data) + + if (result) + { +- guint8 encap; ++ guint encap; + GtkTreeModel *model = gtk_combo_box_get_model(widget); + gtk_tree_model_get(model, &iter, 1, &encap, -1); + diff --git a/wireshark.spec b/wireshark.spec index 81fe145..233eb2a 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -11,7 +11,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -31,6 +31,7 @@ Patch4: wireshark-1.6.1-group-msg.patch Patch5: wireshark-1.6.0-soname.patch Patch6: wireshark-1.6.2-nfsv41-addstatus.patch Patch7: wireshark-gnome3-msgbox.patch +Patch8: wireshark-import-crash.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -114,6 +115,7 @@ and plugins. %patch5 -p1 -b .soname %patch6 -p1 -b .v4staus %patch7 -p1 -b .gnome3 +%patch8 -p1 -b .import %build %ifarch s390 s390x sparcv9 sparc64 @@ -331,6 +333,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Fri Mar 9 2012 Jan Safranek - 1.6.5-2 +- fixed wireshark crashing when using combo box in import dialog (#773290) + * Wed Jan 11 2012 Jan Safranek - 1.6.5-1 - upgrade to 1.6.5 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.5.html From e95fa174dea5db0602edb68110ce976619695cf6 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 9 Mar 2012 17:34:57 +0100 Subject: [PATCH 13/15] added AES support into netlogon dissector (personally requested on IRC) --- wireshark-netlogon-aes.patch | 39 ++++++++++++++++++++++++++++++++++++ wireshark.spec | 3 +++ 2 files changed, 42 insertions(+) create mode 100644 wireshark-netlogon-aes.patch diff --git a/wireshark-netlogon-aes.patch b/wireshark-netlogon-aes.patch new file mode 100644 index 0000000..013be11 --- /dev/null +++ b/wireshark-netlogon-aes.patch @@ -0,0 +1,39 @@ +Add AES support to netlogon + +commit 2312194e96d9501549bff6c285ddfae82515e963 +Author: etxrab +Date: Sun Mar 4 16:07:24 2012 +0000 + + "From Jan Šafránek: Add support for AES in Microsoft Network Logon Negotiation options https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6895" + + git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41337 f5534014-38df-0310-8fa8-9805f1628bb7 + +diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c +index 859334a..04d494f 100644 +--- a/epan/dissectors/packet-dcerpc-netlogon.c ++++ b/epan/dissectors/packet-dcerpc-netlogon.c +@@ -6671,12 +6671,12 @@ static int netlogon_dissect_neg_options(tvbuff_t *tvb,proto_tree *tree,guint32 f + hf_netlogon_neg_flags_2000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, +- hf_netlogon_neg_flags_1000000, +- tvb, offset, 4, flags); +- proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_800000, + tvb, offset, 4, flags);*/ + proto_tree_add_boolean (negotiate_flags_tree, ++ hf_netlogon_neg_flags_1000000, ++ tvb, offset, 4, flags); ++ proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_400000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, +@@ -8821,7 +8821,7 @@ proto_register_dcerpc_netlogon(void) + { "Not used 2000000", "ntlmssp.neg_flags.na200000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000000, "Not used", HFILL }}, + + { &hf_netlogon_neg_flags_1000000, +- { "Not used 1000000", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "Not used", HFILL }}, ++ { "AES supported", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "AES", HFILL }}, + + { &hf_netlogon_neg_flags_800000, + { "Not used 800000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800000, "Not used", HFILL }}, diff --git a/wireshark.spec b/wireshark.spec index 233eb2a..1d3753a 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -32,6 +32,7 @@ Patch5: wireshark-1.6.0-soname.patch Patch6: wireshark-1.6.2-nfsv41-addstatus.patch Patch7: wireshark-gnome3-msgbox.patch Patch8: wireshark-import-crash.patch +Patch9: wireshark-netlogon-aes.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -116,6 +117,7 @@ and plugins. %patch6 -p1 -b .v4staus %patch7 -p1 -b .gnome3 %patch8 -p1 -b .import +%patch9 -p1 -b .aes %build %ifarch s390 s390x sparcv9 sparc64 @@ -335,6 +337,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Fri Mar 9 2012 Jan Safranek - 1.6.5-2 - fixed wireshark crashing when using combo box in import dialog (#773290) +- added AES support into netlogon dissector * Wed Jan 11 2012 Jan Safranek - 1.6.5-1 - upgrade to 1.6.5 From 432c00c4335f7b56dc4ffc4c9b5b3668ade7d987 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 28 Mar 2012 09:31:17 +0200 Subject: [PATCH 14/15] upgrade to 1.6.6 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c0c3b8e..f5b7af4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.6.3.tar.bz2 /wireshark-1.6.4.tar.bz2 /wireshark-1.6.5.tar.bz2 +/wireshark-1.6.6.tar.bz2 diff --git a/sources b/sources index 68ae3e1..cd296b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -794948a10d387fc8e37d824ea11dbac9 wireshark-1.6.5.tar.bz2 +61145ccd7684b3cfb159fc902fedfecf wireshark-1.6.6.tar.bz2 From 98f8536d8eecebf40e316a605928641172b916c9 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 28 Mar 2012 09:37:34 +0200 Subject: [PATCH 15/15] version++ --- wireshark.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 1d3753a..aaa0e3f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -10,8 +10,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.6.5 -Release: 2%{?dist} +Version: 1.6.6 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -335,6 +335,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Wed Mar 28 2012 Jan Safranek - 1.6.6-1 +- upgrade to 1.6.6 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.6.html + * Fri Mar 9 2012 Jan Safranek - 1.6.5-2 - fixed wireshark crashing when using combo box in import dialog (#773290) - added AES support into netlogon dissector