diff options
| -rw-r--r-- | package/iptables/Makefile | 4 | ||||
| -rw-r--r-- | package/iptables/patches/030-no-libnfnetlink.patch | 44 |
2 files changed, 23 insertions, 25 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f9c96adbd..3c4a22ff8 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.4.8 +PKG_VERSION:=1.4.9 PKG_RELEASE:=1 -PKG_MD5SUM:=697ed89f37af4473a5f6349ba2700f2d +PKG_MD5SUM:=db1312f7ce5a4c11dc981a2ac76b26e8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ diff --git a/package/iptables/patches/030-no-libnfnetlink.patch b/package/iptables/patches/030-no-libnfnetlink.patch index 4ddea3a66..07bed666c 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 |