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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-02-07 16:11:50 +00:00 committed by Git OBS Bridge
parent 613a7fc996
commit 4eb83d2680
4 changed files with 110 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
wireshark-0.99.5-dissectors.patch Normal file
View File

@ -0,0 +1,90 @@
--- asn1/ansi_map/packet-ansi_map-template.c
+++ asn1/ansi_map/packet-ansi_map-template.c
@@ -416,7 +416,6 @@
update_saved_invokedata(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb){
struct amsi_map_invokedata_t *ansi_map_saved_invokedata;
struct tcap_private_t *p_private_tcap;
- guint32 framenum = (guint32)pinfo->fd->num;
address* src = &(pinfo->src);
address* dst = &(pinfo->dst);
guint8 *src_str;
@@ -841,7 +840,7 @@
* 6.5.2.2 ActionCode
* Table 114 ActionCode value
*
-/* 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
+ * 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
static const value_string ansi_map_ActionCode_vals[] = {
{ 0, "Not used"},
@@ -2423,6 +2422,8 @@
"Force Indirect",
"No effect"
};
+
+static void
dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
int offset = 0;
@@ -3162,7 +3163,6 @@
static void
dissect_ansi_map_callingpartyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
- int offset = 0;
proto_item *item;
proto_tree *subtree;
@@ -3390,7 +3390,7 @@
{ 0, NULL }
};
-/* 6.5.2.fw ControlType N.S0023-0 v 1.0 *
+/* 6.5.2.fw ControlType N.S0023-0 v 1.0 */
--- epan/dissectors/packet-ansi_map.c
+++ epan/dissectors/packet-ansi_map.c
@@ -1145,7 +1145,6 @@
update_saved_invokedata(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb){
struct amsi_map_invokedata_t *ansi_map_saved_invokedata;
struct tcap_private_t *p_private_tcap;
- guint32 framenum = (guint32)pinfo->fd->num;
address* src = &(pinfo->src);
address* dst = &(pinfo->dst);
guint8 *src_str;
@@ -1570,7 +1569,7 @@
* 6.5.2.2 ActionCode
* Table 114 ActionCode value
*
-/* 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
+ * 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
static const value_string ansi_map_ActionCode_vals[] = {
{ 0, "Not used"},
@@ -3152,6 +3151,8 @@
"Force Indirect",
"No effect"
};
+
+static void
dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
int offset = 0;
@@ -3891,7 +3892,6 @@
static void
dissect_ansi_map_callingpartyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
- int offset = 0;
proto_item *item;
proto_tree *subtree;
@@ -4119,7 +4119,7 @@
{ 0, NULL }
};
-/* 6.5.2.fw ControlType N.S0023-0 v 1.0 *
+/* 6.5.2.fw ControlType N.S0023-0 v 1.0 */

22
wireshark-0.99.5-func-header.patch
View File

@ -1,22 +0,0 @@
--- asn1/ansi_map/packet-ansi_map-template.c
+++ asn1/ansi_map/packet-ansi_map-template.c
@@ -2423,6 +2423,8 @@
"Force Indirect",
"No effect"
};
+
+static void
dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
int offset = 0;
--- epan/dissectors/packet-ansi_map.c
+++ epan/dissectors/packet-ansi_map.c
@@ -3152,6 +3152,8 @@
"Force Indirect",
"No effect"
};
+
+static void
dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
int offset = 0;

6
wireshark.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 7 10:56:50 CET 2007 - prusnak@suse.cz
- fix SSL support [#242738]
- fix build warnings in dissector's code (dissectors.patch)
-------------------------------------------------------------------
Tue Feb 6 09:38:41 CET 2007 - prusnak@suse.cz

20
wireshark.spec
View File

@ -11,20 +11,20 @@
# norootforbuild
Name: wireshark
BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel pcre-devel python tcpd-devel update-desktop-files
BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel openssl-devel pcre-devel python tcpd-devel update-desktop-files zlib-devel
License: GNU General Public License (GPL)
Group: Productivity/Networking/Diagnostic
Autoreqprov: on
Summary: A Network Traffic Analyser
Version: 0.99.5
Release: 1
Release: 2
URL: http://www.wireshark.org/
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Source3: include.filelist
Patch0: %{name}-%{version}-help.patch
Patch1: %{name}-%{version}-func-header.patch
Patch1: %{name}-%{version}-dissectors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ethereal
Obsoletes: ethereal
@ -124,11 +124,16 @@ CFLAGS="$RPM_OPT_FLAGS -fstack-protector" ./configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
--libdir=%{_libdir} \
--enable-gtk2 \
--enable-ipv6 \
--with-ssl=%{_prefix} \
--with-krb5=yes \
--libdir=%{_libdir}
--with-pcap \
--with-zlib \
--with-pcre \
--with-ssl \
--with-net-snmp \
--with-krb5 \
--with-adns
make %{?jobs:-j%jobs}
%install
@ -178,6 +183,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/idl2wrs*
%changelog -n wireshark
* Wed Feb 07 2007 - prusnak@suse.cz
- fix SSL support [#242738]
- fix build warnings in dissector's code (dissectors.patch)
* Tue Feb 06 2007 - prusnak@suse.cz
- update to 0.99.5
* security fixes [#237246]