Accepting request 184465 from network:utilities

update to 1.10.1 [bnc#831718] (forwarded request 184464 from AndreasStieger)

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

SIGNATURES-1.10.0.txt

@@ -1,44 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-wireshark-1.10.0.tar.bz2: 27101631 bytes
-MD5(wireshark-1.10.0.tar.bz2)=72e51cd33fd33c7044a41c2ab51ad7af
-SHA1(wireshark-1.10.0.tar.bz2)=c78a5d5e589edc8ebc702eb00a284ccbca7721bc
-RIPEMD160(wireshark-1.10.0.tar.bz2)=924e8d94275c1512b9624d009d69fefa8626b5b2
-
-Wireshark-win32-1.10.0.exe: 22238848 bytes
-MD5(Wireshark-win32-1.10.0.exe)=32c76e130a7c0746e738bd56f07da3ba
-SHA1(Wireshark-win32-1.10.0.exe)=f6fad836afe9f44e451773ce617a56165646c202
-RIPEMD160(Wireshark-win32-1.10.0.exe)=15887841d1084e2cfc26706a048355bae737fdb8
-
-Wireshark-win64-1.10.0.exe: 28087416 bytes
-MD5(Wireshark-win64-1.10.0.exe)=7a053d1ef8a133429802f705d574cb58
-SHA1(Wireshark-win64-1.10.0.exe)=344192f708ced148705536b49f45a2f325cac814
-RIPEMD160(Wireshark-win64-1.10.0.exe)=64ed5c9a91363328ef15d4b101f2b4987e575bcc
-
-Wireshark-1.10.0.u3p: 30772650 bytes
-MD5(Wireshark-1.10.0.u3p)=973cb0abe4a5c3409be5aa623704f4f0
-SHA1(Wireshark-1.10.0.u3p)=7b00ba6ee13e528cd65c716a0fb4f27d7c909f3a
-RIPEMD160(Wireshark-1.10.0.u3p)=76f46ed49fe908ac12e24bd1573c8b2c2fa41b19
-
-WiresharkPortable-1.10.0.paf.exe: 23594648 bytes
-MD5(WiresharkPortable-1.10.0.paf.exe)=3a2bb29ad8c87366d1bcd210b69941d1
-SHA1(WiresharkPortable-1.10.0.paf.exe)=411ebf3c448e7ae79c8de694b2089a8e644c89f3
-RIPEMD160(WiresharkPortable-1.10.0.paf.exe)=03e18603bd42c9f0d416162f42f20e0b92b7b49f
-
-Wireshark 1.10.0 Intel 64.dmg: 23905721 bytes
-MD5(Wireshark 1.10.0 Intel 64.dmg)=b49214148e57551a3b6d94eb02d0ee14
-SHA1(Wireshark 1.10.0 Intel 64.dmg)=4e7a94ff56f418ca6e25439196efb9f4671687a2
-RIPEMD160(Wireshark 1.10.0 Intel 64.dmg)=858db55d405d5bffc2ce8647393d173dd0b4c88e
-
-Wireshark 1.10.0 Intel 32.dmg: 21857711 bytes
-MD5(Wireshark 1.10.0 Intel 32.dmg)=5926c5018617d5d01127b873f7fddb62
-SHA1(Wireshark 1.10.0 Intel 32.dmg)=540abecf355e1b35b1b713ed37da4c5d47155b3e
-RIPEMD160(Wireshark 1.10.0 Intel 32.dmg)=15b43fd47ce8d4b35349106d10e58d59ab574ebe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (Darwin)
-
-iEYEARECAAYFAlGvhkwACgkQpw8IXSHylJqhogCgqk24EpieK9oFxOgUb3cqawfj
-8zAAoKrbxy5ywMzMo5qLorwz0V5sbPE3
-=sYV8
------END PGP SIGNATURE-----

SIGNATURES-1.10.1.txt

@@ -0,0 +1,49 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+wireshark-1.10.1.tar.bz2: 26815901 bytes
+MD5(wireshark-1.10.1.tar.bz2)=d8915cf7555e2bbb699020a8736631e7
+SHA1(wireshark-1.10.1.tar.bz2)=7763c864c1e3a3b4e6b6947631392b35fefe4187
+RIPEMD160(wireshark-1.10.1.tar.bz2)=669463f185fa8b9af4f18aaa1f7d426355ab5596
+
+Wireshark-win64-1.10.1.exe: 28133528 bytes
+MD5(Wireshark-win64-1.10.1.exe)=9a41338186422d7b8c62180c3c0551ef
+SHA1(Wireshark-win64-1.10.1.exe)=53d6ae9712ef9082fa265044bf25a538194904f3
+RIPEMD160(Wireshark-win64-1.10.1.exe)=45ab28cfbea276e53bc2cd6c5aff609fc2ef9e86
+
+Wireshark-win32-1.10.1.exe: 22244496 bytes
+MD5(Wireshark-win32-1.10.1.exe)=fd3974dfd6a0ddae946083f6b78d9228
+SHA1(Wireshark-win32-1.10.1.exe)=b207dc15e1a3fe3a45fcad4975cd17f167220692
+RIPEMD160(Wireshark-win32-1.10.1.exe)=e8cb591783a50838af55d56e7d332be5b653d09c
+
+Wireshark-1.10.1.u3p: 30784803 bytes
+MD5(Wireshark-1.10.1.u3p)=9c5ecdccbc03abec50bd98c833f5f781
+SHA1(Wireshark-1.10.1.u3p)=ad130d47a990eb2b02387b8394bf8c648203333f
+RIPEMD160(Wireshark-1.10.1.u3p)=e041863356a65c2521b337d7454acb2e7629a975
+
+WiresharkPortable-1.10.1.paf.exe: 23602416 bytes
+MD5(WiresharkPortable-1.10.1.paf.exe)=3f7396d146988dac1a7295c1d8ed9924
+SHA1(WiresharkPortable-1.10.1.paf.exe)=8e323629a1405888b5e2b48d9803d64ce23e4d74
+RIPEMD160(WiresharkPortable-1.10.1.paf.exe)=639f940b9a55d0ae812fbc0143a6daf69874eb7f
+
+Wireshark 1.10.1 Intel 32.dmg: 19827212 bytes
+MD5(Wireshark 1.10.1 Intel 32.dmg)=95019d12ced337784a0aacd8c54552c7
+SHA1(Wireshark 1.10.1 Intel 32.dmg)=4006dcfd92cd68f0629f971f120e199c5d3c31a5
+RIPEMD160(Wireshark 1.10.1 Intel 32.dmg)=d41f5477c80cc062cc3b430d85179635e2ebfc70
+
+Wireshark 1.10.1 Intel 64.dmg: 24231730 bytes
+MD5(Wireshark 1.10.1 Intel 64.dmg)=64d89d94c27aba81064019bc35250ca1
+SHA1(Wireshark 1.10.1 Intel 64.dmg)=428f974cc5c71cced647d42a1d7997ba5cb49c3a
+RIPEMD160(Wireshark 1.10.1 Intel 64.dmg)=fd0c84396ba517360da8ce12bea8affee94992f7
+
+patch-wireshark-1.10.0-to-1.10.1.bz2: 782998 bytes
+MD5(patch-wireshark-1.10.0-to-1.10.1.bz2)=24bc56199db5ce17c3f46c4977c9d334
+SHA1(patch-wireshark-1.10.0-to-1.10.1.bz2)=70f2a181a2168895befb773004909e2d3cdbe37a
+RIPEMD160(patch-wireshark-1.10.0-to-1.10.1.bz2)=d068e9717d59b514db755f891924b8e3806c59cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (Darwin)
+
+iEYEARECAAYFAlHy2pwACgkQpw8IXSHylJpp3ACfTSlEjo0g5h0FWMk6Hd4fQ0HH
+fwkAoLmu38+EL6x25Dd5se7TBSBgQFbk
+=trrf
+-----END PGP SIGNATURE-----

wireshark-1.10.0-pod-characters.patch

@@ -1,53 +0,0 @@
-From: Andreas Stieger <andreas.stieger@gmx.de>
-Date: Thu, 27 Jun 2013 21:02:17 +0100
-Subject: [patch] prevent pod2man failures due to non-ASCII characters
-References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=49424 
-Upstream: submitted (different patch upstream but creates other errors)
-
-Prevents the following error sue to weird whitespache characters in the file:
-
-  POD2MAN  asn2deb.1
-asn2deb.pod around line 8: Non-ASCII character seen before =encoding in '[-a?I<ASN.1'. Assuming ISO8859-1
-POD document had syntax errors at /usr/bin/pod2man line 71.
-make: *** [asn2deb.1] Error 255
-
-  POD2MAN  idl2deb.1
-idl2deb.pod around line 8: Non-ASCII character seen before =encoding in '[B<-d?>I<opts>]'. Assuming ISO8859-1
-POD document had syntax errors at /usr/bin/pod2man line 71.
-make: *** [idl2deb.1] Error 255
-
----
- doc/asn2deb.pod |    4 ++--
- doc/idl2deb.pod |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: wireshark-1.10.0/doc/asn2deb.pod
-===================================================================
---- wireshark-1.10.0.orig/doc/asn2deb.pod	2013-06-27 20:33:01.000000000 +0100
-+++ wireshark-1.10.0/doc/asn2deb.pod	2013-06-27 20:33:42.000000000 +0100
-@@ -5,8 +5,8 @@ asn2deb - Create a Debian package for BE
- 
- =head1 SYNOPSIS
- 
--B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
--[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
-+[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
- 
- =head1 DESCRIPTION
- 
-Index: wireshark-1.10.0/doc/idl2deb.pod
-===================================================================
---- wireshark-1.10.0.orig/doc/idl2deb.pod	2013-06-27 20:33:01.000000000 +0100
-+++ wireshark-1.10.0/doc/idl2deb.pod	2013-06-27 20:33:42.000000000 +0100
-@@ -5,8 +5,8 @@ idl2deb - Create a Debian package for CO
- 
- =head1 SYNOPSIS
- 
--B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
--[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
-+[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
- 
- 
- =head1 DESCRIPTION

wireshark-1.10.0.tar.bz2

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

wireshark-1.10.1.tar.bz2

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

wireshark-1.10.x-reordercap-r49436.patch

@@ -0,0 +1,34 @@
+From: Andreas Stieger <andreas.stieger@gmx.de>
+Date: Sat, 27 Jul 2013 00:37:00 +0100
+Subject: Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
+References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=49436
+Upstream: Committed
+
+Fixes openSUSE:Factory build
+
+[  535s]   POD2MAN  reordercap.1
+[  535s] reordercap.pod around line 43: You forgot a '=back' before '=head1'
+[  535s] POD document had syntax errors at /usr/bin/pod2man line 71.
+[  535s] make[2]: *** [reordercap.1] Error 255
+
+------------------------------------------------------------------------
+r49436 | eapache | 2013-05-20 15:56:18 +0100 (Mon, 20 May 2013) | 2 lines
+Changed paths:
+   M /trunk/doc/reordercap.pod
+
+Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
+
+------------------------------------------------------------------------
+Index: trunk/doc/reordercap.pod
+===================================================================
+--- trunk/doc/reordercap.pod	(revision 49435)
++++ trunk/doc/reordercap.pod	(revision 49436)
+@@ -40,6 +40,8 @@
+ When the B<-n> option is used, B<reordercap> will not write out the output
+ file if it finds that the input file is already in order.
+ 
++=back
++
+ =head1 SEE ALSO
+ 
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),

wireshark.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Sat Jul 27 00:02:02 UTC 2013 - andreas.stieger@gmx.de
+
+- update to 1.10.1 [bnc#831718]
+  + vulnerabilities fixed:
+    The DCP ETSI dissector could crash
+    CVE-2013-4083 wnpa-sec-2013-41
+  + The P1 dissector could crash
+    CVE-2013-4920 wnpa-sec-2013-42
+  + The Radiotap dissector could crash
+    CVE-2013-4921 wnpa-sec-2013-43
+  + The DCOM ISystemActivator dissector could crash
+    CVE-2013-4922 CVE-2013-4923 CVE-2013-4924 CVE-2013-4925 
+    CVE-2013-4926 wnpa-sec-2013-44
+  + The Bluetooth SDP dissector could go into a large loop
+    CVE-2013-4927 wnpa-sec-2013-45
+  + The Bluetooth OBEX dissector could go into an infinite loop
+    CVE-2013-4928 wnpa-sec-2013-46
+  + The DIS dissector could go into a large loop
+    CVE-2013-4929 wnpa-sec-2013-47
+  + The DVB-CI dissector could crash
+    CVE-2013-4930 wnpa-sec-2013-48
+  + The GSM RR dissector (and possibly others) could go into a large loop
+    CVE-2013-4931 wnpa-sec-2013-49
+  + The GSM A Common dissector could crash
+    CVE-2013-4932 wnpa-sec-2013-50
+  + The Netmon file parser could crash
+    CVE-2013-4933 CVE-2013-4934 wnpa-sec-2013-51 
+  + The ASN.1 PER dissector could crash
+    CVE-2013-4935 wnpa-sec-2013-52
+  + The PROFINET Real-Time dissector could crash
+    CVE-2013-4936 wnpa-sec-2013-53
+    This is still configurable via the GTK settings (add 
+  + Further bug fixes and updated protocol support as listed in:
+    https://www.wireshark.org/docs/relnotes/wireshark-1.10.1.html
+- drop wireshark-1.10.0-pod-characters.patch, fixed upstream
+- add wireshark-1.10.x-reordercap-r49436.patch from trunk to
+  fix factory build
+
 -------------------------------------------------------------------
 Thu Jun 27 20:26:33 UTC 2013 - andreas.stieger@gmx.de
 

wireshark.spec

@@ -20,7 +20,7 @@
 %define use_caps 0
 
 Name:           wireshark
-Version:        1.10.0
+Version:        1.10.1
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+ and GPL-3.0+
@@ -35,7 +35,7 @@ Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 Patch2:         wireshark-1.2.0-geoip.patch
 Patch4:         wireshark-1.10.0-enable_lua.patch
 Patch5:         wireshark-1.10.0-authors-pod2man.patch
-Patch6:         wireshark-1.10.0-pod-characters.patch
+Patch7:         wireshark-1.10.x-reordercap-r49436.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@@ -124,7 +124,7 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark
 %endif
 
 %patch5 -p1
-%patch6 -p1
+%patch7 -p1
 
 %build