tcpdump: update to current upstream version 4.5.1

[openwrt.git] / package / network / utils / tcpdump / patches / 002-remove_static_libpcap_check.patch

diff --git a/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch b/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
index 8ab54aa..c8bdf14 100644 (file)
--- a/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
+++ b/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
@@ -1,11 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -7130,28 +7130,6 @@ echo "${ECHO_T}Using $pfopen" >&6; }
+@@ -5813,28 +5813,6 @@ $as_echo "Using $pfopen" >&6; }
                    LIBS="$LIBS $pfopen"
            fi
      fi
--    { echo "$as_me:$LINENO: checking for local pcap library" >&5
--echo $ECHO_N "checking for local pcap library... $ECHO_C" >&6; }
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
+-$as_echo_n "checking for local pcap library... " >&6; }
 -    libpcap=FAIL
 -    lastdir=FAIL
 -    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
@@ -23,23 +23,21 @@
 -                          fi
 -    done
 -    if test $libpcap = FAIL ; then
--          { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
 -
            #
            # Look for pcap-config.
            #
-@@ -7335,45 +7313,6 @@ if test $ac_cv_lib_pcap_main = yes; then
+@@ -5989,41 +5967,6 @@ if test "x$ac_cv_lib_pcap_main" = xyes;
    libpcap="-lpcap"
  fi
  
 -              if test $libpcap = FAIL ; then
--                  { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5
--echo "$as_me: error: see the INSTALL doc for more info" >&2;}
--   { (exit 1); exit 1; }; }
+-                  as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 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; }
+-                                                                                                                                                                                                                                                                                                                              { $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
@@ -49,12 +47,12 @@
 -                  fi
 -              fi
 -              if test -z "$d" ; then
--                  { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
+-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
 -              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; }
+-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found -- -I$d added" >&5
+-$as_echo "found -- -I$d added" >&6; }
 -              fi
 -          fi
 -    else
@@ -66,12 +64,10 @@
 -          elif test -r $places/pcap.h; then
 -                  V_INCLS="-I$places $V_INCLS"
 -          else
--                    { { echo "$as_me:$LINENO: error: cannot find pcap.h" >&5
--echo "$as_me: error: cannot find pcap.h" >&2;}
--   { (exit see INSTALL); exit see INSTALL; }; }
+-                    as_fn_error see INSTALL "cannot find pcap.h" "$LINENO" 5
 -          fi
--          { echo "$as_me:$LINENO: result: $libpcap" >&5
--echo "${ECHO_T}$libpcap" >&6; }
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpcap" >&5
+-$as_echo "$libpcap" >&6; }
            # 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5