From 2ea8d7f54a061e902657c4f8ea1f7f7c25c6c4e1 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sun, 18 Sep 2016 15:10:45 -0700
Subject: [PATCH] wireshark: update package to 1.12.13 for security fixes.

Fix build issue when X11 not defined.

Security fixes included in updating to this version:
CVE-2016-6511 CVE-2016-6510 CVE-2016-6509 CVE-2016-6508
CVE-2016-6507 CVE-2016-6506 CVE-2016-6505 CVE-2016-6504
CVE-2016-5359 CVE-2016-5357 CVE-2016-5356 CVE-2016-5355
CVE-2016-5354 CVE-2016-5353 CVE-2016-5351 CVE-2016-5350
CVE-2016-4421 CVE-2016-4418 CVE-2016-4417 CVE-2016-4085
CVE-2016-4082 CVE-2016-4081 CVE-2016-4080 CVE-2016-4079
CVE-2016-4078 CVE-2016-4006 CVE-2016-2532 CVE-2016-2531
CVE-2016-2530 CVE-2016-2523 CVE-2016-2521 CVE-2015-8733
CVE-2015-8732 CVE-2015-8731 CVE-2015-8730 CVE-2015-8729
CVE-2015-8728 CVE-2015-8727 CVE-2015-8726 CVE-2015-8725
CVE-2015-8724 CVE-2015-8723 CVE-2015-8722 CVE-2015-8721
CVE-2015-8720 CVE-2015-8719 CVE-2015-8718 CVE-2015-8717
CVE-2015-8716 CVE-2015-8715

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{wireshark_1.12.8.bb => wireshark_1.12.13.bb}      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.8.bb => wireshark_1.12.13.bb} (89%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.13.bb
similarity index 89%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.13.bb
index 70d7c3f777..708899b2ee 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.13.bb
@@ -10,18 +10,16 @@ SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2"
 
 PE = "1"
 
-SRC_URI[md5sum] = "988a4595a4a87dafb3c4870ea40e89b5"
-SRC_URI[sha256sum] = "357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7"
+SRC_URI[md5sum] = "15af85adc8ba83e6e996e13a55df4fb0"
+SRC_URI[sha256sum] = "7836cdaabd056ab4c9dd19cf0c791f11d980d0f6037542476034f2b7bdcf5d5b"
 
 inherit autotools pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
 
-# Works with either gtk+ or gtk3.
-WHICH_GTK = "gtk3"
-
 PACKAGECONFIG ?= "libpcap gnutls libnl libcap"
-PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK}  graphics", "", d)}"
+PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2  graphics", "", d)}"
+PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3  graphics", "", d)}"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
 
 PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap"