SHA256
1
0
forked from pool/wireshark
OBS User unknown 2009-06-17 13:51:24 +00:00 committed by Git OBS Bridge
parent 5181bbf656
commit fba6032dfe
8 changed files with 270 additions and 111 deletions

View File

@ -1,37 +0,0 @@
--- gtk/help_dlg.c
+++ gtk/help_dlg.c
@@ -51,7 +51,7 @@
#endif
-#define HELP_DIR "help"
+#define HELP_DIR "/usr/share/wireshark/help"
#define NOTEBOOK_KEY "notebook_key"
@@ -164,10 +164,8 @@
char *relative_path, *absolute_path;
help_page_t *page;
- relative_path = g_strconcat(HELP_DIR, G_DIR_SEPARATOR_S, filename, NULL);
- absolute_path = get_datafile_path(relative_path);
+ absolute_path = g_strconcat(HELP_DIR, G_DIR_SEPARATOR_S, filename, NULL);
text_page = text_page_new(absolute_path);
- g_free(relative_path);
gtk_widget_show(text_page);
page = g_malloc(sizeof (help_page_t));
@@ -223,12 +221,11 @@
return;
}
- help_toc_file_path = get_datafile_path(HELP_DIR G_DIR_SEPARATOR_S "toc");
+ help_toc_file_path = HELP_DIR G_DIR_SEPARATOR_S "toc";
help_toc_file = eth_fopen(help_toc_file_path, "r");
if (help_toc_file == NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not open file \"%s\": %s",
help_toc_file_path, strerror(errno));
- g_free(help_toc_file_path);
return;
}

View File

@ -1,35 +0,0 @@
--- capture_opts.c
+++ capture_opts.c
@@ -59,6 +59,7 @@
# include "inet_v6defs.h"
#endif
+#include <signal.h>
#include <glib.h>
#include <epan/packet.h>
@@ -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;

View File

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

View File

@ -0,0 +1,31 @@
--- epan/Makefile.am
+++ epan/Makefile.am
@@ -130,6 +130,7 @@
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@ \
+ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
${top_builddir}/wsutil/libwsutil.la -lm
libwireshark_la_DEPENDENCIES = \
@@ -137,7 +138,8 @@
libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la $(wslua_lib) \
- ${top_builddir}/wsutil/libwsutil.la
+ ${top_builddir}/wsutil/libwsutil.la \
+ ${top_builddir}/wiretap/libwiretap.la
#EXTRA_PROGRAMS = reassemble_test
#reassemble_test_LDADD = $(GLIB_LIBS)
--- wiretap/Makefile.am
+++ wiretap/Makefile.am
@@ -68,7 +68,7 @@
$(GENERATOR_FILES) \
$(GENERATED_FILES)
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
RUNLEX = $(top_srcdir)/tools/runlex.sh

View File

@ -1,15 +1,6 @@
--- 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 @@
@@ -1227,11 +1227,11 @@
GtkWidget *close_dlg = NULL;
@ -26,7 +17,16 @@
#ifdef _WIN32
static void
@@ -3066,17 +3066,17 @@
@@ -1797,7 +1797,7 @@
e_prefs *prefs;
char badopt;
GtkWidget *splash_win = NULL;
- gpointer priv_warning_dialog;
+// gpointer priv_warning_dialog;
GLogLevelFlags log_flags;
guint go_to_packet = 0;
int optind_initial;
@@ -2559,17 +2559,17 @@
main_load_window_geometry(top_level);
/* Tell the user not to run as root. */

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

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

View File

@ -1,3 +1,103 @@
-------------------------------------------------------------------
Wed Jun 17 12:36:52 CEST 2009 - prusnak@suse.cz
- updated to 1.2.0
Bug Fixes
Too many bugs have been fixed since the 1.0 release to list here.
Some notable fixes are:
o Type-ahead search now works properly.
o Several bugs that affected capture from pipes have been fixed.
o Many Lua-related bugs have been fixed.
o Several memory leaks have been found and fixed.
o The "Follow TCP Stream" feature could show two streams at the
same time The hex dump view has been narrowed.
o WPA and SSL decryption bugs have been fixed.
o Readability problems on 256-color displays on Windows have
been fixed.
New and Updated Features
The following features are new (or have been significantly
updated) since version 1.0:
o Wireshark has a spiffy new start page.
o Display filters now autocomplete.
o A 64-bit Windows (x64) installer is now provided.
o Support for the c-ares resolver library has been added. It has
many advantages over ADNS.
o Many new protocol dissectors and capture file formats have
been added (see below for a complete list).
o Macintosh OS X support has been improved.
o GeoIP database lookups.
o OpenStreetMap + GeoIP integration.
o Improved Postscript(R) print output.
o The preference handling code is now much smarter about
changes.
o Support for Pcap-ng, the next-generation capture file format.
o Support for process information correlation via IPFIX.
o Column widths are now saved.
o The last used configuration profile is now saved.
o Protocol preferences are changeable from the packet details
context menu.
o Support for IP packet comparison.
o Capinfos now shows the average packet rate.
o GTK1 is no longer supported. (Yes, this is a feature.)
o Official Windows packages are now built using Microsoft Visual
C++ 2008 SP1.
New Protocol Support
Anything in Anything Protocol, ATM PW, N-to-one Cell Mode,
B.A.T.M.A.N. Layer 3 Protocol, BACnet MS/TP, BSS LCS Assistance
Protocol, Canon BJNP, CESoPSN basic NxDS0 mode (no RTP support),
Charging ASE, Cimetrics MS/TP, DECT Protocol, Digital Private
Signalling System No 1 Link Layer, DOCSIS Mac Domain Description,
DOCSIS Registration Request Multipart, DOCSIS Registration
Response Multipart, DOCSIS Synchronisation Message, E100
Encapsulation, EHS, Enhanced Variable Rate Codec, Ethernet Global
Data, Ethernet PW, Exchange 2003 Directory Request For Response,
Far End Failure Detection, FCoE Initialization Protocol, GOOSE,
GPEF, GPRS Tunneling Protocol V2, GSM A-I/F COMMON, GSM A-I/F GPRS
Mobility and Session Management, GSM SACCH, GSM Um Interface, HDLC
PW, FR port mode (no CW), HDLC-like framing for PPP, IEC
60870-5-104,Apci, IEC 60870-5-104,Asdu, IEEE 802.15.4 Low-Rate
Wireless PAN non-ASK PHY, IEEE C37.118 Synchrophasor Protocol,
Intelligent Platform Management Interface (Session Wrapper),
Inter-Integrated Circuit, Internal TDM, IPSICTL, ISMACryp
Protocol, iWARP Direct Data Placement and Remote Direct Memory
Access Protocol, iWARP Marker Protocol data unit Aligned framing,
Kontiki Delivery Protocol, LANforge Traffic Generator, Layer 1
Event Messages, Lb-I/F BSSMAP LE, LeCroy VICP, Link Access
Procedure, Channel Dm (LAPDm), Local Download Sharing Service, LTE
Radio Resource Control (RRC) protocol, MAC-LTE, Memcache Protocol,
Mesh Header, MP4V-ES, Nasdaq TotalView-ITCH, Nasdaq-SoupTCP
version 2.0, NAT Port Mapping Protocol, Netdump Protocol,
Non-Access-Stratum (NAS)PDU, PacketLogger, Paltalk Messenger
Protocol, PDCP-LTE, PW Associated Channel Header, PW Ethernet
Control Word, PW Frame Relay DLCI Control Word, PW MPLS Control
Word (generic/preferred), Real-Time Publish-Subscribe Wire
Protocol 2.x, Remote Packet Capture, RLC-LTE, SAToP (no RTP
support), SERCOS III V1.1, SIMULCRYPT Protocol, Subnetwork
Dependent Convergence Protocol XID, Teamspeak2 Protocol,
TTEthernet, TTEthernet Protocol Control Frame, Turbocell Aggregate
Data, Turbocell Header, TURN Channel, Unreliable Multicast
Inter-ORB Protocol, VCDU, Wave Short Message Protocol(IEEE
P1609.3), Wireless Access Station Session Protocol, Wireshark
Expert Info, World of Warcraft, Xpress Transport Protocol, ZigBee
Application Framework, ZigBee Application Support Layer, ZigBee
Device Profile, ZigBee Encapsulation Protocol, ZigBee Network
Layer, Zipped Inter-ORB Protocol, ZRTP
Updated Protocol Support
There are too many updates to list here.
New Capture File Support
Apple Bluetooth PacketLogger, Daintree's Sensor Network Analyzer,
dct3trace, Pcap-NG, TNEF (yes, those silly winmail.dat
attachments)
- removed obsoleted patches:
* help.patch (not needed anymore)
* sigpipe-block.patch (not needed anymore)
-------------------------------------------------------------------
Tue May 26 15:49:43 CEST 2009 - cmorve69@yahoo.es
- made it compile with --as-needed
-------------------------------------------------------------------
Fri May 22 13:36:43 CEST 2009 - prusnak@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package wireshark (Version 1.0.8)
# spec file for package wireshark (Version 1.2.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,24 +19,46 @@
Name: wireshark
BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libgcrypt-devel libgnutls-devel libpcap-devel net-snmp-devel openssl-devel pcre-devel tcpd-devel zlib-devel
BuildRequires: bison flex python update-desktop-files
License: GPL v2 or later
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
Summary: A Network Traffic Analyser
Version: 1.0.8
Version: 1.2.0
Release: 1
Url: http://www.wireshark.org/
Source: http://www.wireshark.org/download/src/%{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
Patch0: %{name}-1.0.8-desktop.patch
Patch1: %{name}-1.2.0-disable-warning-dialog.patch
Patch2: %{name}-1.2.0-asneeded.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: xdg-utils
Provides: ethereal = %{version}
Obsoletes: ethereal < %{version}
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
BuildRequires: gtk2-devel
BuildRequires: krb5-devel
BuildRequires: libcap-devel
BuildRequires: libcares-devel
BuildRequires: libgcrypt-devel
%if 0%{?suse_version} > 1100
BuildRequires: libGeoIP-devel
Recommends: GeoIP
%endif
BuildRequires: libgnutls-devel
BuildRequires: libpcap-devel
BuildRequires: libsmi-devel
BuildRequires: lua-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: portaudio-devel
BuildRequires: python
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
BuildRequires: xdg-utils
BuildRequires: zlib-devel
%description
Wireshark is a free network protocol analyzer for Unix and Windows. It
@ -78,7 +100,6 @@ Authors:
License: GPL v2 or later
Summary: A Network Traffic Analyser
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
Requires: %{name} = %{version} glibc-devel glib2-devel
Provides: ethereal-devel = %{version}
Obsoletes: ethereal-devel < %{version}
@ -124,23 +145,9 @@ Authors:
%patch0
%patch1
%patch2
%patch3
%build
# %{suse_update_config -f wiretap .}
autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
%configure \
--enable-gtk2 \
--enable-ipv6 \
--with-pcap \
--with-zlib \
--with-pcre \
--with-gnutls \
--with-net-snmp \
--with-krb5 \
--with-adns \
--enable-warnings-as-errors=no
%configure
make %{?jobs:-j%jobs}
%install
@ -186,6 +193,99 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/idl2wrs*
%changelog
* Wed Jun 17 2009 prusnak@suse.cz
- updated to 1.2.0
Bug Fixes
Too many bugs have been fixed since the 1.0 release to list here.
Some notable fixes are:
o Type-ahead search now works properly.
o Several bugs that affected capture from pipes have been fixed.
o Many Lua-related bugs have been fixed.
o Several memory leaks have been found and fixed.
o The "Follow TCP Stream" feature could show two streams at the
same time The hex dump view has been narrowed.
o WPA and SSL decryption bugs have been fixed.
o Readability problems on 256-color displays on Windows have
been fixed.
New and Updated Features
The following features are new (or have been significantly
updated) since version 1.0:
o Wireshark has a spiffy new start page.
o Display filters now autocomplete.
o A 64-bit Windows (x64) installer is now provided.
o Support for the c-ares resolver library has been added. It has
many advantages over ADNS.
o Many new protocol dissectors and capture file formats have
been added (see below for a complete list).
o Macintosh OS X support has been improved.
o GeoIP database lookups.
o OpenStreetMap + GeoIP integration.
o Improved Postscript(R) print output.
o The preference handling code is now much smarter about
changes.
o Support for Pcap-ng, the next-generation capture file format.
o Support for process information correlation via IPFIX.
o Column widths are now saved.
o The last used configuration profile is now saved.
o Protocol preferences are changeable from the packet details
context menu.
o Support for IP packet comparison.
o Capinfos now shows the average packet rate.
o GTK1 is no longer supported. (Yes, this is a feature.)
o Official Windows packages are now built using Microsoft Visual
C++ 2008 SP1.
New Protocol Support
Anything in Anything Protocol, ATM PW, N-to-one Cell Mode,
B.A.T.M.A.N. Layer 3 Protocol, BACnet MS/TP, BSS LCS Assistance
Protocol, Canon BJNP, CESoPSN basic NxDS0 mode (no RTP support),
Charging ASE, Cimetrics MS/TP, DECT Protocol, Digital Private
Signalling System No 1 Link Layer, DOCSIS Mac Domain Description,
DOCSIS Registration Request Multipart, DOCSIS Registration
Response Multipart, DOCSIS Synchronisation Message, E100
Encapsulation, EHS, Enhanced Variable Rate Codec, Ethernet Global
Data, Ethernet PW, Exchange 2003 Directory Request For Response,
Far End Failure Detection, FCoE Initialization Protocol, GOOSE,
GPEF, GPRS Tunneling Protocol V2, GSM A-I/F COMMON, GSM A-I/F GPRS
Mobility and Session Management, GSM SACCH, GSM Um Interface, HDLC
PW, FR port mode (no CW), HDLC-like framing for PPP, IEC
60870-5-104,Apci, IEC 60870-5-104,Asdu, IEEE 802.15.4 Low-Rate
Wireless PAN non-ASK PHY, IEEE C37.118 Synchrophasor Protocol,
Intelligent Platform Management Interface (Session Wrapper),
Inter-Integrated Circuit, Internal TDM, IPSICTL, ISMACryp
Protocol, iWARP Direct Data Placement and Remote Direct Memory
Access Protocol, iWARP Marker Protocol data unit Aligned framing,
Kontiki Delivery Protocol, LANforge Traffic Generator, Layer 1
Event Messages, Lb-I/F BSSMAP LE, LeCroy VICP, Link Access
Procedure, Channel Dm (LAPDm), Local Download Sharing Service, LTE
Radio Resource Control (RRC) protocol, MAC-LTE, Memcache Protocol,
Mesh Header, MP4V-ES, Nasdaq TotalView-ITCH, Nasdaq-SoupTCP
version 2.0, NAT Port Mapping Protocol, Netdump Protocol,
Non-Access-Stratum (NAS)PDU, PacketLogger, Paltalk Messenger
Protocol, PDCP-LTE, PW Associated Channel Header, PW Ethernet
Control Word, PW Frame Relay DLCI Control Word, PW MPLS Control
Word (generic/preferred), Real-Time Publish-Subscribe Wire
Protocol 2.x, Remote Packet Capture, RLC-LTE, SAToP (no RTP
support), SERCOS III V1.1, SIMULCRYPT Protocol, Subnetwork
Dependent Convergence Protocol XID, Teamspeak2 Protocol,
TTEthernet, TTEthernet Protocol Control Frame, Turbocell Aggregate
Data, Turbocell Header, TURN Channel, Unreliable Multicast
Inter-ORB Protocol, VCDU, Wave Short Message Protocol(IEEE
P1609.3), Wireless Access Station Session Protocol, Wireshark
Expert Info, World of Warcraft, Xpress Transport Protocol, ZigBee
Application Framework, ZigBee Application Support Layer, ZigBee
Device Profile, ZigBee Encapsulation Protocol, ZigBee Network
Layer, Zipped Inter-ORB Protocol, ZRTP
Updated Protocol Support
There are too many updates to list here.
New Capture File Support
Apple Bluetooth PacketLogger, Daintree's Sensor Network Analyzer,
dct3trace, Pcap-NG, TNEF (yes, those silly winmail.dat
attachments)
- removed obsoleted patches:
* help.patch (not needed anymore)
* sigpipe-block.patch (not needed anymore)
* Tue May 26 2009 cmorve69@yahoo.es
- made it compile with --as-needed
* Fri May 22 2009 prusnak@suse.cz
- updated to 1.0.8
* bug fixes