From b37aa3b18792a83b9efc0d3ef13d5bd7e5474113 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Wed, 22 May 2019 21:55:05 +0200
Subject: [PATCH] tshark: fix compilation error

Now fails with grammar.c / lemon error
---
 root-packages/tshark/FindDOXYGEN.cmake.patch | 18 ++++++++++++++++++
 root-packages/tshark/build.sh                |  7 +++----
 root-packages/tshark/ws_pipe.c.patch         | 11 +++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 root-packages/tshark/FindDOXYGEN.cmake.patch
 create mode 100644 root-packages/tshark/ws_pipe.c.patch

diff --git a/root-packages/tshark/FindDOXYGEN.cmake.patch b/root-packages/tshark/FindDOXYGEN.cmake.patch
new file mode 100644
index 000000000..901bb7cf8
--- /dev/null
+++ b/root-packages/tshark/FindDOXYGEN.cmake.patch
@@ -0,0 +1,18 @@
+--- ../FindDOXYGEN.cmake.orig	2019-05-22 15:34:43.639814214 +0200
++++ ./cmake/modules/FindDOXYGEN.cmake	2019-05-22 15:55:29.567993099 +0200
+@@ -13,15 +13,6 @@
+     /sbin
+ )
+ 
+-# We set various paths in doxygen.cfg via configure_file(). These are
+-# native system paths which aren't compatible with Cygwin's Doxygen.
+-string(TOLOWER ${DOXYGEN_EXECUTABLE} _de_lower)
+-if(${_de_lower} MATCHES "cyg")
+-	set(_ignore_reason "Cygwin Doxygen found at ${DOXYGEN_EXECUTABLE}. Ignoring.")
+-	message(STATUS ${_ignore_reason})
+-	set(DOXYGEN_EXECUTABLE DOXYGEN_EXECUTABLE-NOTFOUND CACHE FILEPATH ${_ignore_reason} FORCE)
+-endif()
+-
+ include( FindPackageHandleStandardArgs )
+ find_package_handle_standard_args( DOXYGEN DEFAULT_MSG DOXYGEN_EXECUTABLE )
+ 
diff --git a/root-packages/tshark/build.sh b/root-packages/tshark/build.sh
index 83278fbba..a74211c5c 100644
--- a/root-packages/tshark/build.sh
+++ b/root-packages/tshark/build.sh
@@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.wireshark.org/
 TERMUX_PKG_DESCRIPTION="Network protocol analyzer and sniffer"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Auxilus @Auxilus"
-TERMUX_PKG_VERSION=3.0.0
+TERMUX_PKG_VERSION=3.0.1
 TERMUX_PKG_SRCURL=https://www.wireshark.org/download/src/all-versions/wireshark-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e
+TERMUX_PKG_SHA256=86864c3d0f6c2311992a98d8ea7dfd429097fe62dae2e5516e1a2f6bef2ac08c
 TERMUX_PKG_DEPENDS="glib, libgpg-error, libgcrypt, libnl, libpcap, libgnutls, openssl, libiconv"
-# Needed by pkg-config (since they are dependenies for libgnutls and glib)
-TERMUX_PKG_BUILD_DEPENDS="pcre-dev, libnettle-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_wireshark=OFF
 -DENABLE_LUA=OFF
+-DHAVE_LINUX_IF_BONDING_H=1
 "
diff --git a/root-packages/tshark/ws_pipe.c.patch b/root-packages/tshark/ws_pipe.c.patch
new file mode 100644
index 000000000..49d88c365
--- /dev/null
+++ b/root-packages/tshark/ws_pipe.c.patch
@@ -0,0 +1,11 @@
+--- ../ws_pipe.c.orig	2019-05-22 16:09:41.223921507 +0200
++++ ./wsutil/ws_pipe.c	2019-05-22 16:10:12.694633273 +0200
+@@ -108,7 +108,7 @@
+         close(dir_fd);
+     } else {
+         /* Slow fallback in case /proc is not mounted */
+-        for (int fd = STDERR_FILENO + 1; fd < getdtablesize(); fd++) {
++        for (int fd = STDERR_FILENO + 1; fd < sysconf(_SC_OPEN_MAX); fd++) {
+             fcntl(fd, F_SETFD, FD_CLOEXEC);
+         }
+     }