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

include.filelist

@@ -1,9 +1,7 @@
 color.h
 config.h
-epan/asn1.h
 epan/address.h
 epan/column_info.h
-epan/column-utils.h
 epan/conversation.h
 epan/crc16.h
 epan/crc32.h

missing_files.tar.bz2

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

wireshark-0.99.4-printf.diff

@@ -1,11 +0,0 @@
---- epan/dissectors/packet-bootp.c
-+++ epan/dissectors/packet-bootp.c
-@@ -1216,7 +1216,7 @@
- 		if (code == pkt_ccc_option) {
- 			skip_opaque = TRUE;
- 			proto_item_append_text(vti,
--				"CableLabs Client Configuration (%d bytes)");
-+				"CableLabs Client Configuration (%d bytes)", optlen);
- 			optend = optoff + optlen;
- 			while (optoff < optend) {
- 				switch (pkt_ccc_protocol_version) {

wireshark-0.99.4.tar.bz2

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

wireshark-0.99.5-func-header.patch

@@ -0,0 +1,22 @@
+--- 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;

wireshark-0.99.5-help.patch

@@ -1,17 +1,11 @@
--datafiledir=$datadir/ethereal
-+datafiledir=$sysconfdir
- datafiledir=`(
-     test "x$prefix" = xNONE && prefix=$ac_default_prefix
-     test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
-================================================================================
 --- gtk/help_dlg.c
 +++ gtk/help_dlg.c
-@@ -51,7 +51,7 @@
+@@ -54,7 +54,7 @@
  #endif
  
  
 -#define HELP_DIR	"help"
-+#define HELP_DIR	"/usr/share/ethereal/help"
++#define HELP_DIR	"/usr/share/wireshark/help"
  
  
  #define NOTEBOOK_KEY    "notebook_key"

wireshark-0.99.5.tar.bz2

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

wireshark.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Feb  6 09:38:41 CET 2007 - prusnak@suse.cz
+
+- update to 0.99.5
+  * security fixes [#237246]
+    - CVE-2007-0459 The TCP dissector could hang or crash
+    - CVE-2007-0458 The HTTP dissector could crash
+    - CVE-2007-0457 The IEEE 802.11 dissector could crash
+    - CVE-2007-0456 The LLT dissector could crash
+  * various bug fixes, added new protocols, see
+    http://www.wireshark.org/docs/relnotes/wireshark-0.99.5.html
+    for full information
+- dropped obsoleted patches:
+  * wireshark-0.99.4-printf.diff (included in update)
+
 -------------------------------------------------------------------
 Thu Dec  7 10:30:28 CET 2006 - prusnak@suse.cz
 

wireshark.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package wireshark (Version 0.99.4)
+# spec file for package wireshark (Version 0.99.5)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -16,16 +16,15 @@ License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Diagnostic
 Autoreqprov:    on
 Summary:        A Network Traffic Analyser
-Version:        0.99.4
+Version:        0.99.5
-Release:        5
+Release:        1
 URL:            http://www.wireshark.org/
-Source:         http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Source3:        include.filelist
-Source4:        missing_files.tar.bz2
+Patch0:         %{name}-%{version}-help.patch
-Patch4:         %{name}-%{version}-config.diff
+Patch1:         %{name}-%{version}-func-header.patch
-Patch5:         %{name}-%{version}-printf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ethereal
 Obsoletes:      ethereal
@@ -111,9 +110,9 @@ Authors:
     and many others. For details see /usr/share/doc/packages/ethereal/AUTHORS
 
 %prep
-%setup -q -a 4
+%setup -q
-%patch4
+%patch0
-%patch5
+%patch1
 
 %build
 %{suse_update_config -f wiretap .}
@@ -122,12 +121,12 @@ autoreconf -fi
 cd ..
 autoreconf -fi
 CFLAGS="$RPM_OPT_FLAGS -fstack-protector" ./configure \
-            --prefix=/usr \
+            --prefix=%{_prefix} \
-            --sysconfdir=/etc \
+            --sysconfdir=%{_sysconfdir} \
             --mandir=%{_mandir} \
             --enable-gtk2 \
             --enable-ipv6 \
-            --with-ssl=/usr \
+            --with-ssl=%{_prefix} \
             --with-krb5=yes \
             --libdir=%{_libdir}
 make %{?jobs:-j%jobs}
@@ -179,6 +178,18 @@ rm -rf %{buildroot}
 %{_mandir}/man1/idl2wrs*
 
 %changelog -n wireshark
+* Tue Feb 06 2007 - prusnak@suse.cz
+- update to 0.99.5
+  * security fixes [#237246]
+    - CVE-2007-0459 The TCP dissector could hang or crash
+    - CVE-2007-0458 The HTTP dissector could crash
+    - CVE-2007-0457 The IEEE 802.11 dissector could crash
+    - CVE-2007-0456 The LLT dissector could crash
+  * various bug fixes, added new protocols, see
+  http://www.wireshark.org/docs/relnotes/wireshark-0.99.5.html
+  for full information
+- dropped obsoleted patches:
+  * wireshark-0.99.4-printf.diff (included in update)
 * Thu Dec 07 2006 - prusnak@suse.cz
 - fixed libdir path in spec file
 * Mon Nov 13 2006 - mjancar@suse.cz