[oe-commits] Armin Kuster : wireshark: Update package

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 2f8f79895a31a612e365e90b56e51e065177632d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2f8f79895a31a612e365e90b56e51e065177632d

Author: Armin Kuster <akuster808 at gmail.com>
Date:   Sun Aug 16 19:31:00 2015 -0700

wireshark: Update package

minor recipe updates.

This update contains several security updates:
* [1]wnpa-sec-2015-21
  Protocol tree crash. ([2]Bug 11309)
* [3]wnpa-sec-2015-22
  Memory manager crash. ([4]Bug 11373)
* [5]wnpa-sec-2015-23
  Dissector table crash. ([6]Bug 11381)
* [7]wnpa-sec-2015-24
  ZigBee crash. ([8]Bug 11389)
* [9]wnpa-sec-2015-25
  GSM RLC/MAC infinite loop. ([10]Bug 11358)
* [11]wnpa-sec-2015-26
  WaveAgent crash. ([12]Bug 11358)
* [13]wnpa-sec-2015-27
  OpenFlow infinite loop. ([14]Bug 11358)
* [15]wnpa-sec-2015-28
  Ptvcursor crash. ([16]Bug 11358)
* [17]wnpa-sec-2015-29
  WCCP crash. ([18]Bug 11358)

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 .../wireshark/{wireshark_1.12.6.bb => wireshark_1.12.7.bb}        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.6.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.7.bb
similarity index 86%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.6.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.7.bb
index 936ad62..f8ab3ca 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.6.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.7.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
 
 DEPENDS = "perl-native pcre expat glib-2.0 sbc"
 
-SRC_URI = "https://2.na.dl.wireshark.org/src/wireshark-${PV}.tar.bz2"
+SRC_URI = "https://2.na.dl.wireshark.org/src/${BP}.tar.bz2"
 
 PE = "1"
 
-SRC_URI[md5sum] = "25ad2bc1c2a21396827c238fcff51bf3"
-SRC_URI[sha256sum] = "22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6"
+SRC_URI[md5sum] = "c8ae53f648b1dcbf6e74495401a0f1ab"
+SRC_URI[sha256sum] = "c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c"
 
 inherit autotools pkgconfig
 
@@ -35,10 +35,12 @@ PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark,"
 PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
 PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
 PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
+PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl"
 PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
 PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
 PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib"
 PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip"
+PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no"
 
 # these next two options require addional layers
 PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns"