net/xtables-addons: update to version 1.31. this series of updates closes #8369

git-svn-id: svn://svn.openwrt.org/openwrt/packages@24433 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-12-10 16:24:35 +00:00
parent e49a3d613f
commit dea52d6d4e
3 changed files with 26 additions and 6 deletions

View File

@ -9,16 +9,19 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons
PKG_VERSION:=1.29
PKG_VERSION:=1.31
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_MD5SUM:=acfc41b5065706143e4a0570de458781
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_MD5SUM:=97ac895a67df67c28def98763023d51b
PKG_SOURCE_URL:=@SF/xtables-addons
PKG_BUILD_DEPENDS:=iptables
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=libtool
PKG_REMOVE_FILES:=aclocal.m4 autoconf/ltmain.sh
include $(INCLUDE_DIR)/package.mk
define Package/xtables-addons
@ -103,7 +106,7 @@ $(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,47,+kmod-ipt-compat-xt
$(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,46,))
$(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,46,+kmod-ipt-compat-xtables))
$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,46,+kmod-ipt-compat-xtables))
$(eval $(call BuildTemplate,tee,TEE,xt_TEE,xt_TEE,46,+kmod-ipt-compat-xtables))
#$(eval $(call BuildTemplate,tee,TEE,xt_TEE,xt_TEE,46,+kmod-ipt-compat-xtables))
$(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,46,))
$(eval $(call BuildTemplate,rawpost,RAWPOST,,iptable_rawpost,46,+kmod-ipt-compat-xtables))
$(eval $(call BuildTemplate,rawnat,RAWNAT,xt_RAWDNAT xt_RAWSNAT,xt_RAWNAT,46,+kmod-ipt-compat-xtables))

View File

@ -2,8 +2,8 @@
Makefile.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- xtables-addons-1.29.orig/Makefile.in
+++ xtables-addons-1.29/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -754,8 +754,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:

View File

@ -0,0 +1,17 @@
--- a/configure.ac
+++ b/configure.ac
@@ -56,14 +56,6 @@ krel="${krel#*.}";
kminor="${krel%%.*}";
krel="${krel#*.}";
kmicro="${krel%%.*}";
-if test "$kmicro" = "$krel"; then
- kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36")
- kstable=0;
-else
- kmicro="$(($kmicro+0))";
- kstable="${krel#*.}";
- kstable="$(($kstable+0))";
-fi;
if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
echo "WARNING: Version detection did not succeed. Continue at own luck.";
else