tcpdump: update to 4.9.3
This commit is contained in:
parent
7467976fb7
commit
fda6d9993b
|
@ -1,10 +1,9 @@
|
|||
TERMUX_PKG_HOMEPAGE=https://www.tcpdump.org/
|
||||
TERMUX_PKG_DESCRIPTION="A powerful command-line packet analyzer"
|
||||
TERMUX_PKG_LICENSE="BSD 3-Clause"
|
||||
TERMUX_PKG_VERSION=4.9.2
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_VERSION=4.9.3
|
||||
TERMUX_PKG_SRCURL=https://www.tcpdump.org/release/tcpdump-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79
|
||||
TERMUX_PKG_SHA256=2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_linux_vers=3.4"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="bin/tcpdump.${TERMUX_PKG_VERSION}"
|
||||
TERMUX_PKG_DEPENDS="openssl, libpcap"
|
||||
|
|
|
@ -0,0 +1,88 @@
|
|||
--- ../configure.orig 2019-10-24 10:43:06.176633836 +0200
|
||||
+++ ./configure 2019-10-24 10:53:21.301377723 +0200
|
||||
@@ -3402,8 +3402,8 @@
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
else
|
||||
- V_INCLS="$V_INCLS -I/usr/local/include"
|
||||
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
||||
+ V_INCLS="$V_INCLS -I@TERMUX_PREFIX@/local/include"
|
||||
+ LDFLAGS="$LDFLAGS -L@TERMUX_PREFIX@/local/lib"
|
||||
|
||||
case "$host_os" in
|
||||
|
||||
@@ -4962,7 +4962,7 @@
|
||||
$EGREP "yes" >/dev/null 2>&1; then :
|
||||
ipv6type=$i;
|
||||
ipv6lib=inet6;
|
||||
- ipv6libdir=/usr/local/v6/lib;
|
||||
+ ipv6libdir=@TERMUX_PREFIX@/local/v6/lib;
|
||||
ipv6trylibc=yes
|
||||
fi
|
||||
rm -f conftest*
|
||||
@@ -4984,7 +4984,7 @@
|
||||
|
||||
;;
|
||||
linux-libinet6)
|
||||
- if test -d /usr/inet6 -o -f /usr/include/netinet/ip6.h; then
|
||||
+ if test -d /usr/inet6 -o -f @TERMUX_PREFIX@/include/netinet/ip6.h; then
|
||||
ipv6type=$i
|
||||
ipv6lib=inet6
|
||||
ipv6libdir=/usr/inet6/lib
|
||||
@@ -5004,7 +5004,7 @@
|
||||
$EGREP "yes" >/dev/null 2>&1; then :
|
||||
ipv6type=$i;
|
||||
ipv6lib=inet6;
|
||||
- ipv6libdir=/usr/local/v6/lib
|
||||
+ ipv6libdir=@TERMUX_PREFIX@/local/v6/lib
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
@@ -5012,7 +5012,7 @@
|
||||
v6d)
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
-#include </usr/local/v6/include/sys/v6config.h>
|
||||
+#include <@TERMUX_PREFIX@/local/v6/include/sys/v6config.h>
|
||||
#ifdef __V6D__
|
||||
yes
|
||||
#endif
|
||||
@@ -5021,8 +5021,8 @@
|
||||
$EGREP "yes" >/dev/null 2>&1; then :
|
||||
ipv6type=$i;
|
||||
ipv6lib=v6;
|
||||
- ipv6libdir=/usr/local/v6/lib;
|
||||
- CFLAGS="-I/usr/local/v6/include $CFLAGS"
|
||||
+ ipv6libdir=@TERMUX_PREFIX@/local/v6/lib;
|
||||
+ CFLAGS="-I@TERMUX_PREFIX@/local/v6/include $CFLAGS"
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
@@ -5039,7 +5039,7 @@
|
||||
$EGREP "yes" >/dev/null 2>&1; then :
|
||||
ipv6type=$i;
|
||||
ipv6lib=inet6;
|
||||
- ipv6libdir=/usr/local/v6/lib
|
||||
+ ipv6libdir=@TERMUX_PREFIX@/local/v6/lib
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
@@ -5586,12 +5586,12 @@
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extraneous pcap header directories" >&5
|
||||
$as_echo_n "checking for extraneous pcap header directories... " >&6; }
|
||||
- if test \( ! -r /usr/local/include/pcap.h \) -a \
|
||||
- \( ! -r /usr/include/pcap.h \); then
|
||||
- if test -r /usr/local/include/pcap/pcap.h; then
|
||||
- d="/usr/local/include/pcap"
|
||||
- elif test -r /usr/include/pcap/pcap.h; then
|
||||
- d="/usr/include/pcap"
|
||||
+ if test \( ! -r @TERMUX_PREFIX@/local/include/pcap.h \) -a \
|
||||
+ \( ! -r @TERMUX_PREFIX@/include/pcap.h \); then
|
||||
+ if test -r @TERMUX_PREFIX@/local/include/pcap/pcap.h; then
|
||||
+ d="@TERMUX_PREFIX@/local/include/pcap"
|
||||
+ elif test -r @TERMUX_PREFIX@/include/pcap/pcap.h; then
|
||||
+ d="@TERMUX_PREFIX@/include/pcap"
|
||||
fi
|
||||
fi
|
||||
if test -z "$d" ; then
|
Loading…
Reference in New Issue