package/network/utils/iptables/patches/030-no-libnfnetlink.patch

   1 Index: iptables-1.4.19.1/configure
   2 ===================================================================
   3 --- iptables-1.4.19.1.orig/configure    2013-05-29 16:37:33.176674855 +0200
   4 +++ iptables-1.4.19.1/configure 2013-05-29 16:37:33.168674855 +0200
   5 @@ -12198,77 +12198,7 @@
   6         fi
   7  fi
   8
   9 -pkg_failed=no
  10 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
  11 -$as_echo_n "checking for libnfnetlink... " >&6; }
  12 -
  13 -if test -n "$libnfnetlink_CFLAGS"; then
  14 -    pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
  15 - elif test -n "$PKG_CONFIG"; then
  16 -    if test -n "$PKG_CONFIG" && \
  17 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  18 -  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  19 -  ac_status=$?
  20 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  21 -  test $ac_status = 0; }; then
  22 -  pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
  23 -                     test "x$?" != "x0" && pkg_failed=yes
  24 -else
  25 -  pkg_failed=yes
  26 -fi
  27 - else
  28 -    pkg_failed=untried
  29 -fi
  30 -if test -n "$libnfnetlink_LIBS"; then
  31 -    pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
  32 - elif test -n "$PKG_CONFIG"; then
  33 -    if test -n "$PKG_CONFIG" && \
  34 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  35 -  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  36 -  ac_status=$?
  37 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  38 -  test $ac_status = 0; }; then
  39 -  pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null`
  40 -                     test "x$?" != "x0" && pkg_failed=yes
  41 -else
  42 -  pkg_failed=yes
  43 -fi
  44 - else
  45 -    pkg_failed=untried
  46 -fi
  47 -
  48 -
  49 -
  50 -if test $pkg_failed = yes; then
  51 -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  52 -$as_echo "no" >&6; }
  53 -
  54 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  55 -        _pkg_short_errors_supported=yes
  56 -else
  57 -        _pkg_short_errors_supported=no
  58 -fi
  59 -        if test $_pkg_short_errors_supported = yes; then
  60 -               libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
  61 -        else
  62 -               libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
  63 -        fi
  64 -       # Put the nasty error message in config.log where it belongs
  65 -       echo "$libnfnetlink_PKG_ERRORS" >&5
  66 -
  67 -       nfnetlink=0
  68 -elif test $pkg_failed = untried; then
  69 -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  70 -$as_echo "no" >&6; }
  71 -       nfnetlink=0
  72 -else
  73 -       libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS
  74 -       libnfnetlink_LIBS=$pkg_cv_libnfnetlink_LIBS
  75 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  76 -$as_echo "yes" >&6; }
  77 -       nfnetlink=1
  78 -fi
  79 - if test "$nfnetlink" = 1; then
  80 +if false; then
  81    HAVE_LIBNFNETLINK_TRUE=
  82    HAVE_LIBNFNETLINK_FALSE='#'
  83  else
  84 Index: iptables-1.4.19.1/configure.ac
  85 ===================================================================
  86 --- iptables-1.4.19.1.orig/configure.ac 2013-05-29 16:37:33.176674855 +0200
  87 +++ iptables-1.4.19.1/configure.ac      2013-05-29 16:37:33.168674855 +0200
  88 @@ -93,9 +93,7 @@
  89  AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"])
  90  AM_CONDITIONAL([ENABLE_BPFC], [test "$enable_bpfc" = "yes"])
  91
  92 -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
  93 -       [nfnetlink=1], [nfnetlink=0])
  94 -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
  95 +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false])
  96
  97  regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
  98         -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \