aboutsummaryrefslogtreecommitdiffstats
path: root/package/iptables/patches
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-08-04 13:29:07 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-08-04 13:29:07 +0000
commit8ea976509c6c0cbc88c266eeabe163acd11990a8 (patch)
tree26531fe1138c13599514b43019eb8edd2ff14f15 /package/iptables/patches
parent5b8cbd5d5ae7a435ae22d1d8eea559523fe8926d (diff)
downloadupstream-8ea976509c6c0cbc88c266eeabe163acd11990a8.tar.gz
upstream-8ea976509c6c0cbc88c266eeabe163acd11990a8.tar.bz2
upstream-8ea976509c6c0cbc88c266eeabe163acd11990a8.zip
package/iptables: upgrade to iptables version 1.4.9
SVN-Revision: 22482
Diffstat (limited to 'package/iptables/patches')
-rw-r--r--package/iptables/patches/030-no-libnfnetlink.patch44
1 files changed, 21 insertions, 23 deletions
diff --git a/package/iptables/patches/030-no-libnfnetlink.patch b/package/iptables/patches/030-no-libnfnetlink.patch
index 4ddea3a663..07bed666ca 100644
--- a/package/iptables/patches/030-no-libnfnetlink.patch
+++ b/package/iptables/patches/030-no-libnfnetlink.patch
@@ -1,18 +1,17 @@
--- a/configure
+++ b/configure
-@@ -10853,77 +10853,7 @@ $as_echo "no" >&6; }
-
+@@ -10864,75 +10864,7 @@ $as_echo "no" >&6; }
+ fi
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
-$as_echo_n "checking for libnfnetlink... " >&6; }
-
--if test -n "$PKG_CONFIG"; then
-- if test -n "$libnfnetlink_CFLAGS"; then
-- pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
-- else
-- if test -n "$PKG_CONFIG" && \
+-if test -n "$libnfnetlink_CFLAGS"; then
+- pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
- ac_status=$?
@@ -22,15 +21,13 @@
-else
- pkg_failed=yes
-fi
-- fi
--else
-- pkg_failed=untried
+- else
+- pkg_failed=untried
-fi
--if test -n "$PKG_CONFIG"; then
-- if test -n "$libnfnetlink_LIBS"; then
-- pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
-- else
-- if test -n "$PKG_CONFIG" && \
+-if test -n "$libnfnetlink_LIBS"; then
+- pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
- ac_status=$?
@@ -40,14 +37,15 @@
-else
- pkg_failed=yes
-fi
-- fi
--else
-- pkg_failed=untried
+- else
+- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
@@ -55,17 +53,17 @@
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnfnetlink >= 1.0"`
+- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnfnetlink >= 1.0" 2>&1`
- else
-- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnfnetlink >= 1.0"`
+- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnfnetlink >= 1.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$libnfnetlink_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- nfnetlink=0
+- nfnetlink=0
-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
- nfnetlink=0
-else
- libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS