community/wireshark: move from main

3 files changed, 179 insertions, 0 deletions

diff --git a/community/wireshark/APKBUILD b/community/wireshark/APKBUILD
new file mode 100644
index 0000000000..a183109f87
--- /dev/null
+++ b/community/wireshark/APKBUILD
@@ -0,0 +1,110 @@
+# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
+# Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=wireshark
+pkgver=2.2.6
+pkgrel=0
+pkgdesc="A network protocol analyzer - GTK version"
+url="http://www.wireshark.org"
+arch="all"
+license="GPL2+"
+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 libressl-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
+        fix-androiddump.patch
+        "
+
+builddir="$srcdir"/$pkgname-$pkgver
+
+# security fixes:
+#   2.2.5-r0:
+#   - CVE-2017-6467
+#   - CVE-2017-6468
+#   - CVE-2017-6469
+#   - CVE-2017-6470
+#   - CVE-2017-6471
+#   - CVE-2017-6472
+#   - CVE-2017-6473
+#   - CVE-2017-6474
+#   2.2.4-r1:
+#   - CVE-2017-6014
+#   2.0.5-r0:
+#   - CVE-2016-6505
+#   - CVE-2016-6506
+#   - CVE-2016-6508
+#   - CVE-2016-6509
+#   - CVE-2016-6510
+#   - CVE-2016-6511
+#   - CVE-2016-6512
+#   - CVE-2016-6513
+
+prepare() {
+	cd "$builddir"
+	for i in $source; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
+
+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 \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
+}
+
+common() {
+	local i
+	pkgdesc="network protoccol analyzer - common files"
+	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/
+	# move all bins except wireshark
+	for i in "$pkgdir"/usr/bin/*; do
+		case "$i" in
+			*/tshark|*/wireshark|*-gtk) continue;;
+		esac
+		mv "$i" "$subpkgdir"/usr/bin/
+	done
+}
+
+tshark() {
+	pkgdesc="network protoccol analyzer - console version"
+	install -d "$subpkgdir"/usr/bin
+	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="d373254801b2d9ae248ff45be09ac36e1916b832430b8f57271421cbd2113c1ffa914ef23c7a1e704d8d5f666f0d4de5bcd9ef9d3801686a35511a5f2a230f3f  wireshark-2.2.6.tar.bz2
+d462e3289c1350a9f712a21d2d1973977e5dd7989f7beff4b71498551174458f572a23f267c83552f088466cb9d2721df2b2eb807514db6ad1e0877dbc87fc6d  fix-androiddump.patch"
diff --git a/community/wireshark/fix-androiddump.patch b/community/wireshark/fix-androiddump.patch
new file mode 100644
index 0000000000..dbb72b8608
--- /dev/null
+++ b/community/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>
diff --git a/community/wireshark/wireshark-0013-dirent-symbols-clash.patch b/community/wireshark/wireshark-0013-dirent-symbols-clash.patch
new file mode 100644
index 0000000000..3bef19b9ea
--- /dev/null
+++ b/community/wireshark/wireshark-0013-dirent-symbols-clash.patch
@@ -0,0 +1,58 @@
+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);