qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 16:01:05 +02:00
Code

package/iptables: upgrade to iptables version 1.4.9

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22482 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-08-04 13:29:07 +00:00
parent 952d7bfd01
commit 28ca232782
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/iptables/Makefile
View File

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables PKG_NAME:=iptables
PKG_VERSION:=1.4.8 PKG_VERSION:=1.4.9
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=697ed89f37af4473a5f6349ba2700f2d PKG_MD5SUM:=db1312f7ce5a4c11dc981a2ac76b26e8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \

44
package/iptables/patches/030-no-libnfnetlink.patch
View File

@ -1,18 +1,17 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -10853,77 +10853,7 @@ $as_echo "no" >&6; } @@ -10864,75 +10864,7 @@ $as_echo "no" >&6; }
fi
fi fi
-pkg_failed=no -pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
-$as_echo_n "checking for libnfnetlink... " >&6; } -$as_echo_n "checking for libnfnetlink... " >&6; }
- -
-if test -n "$PKG_CONFIG"; then -if test -n "$libnfnetlink_CFLAGS"; then
- if test -n "$libnfnetlink_CFLAGS"; then - pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
- pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS" - elif test -n "$PKG_CONFIG"; then
- else - if test -n "$PKG_CONFIG" && \
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5 - { { $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 - ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
- ac_status=$? - ac_status=$?
@ -22,15 +21,13 @@
-else -else
- pkg_failed=yes - pkg_failed=yes
-fi -fi
- fi - else
-else - pkg_failed=untried
- pkg_failed=untried
-fi -fi
-if test -n "$PKG_CONFIG"; then -if test -n "$libnfnetlink_LIBS"; then
- if test -n "$libnfnetlink_LIBS"; then - pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
- pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS" - elif test -n "$PKG_CONFIG"; then
- else - if test -n "$PKG_CONFIG" && \
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5 - { { $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 - ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
- ac_status=$? - ac_status=$?
@ -40,14 +37,15 @@
-else -else
- pkg_failed=yes - pkg_failed=yes
-fi -fi
- fi - else
-else - pkg_failed=untried
- pkg_failed=untried
-fi -fi
- -
- -
- -
-if test $pkg_failed = yes; then -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 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes - _pkg_short_errors_supported=yes
@ -55,17 +53,17 @@
- _pkg_short_errors_supported=no - _pkg_short_errors_supported=no
-fi -fi
- if test $_pkg_short_errors_supported = yes; then - 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 - 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 - fi
- # Put the nasty error message in config.log where it belongs - # Put the nasty error message in config.log where it belongs
- echo "$libnfnetlink_PKG_ERRORS" >&5 - echo "$libnfnetlink_PKG_ERRORS" >&5
- -
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - nfnetlink=0
-$as_echo "no" >&6; }
- nfnetlink=0
-elif test $pkg_failed = untried; then -elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- nfnetlink=0 - nfnetlink=0
-else -else
- libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS - libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS