From dfdbd446d8b62f2ab6eaa5fbc20bdd1df18f5938 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 28 Jul 2018 23:32:38 +0200 Subject: [PATCH] libpcap: Update from 1.8.1 to 1.9.0 --- packages/libpcap/build.sh | 7 +++---- packages/libpcap/optimize.c.patch | 12 ------------ 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 packages/libpcap/optimize.c.patch diff --git a/packages/libpcap/build.sh b/packages/libpcap/build.sh index 67c4a650e..69f22407b 100644 --- a/packages/libpcap/build.sh +++ b/packages/libpcap/build.sh @@ -1,10 +1,9 @@ -TERMUX_PKG_HOMEPAGE=http://www.tcpdump.org/ +TERMUX_PKG_HOMEPAGE=https://www.tcpdump.org TERMUX_PKG_DESCRIPTION="Library for network traffic capture" -TERMUX_PKG_VERSION=1.8.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.9.0 +TERMUX_PKG_SHA256=b4f87ce52bba24111faf048d3f6450f116b42fe849bc1b997e494f605b3d2735 # The main tcpdump.org was down 2017-04-12, so we're using a mirror: TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libpcap-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=8360a05884fc03d1acb8ae40f92eabacf30ef18a4fb4662ac4bc50eab8c37eb0 # ac_cv_lib_nl_3_nl_socket_alloc=no to avoid linking against libnl: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_nl_3_nl_socket_alloc=no --with-pcap=linux" TERMUX_PKG_RM_AFTER_INSTALL="bin/pcap-config share/man/man1/pcap-config.1" diff --git a/packages/libpcap/optimize.c.patch b/packages/libpcap/optimize.c.patch deleted file mode 100644 index c68b3c87a..000000000 --- a/packages/libpcap/optimize.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../libpcap-1.8.1/optimize.c ./optimize.c ---- ../libpcap-1.8.1/optimize.c 2016-10-26 00:07:59.000000000 +0000 -+++ ./optimize.c 2017-07-06 23:14:39.055350334 +0000 -@@ -66,7 +66,7 @@ - /* - * So is the check for _MSC_VER done because MinGW has this? - */ --#if defined(_WIN32) && defined (_MSC_VER) -+#if (defined(_WIN32) && defined (_MSC_VER)) || defined(__ANDROID__) - /* - * ffs -- vax ffs instruction - *