Accepting request 416463 from network:utilities

Wireshark 2.0.5 bsc#991013 CVE-2016-6505 bsc#991015 CVE-2016-6505 bsc#991017 CVE-2016-6508 bsc#991018 CVE-2016-6509 bsc#991019 CVE-2016-6510 bsc#991020 CVE-2016-6511 bsc#991021 CVE-2016-6512 bsc#991022 CVE-2016-6513 OBS-URL: https://build.opensuse.org/request/show/416463 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=112
2016-08-05 16:16:52 +00:00 · 2016-08-05 16:16:52 +00:00 · 595b76c2f1
commit 595b76c2f1
parent 254d91e5c6 81ad0f9a82
7 changed files with 110 additions and 91 deletions
--- a/SIGNATURES-2.0.4.txt
+++ b/SIGNATURES-2.0.4.txt
@ -1,55 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-wireshark-2.0.4.tar.bz2: 31121258 bytes
-SHA256(wireshark-2.0.4.tar.bz2)=9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5
-RIPEMD160(wireshark-2.0.4.tar.bz2)=c767f062c421e15cde8f1d83c8fcd7c2c2a138eb
-SHA1(wireshark-2.0.4.tar.bz2)=9d76a28ba4f7566bef1aefbb2868e1ddcb93e999
-MD5(wireshark-2.0.4.tar.bz2)=622928dc6cb31c227c672ec3ec697f28
-
-Wireshark-win64-2.0.4.exe: 47578216 bytes
-SHA256(Wireshark-win64-2.0.4.exe)=3306b9b52e251f0f989eb78a19b298eeced6ebab85e9e167aeaeb1453728bde9
-RIPEMD160(Wireshark-win64-2.0.4.exe)=a52f51b9d84b745635aab2cf885e3f4f3b131628
-SHA1(Wireshark-win64-2.0.4.exe)=13983ad5b244e9db8154888d5f25ad850deb8a6c
-MD5(Wireshark-win64-2.0.4.exe)=7b686baf4404271132219a505c936a4a
-
-Wireshark-win32-2.0.4.exe: 43987120 bytes
-SHA256(Wireshark-win32-2.0.4.exe)=9f4b818affdb7cda21128d46774afc85e6bdd82e09597c84940bd1451df3d259
-RIPEMD160(Wireshark-win32-2.0.4.exe)=a385411e6a1caf2acb306cfef5a7bfac6b2e8391
-SHA1(Wireshark-win32-2.0.4.exe)=4cd730a25b58dc2f289a8d1ca5d684d8b81664d9
-MD5(Wireshark-win32-2.0.4.exe)=cf652ea77d3cbf30d8d866f30215052d
-
-WiresharkPortable_2.0.4.paf.exe: 43671848 bytes
-SHA256(WiresharkPortable_2.0.4.paf.exe)=9586b49faf201643115769d3c72fb0c8ee6c7a791797ffa3570adbd5cbf4d6a9
-RIPEMD160(WiresharkPortable_2.0.4.paf.exe)=14645af3d30dd69f2ee946136129f3404a94e22b
-SHA1(WiresharkPortable_2.0.4.paf.exe)=046ddbae023c9691f00586cfe89184290e5fcc9e
-MD5(WiresharkPortable_2.0.4.paf.exe)=ad5726e4e7450e7ddb3e0d293d32a21d
-
-Wireshark 2.0.4 Intel 64.dmg: 31689834 bytes
-SHA256(Wireshark 2.0.4 Intel 64.dmg)=b78531be77099f4d4b08a1a0fea6dbb777b739ee82255cc83f7de47137ef1627
-RIPEMD160(Wireshark 2.0.4 Intel 64.dmg)=3079f32fcf95a99560b9d26d63d9a9d6ac758645
-SHA1(Wireshark 2.0.4 Intel 64.dmg)=0f48d5dd644f56544a145a1195763e5ca22b9b8b
-MD5(Wireshark 2.0.4 Intel 64.dmg)=3671126b80029b798f0270766cb3f687
-
-Wireshark 2.0.4 Intel 32.dmg: 32415649 bytes
-SHA256(Wireshark 2.0.4 Intel 32.dmg)=52dd39ab2c200d80a3eeeabd8d4c41a109815280f2c51db080c104b3075f4ecd
-RIPEMD160(Wireshark 2.0.4 Intel 32.dmg)=db425b89d92ab0759eb4d6f626b8ba948d9565db
-SHA1(Wireshark 2.0.4 Intel 32.dmg)=a75793af4e8fb7d0cd6196e5288f05a5eff10861
-MD5(Wireshark 2.0.4 Intel 32.dmg)=880f31ca32bda60cb6459d0d87522275
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAEBCgAGBQJXVzAFAAoJEIIkSnjm/q7qPCsP/ik5dKAzFuWqNaaIcOlDt9nd
-Fd3JF1zpcMINDkdBCO0TQidN7fo0FkBxgXYpdV/pjbC61JJoX8/Qgg5d139PrtGB
-w36pg5Vu+h++wdmyvIByPD8cPK/1wsMj5X7asAzJLnXzXrev3NdqN7lvwcYCTZIi
-KZ6otoiGLYSHxWMG82pkDvfhMeABkvGGP8zJexwHd5Rz7Oh6n6G/iV1VSpRwKpak
-UgpZQt+rpTA+ZgJT0Gx3gVp02zM9eDeXnJlZN36ZfcsDE2mO+yrokc8Ov+p8H8Ht
-Cxgn23ADPBgcRqPcRQWnK2p8JCUS4VGpNlwAABBaBAzNylQNhgzqdVL4aLOqnOsh
-CQs0ba/5K68elb/xsHTEizvgJKLp6UM26GUAWEzLqfxDD1qalqLDoze60QdCr23n
-eIzaoeQLK9HJf6olzWlbSZqrDuB06lNVrSZK7BbqS3S1Jfag+bsVKuqRBxhkBn4d
-MCtQOT5zbsRnr7r82bB59znY1Hc33Ow/pYJhsTzmPrpv4s5dTMSU00AyyosYmyUw
-VUzd3k7wVanAHPwOPDS8IE31XOhooZ+bL9cJq9Tsnq1OAFQ/MzZa4f6dTFKLT2cn
-5Zh7O1zrraRlfgW8KLBgveCeBApeqXW5teF5huPSV/oBvmWDC5Atgk9ancXthNMs
-kY+PsyLlGXORSJKMD/NQ
-=UjJ5
-----END PGP SIGNATURE-----
--- a/SIGNATURES-2.0.5.txt
+++ b/SIGNATURES-2.0.5.txt
@ -0,0 +1,55 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+wireshark-2.0.5.tar.bz2: 31124989 bytes
+SHA256(wireshark-2.0.5.tar.bz2)=0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b
+RIPEMD160(wireshark-2.0.5.tar.bz2)=6b6755986c23fd195ddda9344d340a132439420c
+SHA1(wireshark-2.0.5.tar.bz2)=ab77c632d8babf731bf0ecac0876fe3ff2923d04
+MD5(wireshark-2.0.5.tar.bz2)=627b5fc6cf0aeca196c75debd5e69b14
+
+Wireshark-win32-2.0.5.exe: 43980792 bytes
+SHA256(Wireshark-win32-2.0.5.exe)=6c382691dc1ab2da1c5efd02ab03c38babf30d39f31285fc55602ca6135ce593
+RIPEMD160(Wireshark-win32-2.0.5.exe)=df40554004d3ada5e8bcd35442abe5a7ff9cf401
+SHA1(Wireshark-win32-2.0.5.exe)=eb31d6492db724089667c2a4a7ab3fa18d075e0b
+MD5(Wireshark-win32-2.0.5.exe)=cf50a5bc2872d97e43b89fe151e7d3be
+
+Wireshark-win64-2.0.5.exe: 47611856 bytes
+SHA256(Wireshark-win64-2.0.5.exe)=e5f923ec8541dae548536bf9fd1505e344025240d677b7914ab8b0314f93d03c
+RIPEMD160(Wireshark-win64-2.0.5.exe)=583e8b325bcc8472cb241a051314b3e1d41e7cff
+SHA1(Wireshark-win64-2.0.5.exe)=2295d1d0643d1d33916036f574896924b640380e
+MD5(Wireshark-win64-2.0.5.exe)=168626a41abca4e94021e46413ff772a
+
+WiresharkPortable_2.0.5.paf.exe: 43667584 bytes
+SHA256(WiresharkPortable_2.0.5.paf.exe)=b9b11fda813ecdd8d7bb0a5a04ffd69c2a62ffa35e2ab558645db9096713f1af
+RIPEMD160(WiresharkPortable_2.0.5.paf.exe)=b852a809cf6d3f428fde4e69bdedbbfe4981d3f3
+SHA1(WiresharkPortable_2.0.5.paf.exe)=ba09f8afc89e0466b0a43788b6b64b049da9ca16
+MD5(WiresharkPortable_2.0.5.paf.exe)=b14eb13faa7e9d420423fd8b5b09c608
+
+Wireshark 2.0.5 Intel 32.dmg: 32422153 bytes
+SHA256(Wireshark 2.0.5 Intel 32.dmg)=f07b50919586fb316be08e1f856d287da1495a35fc666387283cada71164b3b3
+RIPEMD160(Wireshark 2.0.5 Intel 32.dmg)=1b42ec3e04548801cb8a1acee2df157a3713a9d8
+SHA1(Wireshark 2.0.5 Intel 32.dmg)=9bdaaf2989c64b142731c083049824420d15c74e
+MD5(Wireshark 2.0.5 Intel 32.dmg)=395c1d169d2be16d11b7ed17e47d398d
+
+Wireshark 2.0.5 Intel 64.dmg: 31692909 bytes
+SHA256(Wireshark 2.0.5 Intel 64.dmg)=9fe81f0738fb718cb7340ab4f08094d84cc6343d0f299df4dd56f153483446a5
+RIPEMD160(Wireshark 2.0.5 Intel 64.dmg)=0cc849fd4aec3bd790c1ae7df4701bf96cc9c0da
+SHA1(Wireshark 2.0.5 Intel 64.dmg)=9819a72b1bcee4e0879c350e7b0b5392664c765c
+MD5(Wireshark 2.0.5 Intel 64.dmg)=4d3861437d9b0c3723d26cb3d350520d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAEBCgAGBQJXmRAqAAoJEIIkSnjm/q7qcMQP/jQ0X/7rtA1INZhb/eGm1gWI
+FKKqvMGn2hQ5LluGyf9abR8UH7TDQbkNtfE8OKl2r6Kmr75xO+rib+WW8SgocHQt
+OuyfdE6a6jwSBB/86tfYVY31qOsK2Z8r1rlzW0DfOC7Z73umfqiZum8AUtMVAfeq
+xjAvKliRWNzK9Rukdy4gpXDPW5wWw2OCy8VRv6OZNTwrtlbvjQa/xW2Y1ku7VSKv
+4GX2p5zpAdPocr9lenWkhyq4ZFCirt0K21tNh8WmPW0P27eKaWuRK9eycxOj7IIB
+iGFR8Z/dHFVahZ1jQtTPCuyTYdEhgn+3N0WjBbP1LWdAaphnJsppoQWs2o5L9Ts/
+35reHRuA4zbf/n6hdY7Sm5DPlhaeQ077ExJIQFMlm3jnnBjswOfjQmq4JORpPODJ
+JrgzNDDgEHd3eDx2T/XmCTK7JSfQYGeOKkZBBYQrl/m+nGLTlv/9BgyFpMhjJzJg
+CYJOYZ7TIcmoOUSvP83+Z1p11vdg2GsnzwX3SEmWV4ianMt4U1MdarloCla3H9yG
+k7P1WmLi/1HVMfwNFQYLSO5DLy8Y2spJWBrKKFNGg3tc8Bhd5HLJVk9D2BhJArY/
+SI9Z2timxltmQv1xbkrrxUJ0ijvm7BWgH9QqeFwKSoQd7fO8Vnp1OgNclsZqZASQ
+7at3ACUdS9Oi6qBuQ90A
+=kyvh
+-----END PGP SIGNATURE-----
--- a/wireshark-2.0.4.tar.bz2
+++ b/wireshark-2.0.4.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5
-size 31121258
--- a/wireshark-2.0.5.tar.bz2
+++ b/wireshark-2.0.5.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b
+size 31124989
--- a/wireshark.appdata.xml
+++ b/wireshark.appdata.xml
@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10479
-SentUpstream: 2014-09-18
-->
-<application>
- <id type="desktop">wireshark.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <description>
-  <p>
-   Wireshark is an essential tool to capture and analyze the packets
-   arriving or leaving the network interface.
-   It is almost a GUI equivalent of the classic unix tool tcpdump.
-  </p>
-  <p>
-   Wireshark has a easy to use GUI to capture the packets matching the
-   filter, on the mentioned interface and save them for later analysis.
-  </p>
- </description>
- <url type="homepage">http://www.wireshark.org</url>
- <screenshots>
-  <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/wireshark/a.png</screenshot>
-  <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/wireshark/b.png</screenshot>
- </screenshots>
- <updatecontact>http://www.wireshark.org/lists/</updatecontact>
-</application>
--- a/wireshark.changes
+++ b/wireshark.changes
@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Jul 28 17:23:15 UTC 2016 - astieger@suse.com
+
+- Wireshark 2.0.5:
+  This release fixes a number issues in protocol dissectors that
+  could have allowed a remote attacker to crash Wireshark or cause
+  excessive CPU usage through specially crafted packages inserted
+  into the network or a capture file.
+  * PacketBB crash
+    wnpa-sec-2016-41 bsc#991013 CVE-2016-6505
+  * WSP infinite loop
+    wnpa-sec-2016-42 bsc#991015 CVE-2016-6505
+  * RLC long loop
+    wnpa-sec-2016-44 bsc#991017 CVE-2016-6508
+  * LDSS dissector crash
+    wnpa-sec-2016-45 bsc#991018 CVE-2016-6509
+  * RLC dissector crash
+    wnpa-sec-2016-46 bsc#991019 CVE-2016-6510
+  * OpenFlow long loop
+    wnpa-sec-2016-47 bsc#991020 CVE-2016-6511
+  * MMSE, WAP, WBXML, and WSP infinite loop
+    wnpa-sec-2016-48 bsc#991021 CVE-2016-6512
+  * WBXML crash
+    wnpa-sec-2016-49 bsc#991022 CVE-2016-6513
+  * Further bug fixes and updated protocol support as listed in:
+    https://www.wireshark.org/docs/relnotes/wireshark-2.0.5.html
+
+-------------------------------------------------------------------
+Fri Jul 15 22:56:50 UTC 2016 - badshah400@gmail.com
+
+- Drop external wireshark.appdata.xml file, use the upstream
+  bundled one instead.
+- Use the bundled appdata file as a template to generate the
+  proper appdata files for both the GTK and QT GUI applications;
+  install separate appdata for both apps.
+
 -------------------------------------------------------------------
 Wed Jun  8 07:44:26 UTC 2016 - astieger@suse.com

--- a/wireshark.spec
+++ b/wireshark.spec
@ -29,7 +29,7 @@
 %define use_gnutls 0%{?suse_version} >= 1310 || 0%{?suse_version} == 1110

 Name:           wireshark
-Version:        2.0.4
+Version:        2.0.5
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+ and GPL-3.0+
@ -38,7 +38,6 @@ Url:            https://www.wireshark.org/
 Source:         https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
 Source2:        https://www.wireshark.org/download/SIGNATURES-%{version}.txt
 Source3:        https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
-Source4:        wireshark.appdata.xml
 # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root
 Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders
@ -261,9 +260,19 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}
 install -d -m 0755 %{buildroot}%{_mandir}/man1/
 # install -m 0644 *.1 %%{buildroot}%%{_mandir}/man1/

-# install appdata file for AppStore integration
+# install separate appdata files corresponding to .desktop files for AppStore integration
 install -d -m0755 %{buildroot}%{_datadir}/appdata
-install %{S:4} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
+install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml
+sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (GTK) Network Analyzer<\/name>" \
+       -e "/<description>/i \ \ \ \ <summary>GTK interface for wireshark network traffic analyzer<\/summary>" \
+       -e "s/wireshark\.desktop/wireshark-gtk.desktop/" \
+    %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml
+
+install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network Analyzer<\/name>" \
+       -e "/<description>/i \ \ \ \ <summary>QT interface for wireshark network traffic analyzer<\/summary>" \
+    %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml

 # -devel
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
@ -361,7 +370,7 @@ getent group wireshark >/dev/null || groupadd wireshark
 %files ui-gtk
 %defattr(-,root,root)
 %{_bindir}/wireshark-gtk
-%{_datadir}/appdata/wireshark.appdata.xml
+%{_datadir}/appdata/wireshark-gtk.appdata.xml
 %{_datadir}/applications/wireshark-gtk.desktop
 %{_datadir}/pixmaps/wireshark-gtk.png

@ -371,8 +380,9 @@ getent group wireshark >/dev/null || groupadd wireshark

 %files ui-qt
 %defattr(-,root,root)
-%dir %{_datadir}/appdata
 %{_bindir}/wireshark
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/applications/wireshark.desktop
 %{_datadir}/pixmaps/wireshark.png