Subject: [alpine-aports] git patch: AL_edge - wireshark - security upgr to 2.2.2 - fix 6480

From: Sergey Lukin <[email-masked]>
Date: Mon, 28 Nov 2016 13:19:13 +0200

From 4270b7dc3659cea74297e3fde49308f5b23ab9e4 Mon Sep 17 00:00:00 2001
From: Linux User <[email-masked]>
Date: Mon, 28 Nov 2016 11:12:35 +0000
Subject: [PATCH] main/wireshark: security upgrade to 2.2.2. Fixes: #6480
 (CVE-2016-7957, CVE-2016-7958, CVE-2016-9372, CVE-2016-9374, CVE-2016-9376,
 CVE-2016-9373, CVE-2016-9375)

---
 main/wireshark/APKBUILD              | 16 ++++++++++------
 main/wireshark/fix-androiddump.patch | 11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 main/wireshark/fix-androiddump.patch

diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index c62b0c3..71778b5 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jeremy Thomerson <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=wireshark
-pkgver=2.2.0
-pkgrel=1
+pkgver=2.2.2
+pkgrel=0
 pkgdesc="A network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 arch="all"
@@ -14,7 +14,8 @@ makedepends="bison flex perl glib glib-dev libpcap-dev libcap-dev
 	libnl3-dev qt5-qtbase-dev qt5-qttools-dev bash"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk $pkgname-common tshark"
-source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2"
+source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2
+        fix-androiddump.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -92,6 +93,9 @@ gtk() {
 	mv "$pkgdir"/usr/bin/wireshark-gtk "$subpkgdir"/usr/bin/
 }
 
-md5sums="c7de0997f74934f25b456846cf75cb81  wireshark-2.2.0.tar.bz2"
-sha256sums="a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104  wireshark-2.2.0.tar.bz2"
-sha512sums="03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326  wireshark-2.2.0.tar.bz2"
+md5sums="88bb55bcbc5249fee10bcea332a4fece  wireshark-2.2.2.tar.bz2
+38a681230ccab441e64d1fc6f52858c4  fix-androiddump.patch"
+sha256sums="f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3  wireshark-2.2.2.tar.bz2
+21aaa55e6b4bb9144146e8e3284512d2c5ee5deee8921b66a513b819b57d8b01  fix-androiddump.patch"
+sha512sums="7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0  wireshark-2.2.2.tar.bz2
+d462e3289c1350a9f712a21d2d1973977e5dd7989f7beff4b71498551174458f572a23f267c83552f088466cb9d2721df2b2eb807514db6ad1e0877dbc87fc6d  fix-androiddump.patch"
diff --git a/main/wireshark/fix-androiddump.patch b/main/wireshark/fix-androiddump.patch
new file mode 100644
index 0000000..dbb72b8
--- /dev/null
+++ b/main/wireshark/fix-androiddump.patch
@@ -0,0 +1,11 @@
+diff -ru wireshark-2.2.2.orig/extcap/androiddump.c wireshark-2.2.2/extcap/androiddump.c
+--- wireshark-2.2.2.orig/extcap/androiddump.c	2016-11-28 09:55:43.000000000 +0000
++++ wireshark-2.2.2/extcap/androiddump.c	2016-11-28 09:56:30.683553877 +0000
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <time.h>
++#include <sys/time.h>
+ 
+ #ifdef HAVE_NETINET_IN_H
+ #    include <netinet/in.h>
-- 
2.10.2