rpm/wireshark
SHA256
1
0
Fork 0
forked from pool/wireshark
Code Pull Requests Activity

Accepting request 40022 from network:utilities

Browse Source 
Copy from network:utilities/wireshark based on submit request 40022 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/40022
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=30
This commit is contained in:
OBS User autobuild 2010-05-14 22:36:21 +00:00 committed by Git OBS Bridge
commit 3aae235bb3
6 changed files with 97 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
wireshark-1.2.0-disable-warning-dialog.patch
View File

@ -2,58 +2,40 @@ Index: gtk/main.c
===================================================================
--- gtk/main.c.orig
+++ gtk/main.c
@@ -1247,11 +1247,11 @@ set_display_filename(capture_file *cf)
@@ -1246,13 +1246,13 @@ set_display_filename(capture_file *cf)
}
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);
+// }
-
+/*
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
@@ -1817,7 +1817,7 @@ main(int argc, char *argv[])
e_prefs *prefs;
char badopt;
GtkWidget *splash_win = NULL;
npf_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
@@ -1792,9 +1792,10 @@ check_and_warn_user_startup(gchar *cf_na
#endif
{
gchar *cur_user, *cur_group;
- gpointer priv_warning_dialog;
+// gpointer priv_warning_dialog;
GLogLevelFlags log_flags;
guint go_to_packet = 0;
int optind_initial;
@@ -2577,17 +2577,17 @@ main(int argc, char *argv[])
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);
+// }
+/*
if (running_with_special_privs() && recent.privs_warn_if_elevated) {
cur_user = get_cur_username();
cur_group = get_cur_groupname();
@@ -1806,7 +1807,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. */
if (!stdin_capture && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) {

2
wireshark-1.2.0-geoip.patch
View File

@ -2,7 +2,7 @@ Index: epan/geoip_db.c
===================================================================
--- epan/geoip_db.c.orig
+++ epan/geoip_db.c
@@ -160,6 +160,9 @@ geoip_db_init(void) {
@@ -161,6 +161,9 @@ geoip_db_init(void) {
geoip_dat_scan_dir(geoip_db_paths[i].path);
}
}

3
wireshark-1.2.6.tar.bz2
View File

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

3
wireshark-1.2.8.tar.bz2 Normal file
View File

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

54
wireshark.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Fri May 14 12:48:53 CEST 2010 - prusnak@suse.cz
- updated to 1.2.8
* Security Fixes:
o The DOCSIS dissector could crash. (Bug 4644), (bug 4646)
* Bug Fixes:
o HTTP parser limits with Content-Length. (Bug 1958)
o MATE dissector bug with GOGs. (Bug 3010)
o Changing fonts and deleting system time from preferences,
results in wireshark crash. (Bug 3387)
o ERF file starting with record with timestamp=0,1 or 2 not
recognized as ERF file. (Bug 4503)
o The SSL dissector can not correctly resemple SSL records when
the record header is spit between packets. (Bug 4535)
o TCP reassembly can call subdissector with incorrect TCP
sequence number. (Bug 4624)
o PTP dissector displays big correction field values wrong. (Bug
4635)
o MSF is at Anthorn, not Rugby. (Bug 4678)
o ProtoField __tostring() description is missing in Wireshark's
Lua API Reference Manual. (Bug 4695)
o EVRC packet bundling not handled correctly. (Bug 4718)
o Completely unresponsive when run very first time by root user.
(Bug 4308)
* Updated Protocol Support
DOCSIS, HTTP, SSL
* Updated Capture File Support
ERF, PacketLogger.
-------------------------------------------------------------------
Wed May 5 16:29:26 EST 2010 - sharms@ubuntu.com
- updated to new stable upstream version 1.2.7
* Bug Fixes:
o SNMPv3 Engine ID registration. (Bug 2426)
o Open file dialog always displayed when clicking anywhere on Wireshark. (Bug 2478)
o tshark reports wrong number of bytes on big dumpfiles with -z io,stat. (Bug 3205)
o Negative INTEGER number displayed as positive number in SNMP dissector. (Bug 3230)
o Add support for FT_BOOLEAN fields to wslua FieldInfo. (Bug 4049)
o Wireshark crashes w/ GLib error when trying to play RTP stream. (Bug 4119)
o Windows 2000 support has been restored. (Bug 4176)
o Wrong dissection on be_cell_id_list for bssmap. (Bug 4437)
o I/O Graph dropdown boxes not working correctly. (Bug 4487)
o Runtime Error when right-clicking field and selecting "Filter Field Reference". (Bug 4522)
o In GSM SMS PDU TPVPF showing wrong. (Bug 4524)
o Profinet: May be wrong defined byte meaning. (Bug 4525)
o GLib-CRITICAL ** Message. (Bug 4547)
o Certain EDP display filters trigger Wireshark/tshark runtime error. (Bug 4563)
o Some NCP frames trigger "Dissector bug, protocol NCP". (Bug 4565)
o The encapsulation abbreviation "bluetooth-h4" is ambiguous. (Bug 4613)
* Updated Protocol Support:
o BSSMAP, DMP, GSM SMS, LDSS, NCP, PN/IO, PPP, SIP, SNMP
-------------------------------------------------------------------
Mon Feb 1 14:29:26 CET 2010 - prusnak@suse.cz

75
wireshark.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package wireshark (Version 1.2.6)
# spec file for package wireshark (Version 1.2.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -22,7 +22,7 @@ Name: wireshark
License: GPLv2+
Group: Productivity/Networking/Diagnostic
Summary: A Network Traffic Analyser
Version: 1.2.6
Version: 1.2.8
Release: 1
Url: http://www.wireshark.org/
Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -61,9 +61,11 @@ BuildRequires: pcre-devel
BuildRequires: portaudio-devel
BuildRequires: python
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
BuildRequires: xdg-utils
BuildRequires: zlib-devel
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%description
Wireshark is a free network protocol analyzer for Unix and Windows. It
@ -73,34 +75,6 @@ and detail information for each packet. Wireshark has several powerful
features, including a rich display filter language and the ability to
view the reconstructed stream of a TCP session.
Authors:
--------
Gerald Combs <gerald[AT]ethereal.com>
Gilbert Ramirez <gram[AT]alumni.rice.edu>
Hannes R. Boehm <hannes[AT]boehm.org>
Mike Hall <mike[AT]hallzone.net>
Bobo Rajec <bobo[AT]bsp-consulting.sk>
Laurent Deniel <laurent.deniel[AT]free.fr>
Don Lafontaine <lafont02[AT]cn.ca>
Guy Harris <guy[AT]alum.mit.edu>
Simon Wilkinson <sxw[AT]dcs.ed.ac.uk>
Joerg Mayer <jmayer[AT]loplof.de>
Martin Maciaszek <fastjack[AT]i-s-o.net>
Didier Jorand <Didier.Jorand[AT]alcatel.fr>
Jun-ichiro itojun Hagino <itojun[AT]itojun.org>
Richard Sharpe <sharpe[AT]ns.aus.com>
John McDermott <jjm[AT]jkintl.com>
Jeff Jahr <jjahr[AT]shastanets.com>
Brad Robel-Forrest <bradr[AT]watchguard.com>
Ashok Narayanan <ashokn[AT]cisco.com>
Aaron Hillegass <aaron[AT]classmax.com>
Jason Lango <jal[AT]netapp.com>
Johan Feyaerts <Johan.Feyaerts[AT]siemens.atea.be>
Olivier Abad <oabad[AT]noos.fr>
and many others. For details see /usr/share/doc/packages/wireshark/AUTHORS
%package devel
License: GPLv2+
Summary: A Network Traffic Analyser
@ -117,34 +91,6 @@ and detail information for each packet. Wireshark has several powerful
features, including a rich display filter language and the ability to
view the reconstructed stream of a TCP session.
Authors:
--------
Gerald Combs <gerald[AT]ethereal.com>
Gilbert Ramirez <gram[AT]alumni.rice.edu>
Hannes R. Boehm <hannes[AT]boehm.org>
Mike Hall <mike[AT]hallzone.net>
Bobo Rajec <bobo[AT]bsp-consulting.sk>
Laurent Deniel <laurent.deniel[AT]free.fr>
Don Lafontaine <lafont02[AT]cn.ca>
Guy Harris <guy[AT]alum.mit.edu>
Simon Wilkinson <sxw[AT]dcs.ed.ac.uk>
Joerg Mayer <jmayer[AT]loplof.de>
Martin Maciaszek <fastjack[AT]i-s-o.net>
Didier Jorand <Didier.Jorand[AT]alcatel.fr>
Jun-ichiro itojun Hagino <itojun[AT]itojun.org>
Richard Sharpe <sharpe[AT]ns.aus.com>
John McDermott <jjm[AT]jkintl.com>
Jeff Jahr <jjahr[AT]shastanets.com>
Brad Robel-Forrest <bradr[AT]watchguard.com>
Ashok Narayanan <ashokn[AT]cisco.com>
Aaron Hillegass <aaron[AT]classmax.com>
Jason Lango <jal[AT]netapp.com>
Johan Feyaerts <Johan.Feyaerts[AT]siemens.atea.be>
Olivier Abad <oabad[AT]noos.fr>
and many others. For details see /usr/share/doc/packages/wireshark/AUTHORS
%prep
%setup -q
%patch0
@ -154,22 +100,25 @@ Authors:
%build
%configure
make %{?jobs:-j%jobs}
make %{?_smp_mflags}
%install
make "DESTDIR=$RPM_BUILD_ROOT" install
make DESTDIR=$RPM_BUILD_ROOT install
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/
%suse_update_desktop_file -i wireshark System Network
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
done
install -D -m 0644 image/wsicon48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/wireshark.png
install -D -m 0644 wireshark.desktop $RPM_BUILD_ROOT%{_datadir}/applications/wireshark.desktop
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -183,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING NEWS README README.linux README.vmware
%doc %{_mandir}/man1/[^i]*
%doc %{_mandir}/man4/*
%{_datadir}/applications/*.desktop
%{_datadir}/applications/wireshark.desktop
%{_datadir}/pixmaps/wireshark.png
%{_bindir}/[^i]*
%{_libdir}/lib*.so.*