community/wireshark: upgrade to 3.0.1

The GTK subpackages has been dropped since upstream has dropped GTK. UI is now Qt only.

Fixes the following CVEs:
- CVE-2019-10897
- CVE-2019-10898
- CVE-2019-10900
- CVE-2019-10902

3 files changed, 25 insertions, 96 deletions

diff --git a/community/wireshark/APKBUILD b/community/wireshark/APKBUILD
index fbb3469783..e940fa6151 100644
--- a/community/wireshark/APKBUILD
+++ b/community/wireshark/APKBUILD
@@ -3,23 +3,28 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
-pkgver=2.6.8
+pkgver=3.0.1
 pkgrel=0
-pkgdesc="A network protocol analyzer - GTK version"
+pkgdesc="A network protocol analyzer"
 url="https://www.wireshark.org"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-makedepends="bison flex perl-dev glib glib-dev libpcap-dev libcap-dev
-	gtk+3.0-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev
-	libnl3-dev qt5-qtbase-dev qt5-qttools-dev lua5.2-dev bash portaudio-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk $pkgname-common tshark"
+makedepends="bash bison c-ares-dev cmake flex glib glib-dev gnutls-dev
+	libcap-dev libgcrypt-dev libnl3-dev libpcap-dev
+	lua5.2-dev pcre-dev perl-dev portaudio-dev qt5-qtbase-dev 
+	qt5-qtmultimedia-dev qt5-qtsvg-dev qt5-qttools-dev"
+checkdepends="py3-pytest py3-pytest-xdist"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
 source="https://www.wireshark.org/download/src/$pkgname-$pkgver.tar.xz
 	fix-udpdump.patch
-        "
-builddir="$srcdir"/$pkgname-$pkgver
+	"
 
 # secfixes:
+#   3.0.1-r0:
+#     - CVE-2019-10897
+#     - CVE-2019-10898
+#     - CVE-2019-10900
+#     - CVE-2019-10902
 #   2.6.8-r0:
 #     - CVE-2019-10894
 #     - CVE-2019-10895
@@ -175,32 +180,19 @@ builddir="$srcdir"/$pkgname-$pkgver
 #     - CVE-2016-6513
 
 build() {
-	cd "$builddir"
-	# configure script searches for uic and uic-qt4 but not uic-qt5
-	# we set path so it finds 'uic'
-	export PATH="$PATH:/usr/lib/qt5/bin"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-ssl \
-		--with-gnutls \
-		--with-qt=5 \
-		--with-gtk=3 \
-		--with-lua
+	cmake CMakeLists.txt \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_GNUTLS=ON \
+		-DENABLE_LUA=ON
 	make
 }
 
 check() {
-	cd "$builddir"
-	make check
+	make test-programs
+	pytest test/
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
@@ -210,11 +202,11 @@ common() {
 	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share \
 		"$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/share/wireshark "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib*/* "$subpkgdir"/usr/lib/
 	# move all bins except wireshark
 	for i in "$pkgdir"/usr/bin/*; do
 		case "$i" in
-			*/tshark|*/wireshark|*-gtk) continue;;
+			*/tshark|*/wireshark) continue;;
 		esac
 		mv "$i" "$subpkgdir"/usr/bin/
 	done
@@ -226,11 +218,6 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-gtk() {
-	pkgdesc="wireshark - GTK GUI"
-	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/wireshark-gtk "$subpkgdir"/usr/bin/
-}
 
-sha512sums="2066fb17e835ca4ac8f3242644b4ed5c23066796e776b87250cc2e1035fbe59d500019c5621ef61e838dc103c2ca0c57a834c89afe1e30b0efad6b9309158b43  wireshark-2.6.8.tar.xz
-951677dd125b1e36b351cc87a98e8b8d0391d184c7695594dd4270334d86ada1dff5f14cd960da9c5d5d26fc801c42f0219b2db6269f3c526c841c7940d2f369  fix-udpdump.patch"
+sha512sums="59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d  wireshark-3.0.1.tar.xz
+287159576be76fc8afbce450a53f969bbd519321e038c812b96857ca08c352052dbbfaa9208d54ed30d7a0c9ca4192b83c8865de60562c4490d99d75c61ede0b  fix-udpdump.patch"
diff --git a/community/wireshark/fix-udpdump.patch b/community/wireshark/fix-udpdump.patch
index a75a7851ea..08d11d3eec 100644
--- a/community/wireshark/fix-udpdump.patch
+++ b/community/wireshark/fix-udpdump.patch
@@ -1,6 +1,6 @@
 --- a/extcap/udpdump.c
 +++ b/extcap/udpdump.c
-@@ -56,6 +56,10 @@
+@@ -50,6 +50,10 @@
  #include <wsutil/inet_addr.h>
  #include <wsutil/filesystem.h>
  
diff --git a/community/wireshark/wireshark-0013-dirent-symbols-clash.patch b/community/wireshark/wireshark-0013-dirent-symbols-clash.patch
deleted file mode 100644
index 3bef19b9ea..0000000000
--- a/community/wireshark/wireshark-0013-dirent-symbols-clash.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h
-index f023f62..d0d4651 100644
---- a/epan/dissectors/packet-gluster.h
-+++ b/epan/dissectors/packet-gluster.h
-@@ -356,15 +356,15 @@ enum gf_fop_procnum {
- 
- /* dir-entry types from libglusterfs/src/compat.h */
- enum gluster_entry_types {
--	DT_UNKNOWN = 0,
--	DT_FIFO = 1,
--	DT_CHR = 2,
--	DT_DIR = 4,
--	DT_BLK = 6,
--	DT_REG = 8,
--	DT_LNK = 10,
--	DT_SOCK = 12,
--	DT_WHT = 14
-+	GLUSTER_DT_UNKNOWN = 0,
-+	GLUSTER_DT_FIFO = 1,
-+	GLUSTER_DT_CHR = 2,
-+	GLUSTER_DT_DIR = 4,
-+	GLUSTER_DT_BLK = 6,
-+	GLUSTER_DT_REG = 8,
-+	GLUSTER_DT_LNK = 10,
-+	GLUSTER_DT_SOCK = 12,
-+	GLUSTER_DT_WHT = 14
- };
- 
- 
-diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
-index 5f18258..299e783 100644
---- a/epan/dissectors/packet-glusterfs.c
-+++ b/epan/dissectors/packet-glusterfs.c
-@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g
- 
- /* dir-entry types */
- static const value_string glusterfs_entry_type_names[] = {
--	{ DT_UNKNOWN, "DT_UNKNOWN" },
--	{ DT_FIFO,    "DT_FIFO" },
--	{ DT_CHR,     "DT_CHR" },
--	{ DT_DIR,     "DT_DIR" },
--	{ DT_BLK,     "DT_BLK" },
--	{ DT_REG,     "DT_REG" },
--	{ DT_LNK,     "DT_LNK" },
--	{ DT_SOCK,    "DT_SOCK" },
--	{ DT_WHT,     "DT_WHT" },
-+	{ GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
-+	{ GLUSTER_DT_FIFO,    "DT_FIFO" },
-+	{ GLUSTER_DT_CHR,     "DT_CHR" },
-+	{ GLUSTER_DT_DIR,     "DT_DIR" },
-+	{ GLUSTER_DT_BLK,     "DT_BLK" },
-+	{ GLUSTER_DT_REG,     "DT_REG" },
-+	{ GLUSTER_DT_LNK,     "DT_LNK" },
-+	{ GLUSTER_DT_SOCK,    "DT_SOCK" },
-+	{ GLUSTER_DT_WHT,     "DT_WHT" },
- 	{ 0, NULL }
- };
- static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);