From e5e9c67dd346bbcddcb65310c25c5f1a2c08fce37746eb658615b0c666c8b634 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 30 Dec 2015 09:02:05 +0000 Subject: [PATCH] Accepting request 351291 from home:AndreasStieger:branches:network:utilities Wireshark 2.0.1 OBS-URL: https://build.opensuse.org/request/show/351291 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=165 --- SIGNATURES-2.0.0.txt | 45 ---------------------- SIGNATURES-2.0.1.txt | 45 ++++++++++++++++++++++ wireshark-1.12.6-fix-QT-PIC-PIE.patch | 20 +++++----- wireshark-2.0.0.tar.bz2 | 3 -- wireshark-2.0.1.tar.bz2 | 3 ++ wireshark.changes | 55 +++++++++++++++++++++++++++ wireshark.spec | 2 +- 7 files changed, 114 insertions(+), 59 deletions(-) delete mode 100644 SIGNATURES-2.0.0.txt create mode 100644 SIGNATURES-2.0.1.txt delete mode 100644 wireshark-2.0.0.tar.bz2 create mode 100644 wireshark-2.0.1.tar.bz2 diff --git a/SIGNATURES-2.0.0.txt b/SIGNATURES-2.0.0.txt deleted file mode 100644 index f9a13c3..0000000 --- a/SIGNATURES-2.0.0.txt +++ /dev/null @@ -1,45 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -wireshark-2.0.0.tar.bz2: 30976957 bytes -SHA256(wireshark-2.0.0.tar.bz2)=90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd -RIPEMD160(wireshark-2.0.0.tar.bz2)=79b1badcb34ce5d4d6b8c43de7d0ed2c7c301527 -SHA1(wireshark-2.0.0.tar.bz2)=f8b226b40e36e4c431b4f70bc3f523b6dd53a501 -MD5(wireshark-2.0.0.tar.bz2)=5909af2a09a9a3023ba61bc62e787ad2 - -Wireshark-win32-2.0.0.exe: 37999376 bytes -SHA256(Wireshark-win32-2.0.0.exe)=eb791240f4d3e8562e24fb494597b04050820f1991e5dd82b741b7f240661ecf -RIPEMD160(Wireshark-win32-2.0.0.exe)=614ac3e7afaa43604fbb3ee0797ea1a3482ebe46 -SHA1(Wireshark-win32-2.0.0.exe)=bbc67138a407aeb10e8e60511922464ffe6826ab -MD5(Wireshark-win32-2.0.0.exe)=5555295e497746617794f432e7d6b4d0 - -Wireshark-win64-2.0.0.exe: 40868360 bytes -SHA256(Wireshark-win64-2.0.0.exe)=72949ee020a9b21c7cff94b68920db883504ddbb442870496095471b20707feb -RIPEMD160(Wireshark-win64-2.0.0.exe)=a9be8241c6f50f338860bc1af680201d35b02142 -SHA1(Wireshark-win64-2.0.0.exe)=2aaf8c76526222f29b3f8f157e56cecd9014dfcd -MD5(Wireshark-win64-2.0.0.exe)=bec01ee4b13f6fd919cedf8ee7b367cf - -WiresharkPortable_2.0.0.paf.exe: 42739752 bytes -SHA256(WiresharkPortable_2.0.0.paf.exe)=470933e60832d9a053d14ffadaade9262bdb7a517d690f37e0db0761bf73c892 -RIPEMD160(WiresharkPortable_2.0.0.paf.exe)=c8a9b29d558e33980ad507a1c9d109480cf4b2a7 -SHA1(WiresharkPortable_2.0.0.paf.exe)=6e1d1c529a3a487ac4d7874a7ccc98ea8ad9b5c8 -MD5(WiresharkPortable_2.0.0.paf.exe)=fec2647be084c92ca9167f03637744cb - -Wireshark 2.0.0 Intel 64.dmg: 31522805 bytes -SHA256(Wireshark 2.0.0 Intel 64.dmg)=4e981904bcc29a3c4fcab57fee85a0844a0d8c5df0844cbedb21de62b2db2f22 -RIPEMD160(Wireshark 2.0.0 Intel 64.dmg)=c6425d398af4d0779865377a683d9945566a1d68 -SHA1(Wireshark 2.0.0 Intel 64.dmg)=825f6f97dc782b4109705e780c93a26ea70080ae -MD5(Wireshark 2.0.0 Intel 64.dmg)=19cece26bf58f18704c71f7d6bbce2ab - -Wireshark 2.0.0 Intel 32.dmg: 32295530 bytes -SHA256(Wireshark 2.0.0 Intel 32.dmg)=0aa700811403fc356e4d03fd85d13a6bbd0f95d1ca9a1e6f9233148f2dace8ad -RIPEMD160(Wireshark 2.0.0 Intel 32.dmg)=3281e2fdd4556f11e1e0c6a454f08f8734159c5a -SHA1(Wireshark 2.0.0 Intel 32.dmg)=e682d0e761aaea432ffb325206ea0d191db4ca2c -MD5(Wireshark 2.0.0 Intel 32.dmg)=1d516e6c9757d0aa85d05f0edb7194a5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEARECAAYFAlZNAuwACgkQpw8IXSHylJrCJgCgn+7PjD/rmkuT90t+7D8tX/6a -5ggAn0oUb+yVlM0onpIGrHLLJtosrlf9 -=s6rO ------END PGP SIGNATURE----- diff --git a/SIGNATURES-2.0.1.txt b/SIGNATURES-2.0.1.txt new file mode 100644 index 0000000..922420a --- /dev/null +++ b/SIGNATURES-2.0.1.txt @@ -0,0 +1,45 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +wireshark-2.0.1.tar.bz2: 31016295 bytes +SHA256(wireshark-2.0.1.tar.bz2)=c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab +RIPEMD160(wireshark-2.0.1.tar.bz2)=0a83fb6d2c74005840492d0811a4eca29b565602 +SHA1(wireshark-2.0.1.tar.bz2)=6703221128305ac33802f0da13d368476ce90688 +MD5(wireshark-2.0.1.tar.bz2)=c1610ab2238965363b811e5188750fb1 + +Wireshark-win64-2.0.1.exe: 47333544 bytes +SHA256(Wireshark-win64-2.0.1.exe)=5c5c9668d0254d183ef94eaaab2ca35e1376ae1bac3f10b21ccf5e14eaafb045 +RIPEMD160(Wireshark-win64-2.0.1.exe)=06fc6a95a6a93d4287e4cb4fcbe1f584c8a393d8 +SHA1(Wireshark-win64-2.0.1.exe)=27e290b4647adeb51a714d7a831ef88702b518da +MD5(Wireshark-win64-2.0.1.exe)=8a05505aae3807d554a394c8f86ca4ac + +Wireshark-win32-2.0.1.exe: 43764688 bytes +SHA256(Wireshark-win32-2.0.1.exe)=03a1d405bdcace6d64d9c743bf544079b4e2eeb1f79c87440c38b5790950beb1 +RIPEMD160(Wireshark-win32-2.0.1.exe)=c3f4c13257e4a9a5a637b23e15a90bd0463fce7f +SHA1(Wireshark-win32-2.0.1.exe)=7407cb02091e84f7f329782a5802f1b3b27d9ec9 +MD5(Wireshark-win32-2.0.1.exe)=2841bc0a430f1ac575c98f4dce83deb4 + +WiresharkPortable_2.0.1.paf.exe: 43353168 bytes +SHA256(WiresharkPortable_2.0.1.paf.exe)=66d3b81295bc8860cb766668c4b59e73220d799c52224460422c094d82a78889 +RIPEMD160(WiresharkPortable_2.0.1.paf.exe)=c8dddc54f2bdd7a084ca746db67fe1cf4e123cea +SHA1(WiresharkPortable_2.0.1.paf.exe)=8c80e59338aedcb353fa40f028936c336ec478df +MD5(WiresharkPortable_2.0.1.paf.exe)=ec0f68ea58a6242637892c5fb39e8fde + +Wireshark 2.0.1 Intel 64.dmg: 31559961 bytes +SHA256(Wireshark 2.0.1 Intel 64.dmg)=8c84d745bb8ab930a8f47fd1e4388300def9afbea90aed449558c8189508b9ea +RIPEMD160(Wireshark 2.0.1 Intel 64.dmg)=be4cb9fbf0f80dd9c17c16ed3a6df6461cd10dd8 +SHA1(Wireshark 2.0.1 Intel 64.dmg)=06d300e50cd20bed1b6e13872c390663d717063f +MD5(Wireshark 2.0.1 Intel 64.dmg)=04f046a920113c0136d8d75fdc9870ee + +Wireshark 2.0.1 Intel 32.dmg: 32320570 bytes +SHA256(Wireshark 2.0.1 Intel 32.dmg)=244a20142069f238e5f9696af726880df0233b01462ab5028bfff9dd99f81964 +RIPEMD160(Wireshark 2.0.1 Intel 32.dmg)=f50e433f16f9417a9c66c4376ab7c298b6b5be9a +SHA1(Wireshark 2.0.1 Intel 32.dmg)=6682044bc8b7c33e7eed8814401bd4a0efb84c48 +MD5(Wireshark 2.0.1 Intel 32.dmg)=df7cdee3ef17d81611d1a4dfeca00f4a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEARECAAYFAlaDChoACgkQpw8IXSHylJo3MwCdEQ2ZepF4bAz9v2aLrnTLVjS5 +aCAAnirCP+y4Gz5xx5YgdXsh0Pyxh1LT +=VbIv +-----END PGP SIGNATURE----- diff --git a/wireshark-1.12.6-fix-QT-PIC-PIE.patch b/wireshark-1.12.6-fix-QT-PIC-PIE.patch index a2da5d5..035164e 100644 --- a/wireshark-1.12.6-fix-QT-PIC-PIE.patch +++ b/wireshark-1.12.6-fix-QT-PIC-PIE.patch @@ -19,20 +19,20 @@ Workaround for compilation error on Factory: Should be considered a temporary fix. Some discussion: https://build.opensuse.org/request/show/314996 -diff --git a/configure.ac b/configure.ac -index bcd6f9e..a39a96f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1071,18 +1071,18 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed]) +Index: wireshark-2.0.1/configure.ac +=================================================================== +--- wireshark-2.0.1.orig/configure.ac ++++ wireshark-2.0.1/configure.ac +@@ -1079,18 +1079,18 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-nee # in the address space to make attacks more difficult. # - CFLAGS_before_pie="$CFLAGS" --AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE) -+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIC) - if test "x$CFLAGS" != "x$CFLAGS_before_pie" + WS_CHECKED_CFLAGS_before_pie="$WS_CHECKED_CFLAGS" +-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE, C) ++AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIC, C) + if test "x$can_add_to_cflags" = "xyes" then # Restore CFLAGS - CFLAGS="$CFLAGS_before_pie" + WS_CHECKED_CFLAGS="$WS_CHECKED_CFLAGS_before_pie" LDFLAGS_before_pie="$LDFLAGS" - AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie]) diff --git a/wireshark-2.0.0.tar.bz2 b/wireshark-2.0.0.tar.bz2 deleted file mode 100644 index 01428d2..0000000 --- a/wireshark-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd -size 30976957 diff --git a/wireshark-2.0.1.tar.bz2 b/wireshark-2.0.1.tar.bz2 new file mode 100644 index 0000000..2210360 --- /dev/null +++ b/wireshark-2.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab +size 31016295 diff --git a/wireshark.changes b/wireshark.changes index d918408..c0ddb7b 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Dec 30 08:24:29 UTC 2015 - astieger@suse.com + +- Wireshark 2.0.1 + fixing the following dissector crashes boo#960382: + * NBAP dissector crashes. + wnpa-sec-2015-31 + * NLM dissector crash. + wnpa-sec-2015-37 + * BER dissector crash. + wnpa-sec-2015-39 + * Zlib decompression crash. ([8]Bug 11548) + wnpa-sec-2015-40 + * SCTP dissector crash. + wnpa-sec-2015-41 + * 802.11 decryption crash. + wnpa-sec-2015-42 + * DIAMETER dissector crash. + wnpa-sec-2015-43 + * VeriWave file parser crashes. + wnpa-sec-2015-44 + * RSVP dissector crash. + wnpa-sec-2015-45 + * ANSI A & GSM A dissector crashes. + wnpa-sec-2015-46 + * Ascend file parser crash. + wnpa-sec-2015-47 + * NBAP dissector crash. + npa-sec-2015-48 + * RSL dissector crash. + wnpa-sec-2015-49 + * ZigBee ZCL dissector crash. + wnpa-sec-2015-50 + * Sniffer file parser crash + wnpa-sec-2015-51 + * NWP dissector crash. + wnpa-sec-2015-52 + * BT ATT dissector crash. + wnpa-sec-2015-53 + * MP2T file parser crash. + wnpa-sec-2015-54 + * MP2T file parser crash. + wnpa-sec-2015-55 + * S7COMM dissector crash. + wnpa-sec-2015-56 + * IPMI dissector crash. + wnpa-sec-2015-57 + * TDS dissector crash. + wnpa-sec-2015-58 + * PPI dissector crash. + wnpa-sec-2015-59 + * MS-WSP dissector crash. + wnpa-sec-2015-60 +- adjust wireshark-1.12.6-fix-QT-PIC-PIE.patch for upstream changes + ------------------------------------------------------------------- Sat Dec 12 20:30:27 UTC 2015 - crrodriguez@opensuse.org diff --git a/wireshark.spec b/wireshark.spec index 1e24592..6788615 100644 --- 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.0 +Version: 2.0.1 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+