bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] tcpdump: update to 4.1.1

Browse Source 
Corrected patch (last try) to update tcpdump to version 4.1.1.

Signed-off-by: Christoph König <christoph.koenig@ikt.uni-hannover.de>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@27091 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2011-06-02 14:24:18 +00:00
parent c04f49102b
commit cb6d6001bc
6 changed files with 107 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
net/tcpdump/patches/002-remove_static_libpcap_check.patch
View File

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -9280,26 +9280,6 @@ echo "${ECHO_T}Using $pfopen" >&6; }
@@ -9440,28 +9440,6 @@ echo "${ECHO_T}Using $pfopen" >&6; }
LIBS="$LIBS $pfopen"
fi
fi
@ -9,9 +9,10 @@
- libpcap=FAIL
- lastdir=FAIL
- places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
- egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
- egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
- for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
- basedir=`echo $dir | sed -e 's/[ab][0-9]*$//'`
- basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
- sed -e 's/-PRE-GIT$//' `
- if test $lastdir = $basedir ; then
- continue;
- fi
@ -24,30 +25,32 @@
- if test $libpcap = FAIL ; then
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
{ echo "$as_me:$LINENO: checking for main in -lpcap" >&5
echo $ECHO_N "checking for main in -lpcap... $ECHO_C" >&6; }
if test "${ac_cv_lib_pcap_main+set}" = set; then
@@ -9364,40 +9344,6 @@ fi
-
#
# Look for pcap-config.
#
@@ -9580,40 +9558,6 @@ fi
echo "$as_me: error: see the INSTALL doc for more info" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: checking for extraneous pcap header directories" >&5
fi
- { echo "$as_me:$LINENO: checking for extraneous pcap header directories" >&5
-echo $ECHO_N "checking for extraneous pcap header directories... $ECHO_C" >&6; }
- if test \( ! -r /usr/local/include/pcap.h \) -a \
- 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 /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"
- fi
- fi
- fi
- if test -z "$d" ; then
- { echo "$as_me:$LINENO: result: not found" >&5
- if test -z "$d" ; then
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
- else
- V_INCLS="-I$d $V_INCLS"
- { echo "$as_me:$LINENO: result: found -- -I$d added" >&5
- else
- V_INCLS="-I$d $V_INCLS"
- { echo "$as_me:$LINENO: result: found -- -I$d added" >&5
-echo "${ECHO_T}found -- -I$d added" >&6; }
- fi
- fi
- else
- V_PCAPDEP=$libpcap
@ -64,7 +67,6 @@
- fi
- { echo "$as_me:$LINENO: result: $libpcap" >&5
-echo "${ECHO_T}$libpcap" >&6; }
- fi
LIBS="$libpcap $LIBS"
case "$host_os" in
# Extract the first word of "pcap-config", so it can be a program name with args.
set dummy pcap-config; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5