From e999fe0391d8f9a1c8cf328d178a788de0f5822031c1186db3e160b3e69760bd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 28 Nov 2008 11:18:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=15 --- wireshark-1.0.4-desktop.patch | 5 +- wireshark-1.0.4-disable-warning-dialog.patch | 57 ++++++++++++++++++++ wireshark-1.0.4-sigpipe-block.patch | 35 ++++++++++++ wireshark.changes | 8 +++ wireshark.spec | 25 ++++++--- 5 files changed, 121 insertions(+), 9 deletions(-) create mode 100644 wireshark-1.0.4-disable-warning-dialog.patch create mode 100644 wireshark-1.0.4-sigpipe-block.patch diff --git a/wireshark-1.0.4-desktop.patch b/wireshark-1.0.4-desktop.patch index cff8dc6..e3db282 100644 --- a/wireshark-1.0.4-desktop.patch +++ b/wireshark-1.0.4-desktop.patch @@ -1,6 +1,6 @@ --- wireshark.desktop +++ wireshark.desktop -@@ -68,7 +68,7 @@ +@@ -68,9 +68,10 @@ Comment[fi]=Verkkoliikenne analysaattori Comment[fr]=Analyseur de trafic réseau Comment[sv]=Nätverkstrafikanalysator @@ -8,4 +8,7 @@ +Icon=wireshark TryExec=wireshark Exec=wireshark ++X-KDE-SubstituteUID=true Terminal=false + # Categorie entry according to version 1.0 of + # http://www.freedesktop.org/wiki/Specifications/menu-spec diff --git a/wireshark-1.0.4-disable-warning-dialog.patch b/wireshark-1.0.4-disable-warning-dialog.patch new file mode 100644 index 0000000..42794e9 --- /dev/null +++ b/wireshark-1.0.4-disable-warning-dialog.patch @@ -0,0 +1,57 @@ +--- gtk/main.c ++++ gtk/main.c +@@ -213,7 +213,7 @@ + static GtkWidget *main_first_pane, *main_second_pane; + static GtkWidget *status_pane_left, *status_pane_right; + static GtkWidget *menubar, *main_vbox, *main_tb, *stat_hbox, *filter_tb; +-static GtkWidget *priv_warning_dialog; ++// static GtkWidget *priv_warning_dialog; + + #ifdef HAVE_AIRPCAP + GtkWidget *airpcap_tb; +@@ -1569,11 +1569,11 @@ + + GtkWidget *close_dlg = NULL; + +-static void +-priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) +-{ +- recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); +-} ++// static void ++// priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) ++// { ++// recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); ++// } + + #ifdef _WIN32 + static void +@@ -3066,17 +3066,17 @@ + main_load_window_geometry(top_level); + + /* 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(); +- priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, +- "Running as user \"%s\" and group \"%s\".\n" +- "This could be dangerous.", cur_user, cur_group); +- g_free(cur_user); +- g_free(cur_group); +- 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(); ++// priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, ++// "Running as user \"%s\" and group \"%s\".\n" ++// "This could be dangerous.", cur_user, cur_group); ++// g_free(cur_user); ++// g_free(cur_group); ++// 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. */ diff --git a/wireshark-1.0.4-sigpipe-block.patch b/wireshark-1.0.4-sigpipe-block.patch new file mode 100644 index 0000000..873594c --- /dev/null +++ b/wireshark-1.0.4-sigpipe-block.patch @@ -0,0 +1,35 @@ +--- capture_opts.c ++++ capture_opts.c +@@ -59,6 +59,7 @@ + # include "inet_v6defs.h" + #endif + ++#include + #include + + #include +@@ -717,6 +718,9 @@ + pcap_t *pch; + char errbuf[PCAP_ERRBUF_SIZE]; + struct pcap_stat ps; ++#ifndef _WIN32 ++ struct sigaction act; ++#endif + + if_list = get_interface_list(&err, &err_str); + if (if_list == NULL) { +@@ -755,6 +759,14 @@ + "Dropped"); + } + ++#ifndef _WIN32 ++ /* handle SIGPIPE signal to default action */ ++ act.sa_handler = SIG_DFL; ++ sigemptyset(&act.sa_mask); ++ act.sa_flags = SA_RESTART; ++ sigaction(SIGPIPE,&act,NULL); ++#endif ++ + while (1) { /* XXX - Add signal handling? */ + for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) { + if_stat = stat_entry->data; diff --git a/wireshark.changes b/wireshark.changes index 37b6e1d..d5b6d41 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 24 16:13:47 CET 2008 - prusnak@suse.cz + +- fix wireshark freeze when closing capture window [bnc#417850] + (sigpipe-block.patch) +- don't show warning when running as root [bnc#349782] +- altered .desktop file to run wireshark gui as root automatically + ------------------------------------------------------------------- Tue Nov 4 14:04:16 CET 2008 - prusnak@suse.cz diff --git a/wireshark.spec b/wireshark.spec index 4f1290c..8187ff7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -26,15 +26,17 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: A Network Traffic Analyser Version: 1.0.4 -Release: 1 +Release: 2 Url: http://www.wireshark.org/ Source: %{name}-%{version}.tar.bz2 Source1: include.filelist Patch0: %{name}-%{version}-help.patch Patch1: %{name}-%{version}-desktop.patch +Patch2: %{name}-%{version}-disable-warning-dialog.patch +Patch3: %{name}-%{version}-sigpipe-block.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: ethereal -Obsoletes: ethereal +Provides: ethereal = %{version} +Obsoletes: ethereal < %{version} %description Wireshark is a free network protocol analyzer for Unix and Windows. It @@ -78,8 +80,8 @@ Summary: A Network Traffic Analyser Group: Productivity/Networking/Diagnostic AutoReqProv: on Requires: %{name} = %{version} glibc-devel glib2-devel -Provides: ethereal-devel -Obsoletes: ethereal-devel +Provides: ethereal-devel = %{version} +Obsoletes: ethereal-devel < %{version} %description devel Wireshark is a free network protocol analyzer for Unix and Windows. It @@ -121,6 +123,8 @@ Authors: %setup -q %patch0 %patch1 +%patch2 +%patch3 %build # %{suse_update_config -f wiretap .} @@ -182,6 +186,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/idl2wrs* %changelog +* Mon Nov 24 2008 prusnak@suse.cz +- fix wireshark freeze when closing capture window [bnc#417850] + (sigpipe-block.patch) +- don't show warning when running as root [bnc#349782] +- altered .desktop file to run wireshark gui as root automatically * Tue Nov 04 2008 prusnak@suse.cz - updated to 1.0.4 * security fixes @@ -413,7 +422,7 @@ rm -rf $RPM_BUILD_ROOT Catapult DCT 2000, Endace ERF, Juniper NetScreen snoop, Visual Networks, Windows Sniffer (NetXRay) - removed fwrite_unused_result.patch -* Tue Sep 04 2007 ro@suse.de +* Mon Sep 03 2007 ro@suse.de - disable -Werror for now * Thu Jul 26 2007 prusnak@suse.cz - changed libpcap to libpcap-devel in BuildRequires @@ -576,7 +585,7 @@ rm -rf $RPM_BUILD_ROOT [#35118] * Wed Feb 25 2004 postadal@suse.cz - updated to version 0.10.2 -* Fri Jan 23 2004 mmj@suse.de +* Thu Jan 22 2004 mmj@suse.de - Update to 0.10.0a - Use -fno-strict-aliasing - Use gtk2 @@ -614,7 +623,7 @@ rm -rf $RPM_BUILD_ROOT * new protocols: MDSHDR, MEGACO, MySQL, SDLC, X.29 * Mon Jan 27 2003 ro@suse.de - fix build with gcc-3.3 -* Thu Jan 23 2003 postadal@suse.cz +* Wed Jan 22 2003 postadal@suse.cz - updated to version 0.9.8 * new protocols: ARCNET, ClearCase NFS, DCERPC LSA_DS, Fibre Channel, HyperSCSI, MDNS, PCLI, RPL, 802.1s MSTP, FIX, GSS-API, Interbase, NDPS,