From 505583b27b81095cbd6749a850c43ab701b6fbde Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 17 Nov 2016 07:48:02 +0000 Subject: [PATCH 1/2] wireshark: update to 2.2.2. Fixes CVE-2016-9372, CVE-2016-9374, CVE-2016-9376, CVE-2016-9373, CVE-2016-9375 --- srcpkgs/wireshark/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index bc7400aa7f9..12bb148415e 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,7 +1,7 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.2.1 -revision=2 +version=2.2.2 +revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua --with-krb5 --with-gtk3=yes --without-portaudio CC_FOR_BUILD=cc" @@ -16,7 +16,7 @@ license="GPL-2" # XXX ovh is blocked (repo4.voidlinux.eu can't download this). distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" #distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -checksum=900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 +checksum=f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 system_groups="wireshark" subpackages="libwireshark libwireshark-devel wireshark-gtk" From abcd4248c81763d6c6d7a8267b2eeb007fc64e2b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 17 Nov 2016 08:16:10 +0000 Subject: [PATCH 2/2] wireshark: fix musl build --- srcpkgs/wireshark/patches/musl.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/wireshark/patches/musl.patch diff --git a/srcpkgs/wireshark/patches/musl.patch b/srcpkgs/wireshark/patches/musl.patch new file mode 100644 index 00000000000..737c2ffb49d --- /dev/null +++ b/srcpkgs/wireshark/patches/musl.patch @@ -0,0 +1,10 @@ +--- extcap/androiddump.c.orig 2016-11-17 08:07:21.000000000 +0000 ++++ extcap/androiddump.c 2016-11-17 08:07:36.590061623 +0000 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_NETINET_IN_H + # include