Changeset 30282


Ignore:
Timestamp:
2012-02-05T17:36:06+01:00 (4 years ago)
Author:
jow
Message:

[packages_10.03.2] xtables-addons: merge r29345, r29644, r29988

Location:
branches/packages_10.03.2/net/xtables-addons
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/xtables-addons/Makefile

    r26060 r30282  
    11# 
    2 # Copyright (C) 2009-2010 OpenWrt.org 
     2# Copyright (C) 2009-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=xtables-addons 
    12 PKG_VERSION:=1.31 
     12PKG_VERSION:=1.41 
    1313PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
    16 PKG_MD5SUM:=97ac895a67df67c28def98763023d51b 
     16PKG_MD5SUM:=a8de5e5e5823aefcbab210159f122564 
    1717PKG_SOURCE_URL:=@SF/xtables-addons 
    1818PKG_BUILD_DEPENDS:=iptables 
     
    2020PKG_BUILD_PARALLEL:=1 
    2121 
    22 PKG_FIXUP:=libtool 
     22PKG_FIXUP:=autoreconf 
    2323 
    2424include $(INCLUDE_DIR)/package.mk 
     
    107107$(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,46,+kmod-ipt-compat-xtables)) 
    108108$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,46,+kmod-ipt-compat-xtables)) 
    109 #$(eval $(call BuildTemplate,tee,TEE,xt_TEE,xt_TEE,46,+kmod-ipt-compat-xtables)) 
    110109$(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,46,)) 
    111 $(eval $(call BuildTemplate,rawpost,RAWPOST,,iptable_rawpost,46,+kmod-ipt-compat-xtables)) 
     110$(eval $(call BuildTemplate,rawpost,RAWPOST,,iptable_rawpost $(if $(CONFIG_IPV6),ip6table_rawpost),50,+kmod-ipt-compat-xtables)) 
    112111$(eval $(call BuildTemplate,rawnat,RAWNAT,xt_RAWDNAT xt_RAWSNAT,xt_RAWNAT,46,+kmod-ipt-compat-xtables)) 
     112$(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,46,+kmod-ipt-conntrack-extra)) 
  • branches/packages_10.03.2/net/xtables-addons/patches/001-no_depmod.patch

    r24456 r30282  
    33 1 file changed, 1 insertion(+), 2 deletions(-) 
    44 
    5 --- a/Makefile.in 
    6 +++ b/Makefile.in 
    7 @@ -754,8 +754,7 @@ install-dvi: install-dvi-recursive 
    8  install-dvi-am: 
    9   
    10  install-exec-am: 
    11 -       @$(NORMAL_INSTALL) 
    12 -       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook 
    13 + 
    14  install-html: install-html-recursive 
    15   
    16  install-html-am: 
    17 @@ -827,7 +826,6 @@ xtables-addons.8: FORCE 
     5--- a/Makefile.am 
     6+++ b/Makefile.am 
     7@@ -11,9 +11,6 @@ FORCE: 
     8 xtables-addons.8: FORCE 
    189        ${MAKE} -f Makefile.mans all; 
    1910  
    20  install-exec-hook: 
     11-install-exec-hook: 
    2112-       depmod -a || :; 
    22   
     13- 
    2314 config.status: Makefile.iptrules.in 
    2415  
     16 tmpdir := $(shell mktemp -dtu) 
  • branches/packages_10.03.2/net/xtables-addons/patches/002-fix-kernel-version-detection.patch

    r24920 r30282  
    11--- a/configure 
    22+++ b/configure 
    3 @@ -10811,7 +10811,7 @@ if grep -q "CentOS release 5\." /etc/red 
    4  fi; 
    5  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5 
     3@@ -11693,7 +11693,7 @@ regular_CFLAGS="-Wall -Waggregate-return 
     4 if test -n "$kbuilddir"; then 
     5        { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5 
    66 $as_echo_n "checking kernel version that we will build against... " >&6; } 
    7 -krel="$(make -sC ${kbuilddir} kernelrelease)"; 
    8 +krel="$(make -sC ${kbuilddir} kernelversion)"; 
    9  krel="${krel%%-*}"; 
    10  kmajor="${krel%%.*}"; 
    11  krel="${krel#*.}"; 
     7-       krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; 
     8+       krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)"; 
     9        kmajor="${krel%%[^0-9]*}"; 
     10        kmajor="$(($kmajor+0))"; 
     11        krel="${krel:${#kmajor}}"; 
    1212--- a/configure.ac 
    1313+++ b/configure.ac 
    14 @@ -49,7 +49,7 @@ if grep -q "CentOS release 5\." /etc/red 
    15         echo "WARNING: This distribution's shipped kernel is not supported."; 
    16  fi; 
    17  AC_MSG_CHECKING([kernel version that we will build against]) 
    18 -krel="$(make -sC ${kbuilddir} kernelrelease)"; 
    19 +krel="$(make -sC ${kbuilddir} kernelversion)"; 
    20  krel="${krel%%-*}"; 
    21  kmajor="${krel%%.*}"; 
    22  krel="${krel#*.}"; 
     14@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return 
     15  
     16 if test -n "$kbuilddir"; then 
     17        AC_MSG_CHECKING([kernel version that we will build against]) 
     18-       krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; 
     19+       krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)"; 
     20        kmajor="${krel%%[[^0-9]]*}"; 
     21        kmajor="$(($kmajor+0))"; 
     22        krel="${krel:${#kmajor}}"; 
  • branches/packages_10.03.2/net/xtables-addons/patches/003-redundant-bracket.patch

    r25033 r30282  
    1 --- a/configure.ac      2010-11-05 19:42:22.000000000 +0100 
    2 +++ b/configure.ac      2011-01-08 17:36:12.000000000 +0100 
    3 @@ -28,7 +28,7 @@ 
     1--- a/configure.ac 
     2+++ b/configure.ac 
     3@@ -31,7 +31,7 @@ PKG_CHECK_MODULES([libmnl], [libmnl >= 1 
    44  
    55 AC_ARG_WITH([xtlibdir], 
  • branches/packages_10.03.2/net/xtables-addons/patches/100-add-rtsp-conntrack.patch

    r29644 r30282  
    13161316--- a/extensions/Kbuild 
    13171317+++ b/extensions/Kbuild 
    1318 @@ -33,6 +33,7 @@ obj-${build_lscan}       += xt_lscan.o 
     1318@@ -34,6 +34,7 @@ obj-${build_lscan}       += xt_lscan.o 
    13191319 obj-${build_pknock}      += pknock/ 
    13201320 obj-${build_psd}         += xt_psd.o 
     
    13261326--- a/mconfig 
    13271327+++ b/mconfig 
    1328 @@ -26,3 +26,4 @@ build_lscan=m 
     1328@@ -27,3 +27,4 @@ build_lscan=m 
    13291329 build_pknock=m 
    13301330 build_psd=m 
Note: See TracChangeset for help on using the changeset viewer.