From 1359cca57718881c3c623fab089027e4548e038be1b41ad39893a155e26cab6e Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 1 Nov 2013 22:49:47 +0000 Subject: [PATCH] Accepting request 205584 from home:AndreasStieger:branches:network:utilities update to 1.10.3 [bnc#848738] OBS-URL: https://build.opensuse.org/request/show/205584 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=103 --- SIGNATURES-1.10.2.txt | 49 --------- SIGNATURES-1.10.3.txt | 49 +++++++++ wireshark-1.10.2.tar.bz2 | 3 - wireshark-1.10.3.tar.bz2 | 3 + ...x-fix-packet-gluster-duplicate_enums.patch | 100 ------------------ wireshark.changes | 20 ++++ wireshark.spec | 4 +- 7 files changed, 73 insertions(+), 155 deletions(-) delete mode 100644 SIGNATURES-1.10.2.txt create mode 100644 SIGNATURES-1.10.3.txt delete mode 100644 wireshark-1.10.2.tar.bz2 create mode 100644 wireshark-1.10.3.tar.bz2 delete mode 100644 wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch diff --git a/SIGNATURES-1.10.2.txt b/SIGNATURES-1.10.2.txt deleted file mode 100644 index 66568a5..0000000 --- a/SIGNATURES-1.10.2.txt +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -wireshark-1.10.2.tar.bz2: 26667284 bytes -MD5(wireshark-1.10.2.tar.bz2)=cd7fedd0a67df5ad4905fd356efdc1e8 -SHA1(wireshark-1.10.2.tar.bz2)=1f8f877f17dea23e1cf2bafeef0f71323df43521 -RIPEMD160(wireshark-1.10.2.tar.bz2)=675d1fb55d5b40432deb3187f5e87036f377e5df - -Wireshark-win32-1.10.2.exe: 22116616 bytes -MD5(Wireshark-win32-1.10.2.exe)=daeb8836a150bd7b808cd192ff301c03 -SHA1(Wireshark-win32-1.10.2.exe)=bc71582264f96aea9f329b93604330c9ca6525e6 -RIPEMD160(Wireshark-win32-1.10.2.exe)=b93e3c7d7f52fc102cd013f93b81c2639913da4b - -Wireshark-win64-1.10.2.exe: 27966944 bytes -MD5(Wireshark-win64-1.10.2.exe)=08cf4e92a785215f80cb9c0c8b20a9ee -SHA1(Wireshark-win64-1.10.2.exe)=14d00e21405eab7b0470d4b2b9f66d7b66875d68 -RIPEMD160(Wireshark-win64-1.10.2.exe)=d6d911e19499336ae7afe637c1b60b6bc6284c2a - -Wireshark-1.10.2.u3p: 30586569 bytes -MD5(Wireshark-1.10.2.u3p)=3ec1018e8aeb9d03bbaa210e6fa5690f -SHA1(Wireshark-1.10.2.u3p)=8e766387ec0c67f35f6ce8e8d30034ac7e9cacc4 -RIPEMD160(Wireshark-1.10.2.u3p)=6eacf50eaf66048c3c600f849f4ef611741c9a86 - -WiresharkPortable-1.10.2.paf.exe: 23474264 bytes -MD5(WiresharkPortable-1.10.2.paf.exe)=eb83372c2444779502fb81d1146271dd -SHA1(WiresharkPortable-1.10.2.paf.exe)=673ec8dd9d49161fb9d874b19ad8a2288d303d40 -RIPEMD160(WiresharkPortable-1.10.2.paf.exe)=15a0303b24466d5d75fbac4b9ba2adbd34009bfd - -Wireshark 1.10.2 Intel 32.dmg: 20413812 bytes -MD5(Wireshark 1.10.2 Intel 32.dmg)=e8246764df76baaddddb4e726bb962c1 -SHA1(Wireshark 1.10.2 Intel 32.dmg)=cfab1eefeebd5f337bbf3aa2aec9bad058b45880 -RIPEMD160(Wireshark 1.10.2 Intel 32.dmg)=4689e3447d30578ba1c5acece3f88cedfcc8b0bb - -Wireshark 1.10.2 Intel 64.dmg: 24035674 bytes -MD5(Wireshark 1.10.2 Intel 64.dmg)=c4a8684dc0421c50480410404a2cbd58 -SHA1(Wireshark 1.10.2 Intel 64.dmg)=f3af6443f7c25c27824014fd88e8cb1460ecbb08 -RIPEMD160(Wireshark 1.10.2 Intel 64.dmg)=d92a4b4c82666e1046f636747fc8c71c6e86cba0 - -patch-wireshark-1.10.1-to-1.10.2.bz2: 707143 bytes -MD5(patch-wireshark-1.10.1-to-1.10.2.bz2)=f2dec484abafe7172e32843b685f37d2 -SHA1(patch-wireshark-1.10.1-to-1.10.2.bz2)=be360df86926fea8ec6dbc00f6a5a1ba5dfa4b1f -RIPEMD160(patch-wireshark-1.10.1-to-1.10.2.bz2)=6da1393ce74aa66a0c71a1d907f19ef0a6f3f189 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (Darwin) - -iEYEARECAAYFAlIvXQIACgkQpw8IXSHylJpoAQCgsX55DYeXCvuguoQiqHbY3bfr -bjQAnRLE97RaJJqQqt29IOgzTA9FYHeE -=7zZi ------END PGP SIGNATURE----- diff --git a/SIGNATURES-1.10.3.txt b/SIGNATURES-1.10.3.txt new file mode 100644 index 0000000..f5013a8 --- /dev/null +++ b/SIGNATURES-1.10.3.txt @@ -0,0 +1,49 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +wireshark-1.10.3.tar.bz2: 26672853 bytes +MD5(wireshark-1.10.3.tar.bz2)=ceb4b2bac5607d948e00bd950461be1c +SHA1(wireshark-1.10.3.tar.bz2)=58b02d6c2f1ae086a6ec46289d1eea0cc4343309 +RIPEMD160(wireshark-1.10.3.tar.bz2)=ba8fe7da97cae0d60c32735b7fbd78662fd693bd + +Wireshark-win64-1.10.3.exe: 27973080 bytes +MD5(Wireshark-win64-1.10.3.exe)=c40d2b11ab45e5192cea9d320ebce5d7 +SHA1(Wireshark-win64-1.10.3.exe)=a7f2c42e4048af4ca4eb2def3ab07e53e00271eb +RIPEMD160(Wireshark-win64-1.10.3.exe)=63dff32be25ebe38bb80b9c96b2584c86c2240c2 + +Wireshark-win32-1.10.3.exe: 22117888 bytes +MD5(Wireshark-win32-1.10.3.exe)=d03156fc81100a8decca5ea435cdf1c6 +SHA1(Wireshark-win32-1.10.3.exe)=7ebca3f46633f2f527b3301f30f82e5bf7b41e18 +RIPEMD160(Wireshark-win32-1.10.3.exe)=e3c3e1678b022c23b6013504452eb78931d5328a + +Wireshark-1.10.3.u3p: 30593204 bytes +MD5(Wireshark-1.10.3.u3p)=ea61d55544cb10f082406e32e3618d4b +SHA1(Wireshark-1.10.3.u3p)=14454df922102b73222b65459d2395712b164104 +RIPEMD160(Wireshark-1.10.3.u3p)=27f3987d4da9d69264d74f785805b439edd59556 + +WiresharkPortable-1.10.3.paf.exe: 23479992 bytes +MD5(WiresharkPortable-1.10.3.paf.exe)=6a51abaad9fff68d386f575604955dfb +SHA1(WiresharkPortable-1.10.3.paf.exe)=dbcca52d63eb5b92747603b1634712866f2b030d +RIPEMD160(WiresharkPortable-1.10.3.paf.exe)=dd282fa4e0e3bd03fd7ae8eaf328fdff58e40c38 + +Wireshark 1.10.3 Intel 64.dmg: 24048787 bytes +MD5(Wireshark 1.10.3 Intel 64.dmg)=e80812130c3e16d0b3e177a2cef8adbe +SHA1(Wireshark 1.10.3 Intel 64.dmg)=5fa924b3c8c3e5bd80662b95047cea51b12ec0e8 +RIPEMD160(Wireshark 1.10.3 Intel 64.dmg)=a21f9d32d20e43f65b1ccec32d90c85ce65ef10e + +Wireshark 1.10.3 Intel 32.dmg: 20415522 bytes +MD5(Wireshark 1.10.3 Intel 32.dmg)=2c4867660315636fddc5cf74beccdc95 +SHA1(Wireshark 1.10.3 Intel 32.dmg)=30f35f88885e37f8c4e9ee111d24ee83f45f9845 +RIPEMD160(Wireshark 1.10.3 Intel 32.dmg)=ceee081c02059d08de8f693a0fbaa32a448e2ab1 + +patch-wireshark-1.10.2-to-1.10.3.bz2: 83099 bytes +MD5(patch-wireshark-1.10.2-to-1.10.3.bz2)=f2a1d956b1be09c9f0d83532ac6f322c +SHA1(patch-wireshark-1.10.2-to-1.10.3.bz2)=831cc0fdce5e739cda85ebd5921b490985e6d40a +RIPEMD160(patch-wireshark-1.10.2-to-1.10.3.bz2)=e90f171f50ff8e40de5ceb0813ab6c45a875ad1b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.14 (Darwin) + +iEYEARECAAYFAlJz9fcACgkQpw8IXSHylJr2WQCfcdqchd8Zed3sd7Im0iFeIDxi +KTEAn0qXzdbJDaNJbxwVfOiZI9erbzfs +=33qi +-----END PGP SIGNATURE----- diff --git a/wireshark-1.10.2.tar.bz2 b/wireshark-1.10.2.tar.bz2 deleted file mode 100644 index a146c80..0000000 --- a/wireshark-1.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d -size 26667284 diff --git a/wireshark-1.10.3.tar.bz2 b/wireshark-1.10.3.tar.bz2 new file mode 100644 index 0000000..794a13c --- /dev/null +++ b/wireshark-1.10.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c +size 26672853 diff --git a/wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch b/wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch deleted file mode 100644 index a55fd07..0000000 --- a/wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Andreas Stieger -Date: Mon, 30 Sep 2013 19:32:21 +0100 -Subject: Fixes build errors in openSUSE 13.1 and up -References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=52142 http://anonsvn.wireshark.org/viewvc?view=revision&revision=52144 https://bugzilla.novell.com/show_bug.cgi?id=843304 -Upstream: Committed - -Fixes build errors in openSUSE 13.1 and up - -[ 257s] In file included from /usr/include/glib-2.0/glib/gdir.h:34:0, -[ 257s] from /usr/include/glib-2.0/glib.h:47, -[ 257s] from packet-gluster_cli.c:38: -[ 257s] packet-gluster.h:359:2: error: redeclaration of enumerator 'DT_UNKNOWN' -[ 257s] DT_UNKNOWN = 0, -[ 257s] ^ -[ 257s] /usr/include/dirent.h:99:5: note: previous definition of 'DT_UNKNOWN' was here -[ 257s] DT_UNKNOWN = 0, -[ 257s] ^ - ------------------------------------------------------------------------- -r52142 | eapache | 2013-09-19 13:50:25 +0100 (Thu, 19 Sep 2013) | 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-gluster.h - -Remove unused enum that started conflicting with /usr/include/dirent.h on my -system. - ------------------------------------------------------------------------- -r52144 | eapache | 2013-09-19 14:04:37 +0100 (Thu, 19 Sep 2013) | 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-gluster.h - M /trunk/epan/dissectors/packet-glusterfs.c - -Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the -collision. - ------------------------------------------------------------------------- - ---- - epan/dissectors/packet-gluster.h | 18 +++++++++--------- - epan/dissectors/packet-glusterfs.c | 18 +++++++++--------- - 2 files changed, 18 insertions(+), 18 deletions(-) - -Index: wireshark-1.10.2/epan/dissectors/packet-gluster.h -=================================================================== ---- wireshark-1.10.2.orig/epan/dissectors/packet-gluster.h 2013-04-22 19:05:17.000000000 +0100 -+++ wireshark-1.10.2/epan/dissectors/packet-gluster.h 2013-09-30 19:38:08.000000000 +0100 -@@ -356,15 +356,15 @@ enum gf_fop_procnum { - - /* dir-entry types from libglusterfs/src/compat.h */ - enum gluster_entry_types { -- DT_UNKNOWN = 0, -- DT_FIFO = 1, -- DT_CHR = 2, -- DT_DIR = 4, -- DT_BLK = 6, -- DT_REG = 8, -- DT_LNK = 10, -- DT_SOCK = 12, -- DT_WHT = 14 -+ GLUSTER_DT_UNKNOWN = 0, -+ GLUSTER_DT_FIFO = 1, -+ GLUSTER_DT_CHR = 2, -+ GLUSTER_DT_DIR = 4, -+ GLUSTER_DT_BLK = 6, -+ GLUSTER_DT_REG = 8, -+ GLUSTER_DT_LNK = 10, -+ GLUSTER_DT_SOCK = 12, -+ GLUSTER_DT_WHT = 14 - }; - - -Index: wireshark-1.10.2/epan/dissectors/packet-glusterfs.c -=================================================================== ---- wireshark-1.10.2.orig/epan/dissectors/packet-glusterfs.c 2013-04-22 19:05:16.000000000 +0100 -+++ wireshark-1.10.2/epan/dissectors/packet-glusterfs.c 2013-09-30 19:38:08.000000000 +0100 -@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop - - /* dir-entry types */ - static const value_string glusterfs_entry_type_names[] = { -- { DT_UNKNOWN, "DT_UNKNOWN" }, -- { DT_FIFO, "DT_FIFO" }, -- { DT_CHR, "DT_CHR" }, -- { DT_DIR, "DT_DIR" }, -- { DT_BLK, "DT_BLK" }, -- { DT_REG, "DT_REG" }, -- { DT_LNK, "DT_LNK" }, -- { DT_SOCK, "DT_SOCK" }, -- { DT_WHT, "DT_WHT" }, -+ { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" }, -+ { GLUSTER_DT_FIFO, "DT_FIFO" }, -+ { GLUSTER_DT_CHR, "DT_CHR" }, -+ { GLUSTER_DT_DIR, "DT_DIR" }, -+ { GLUSTER_DT_BLK, "DT_BLK" }, -+ { GLUSTER_DT_REG, "DT_REG" }, -+ { GLUSTER_DT_LNK, "DT_LNK" }, -+ { GLUSTER_DT_SOCK, "DT_SOCK" }, -+ { GLUSTER_DT_WHT, "DT_WHT" }, - { 0, NULL } - }; - static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names); diff --git a/wireshark.changes b/wireshark.changes index ac35088..f322bc5 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Nov 1 21:44:02 UTC 2013 - andreas.stieger@gmx.de + +- update to 1.10.3 [bnc#848738] + + vulnerabilities fixed: + * The IEEE 802.15.4 dissector could crash + wnpa-sec-2013-61 CVE-2013-6336 + * The NBAP dissector could crash + wnpa-sec-2013-62 CVE-2013-6337 + * The SIP dissector could crash + wnpa-sec-2013-63 CVE-2013-6338 + * The OpenWire dissector could go into a large loop + wnpa-sec-2013-64 CVE-2013-6339 + * The TCP dissector could crash + wnpa-sec-2013-65 CVE-2013-6340 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.3.html +- drop wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch + merged upstream + ------------------------------------------------------------------- Mon Sep 30 18:50:37 UTC 2013 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index c6d79ed..ddb639e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -23,7 +23,7 @@ %define use_gtk3 0 Name: wireshark -Version: 1.10.2 +Version: 1.10.3 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+ @@ -38,7 +38,6 @@ 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.x-fix-packet-gluster-duplicate_enums.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -131,7 +130,6 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark %endif %patch5 -p1 -%patch6 -p1 %build