diff options
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/xtables-addons/ChangeLog | 12 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch | 32 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch | 13 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild | 142 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.30.ebuild | 142 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.31.ebuild | 142 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.37.ebuild | 4 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.38.ebuild (renamed from net-firewall/xtables-addons/xtables-addons-1.36.ebuild) | 30 |
8 files changed, 37 insertions, 480 deletions
diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog index 82af5a77fd27..e3e3bb8f3f13 100644 --- a/net-firewall/xtables-addons/ChangeLog +++ b/net-firewall/xtables-addons/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-firewall/xtables-addons # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.22 2011/09/15 09:56:50 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.23 2011/09/19 13:06:30 pva Exp $ + +*xtables-addons-1.38 (19 Sep 2011) + + 19 Sep 2011; Peter Volkov <pva@gentoo.org> -xtables-addons-1.28-r1.ebuild, + -xtables-addons-1.30.ebuild, -xtables-addons-1.31.ebuild, + -xtables-addons-1.36.ebuild, -files/xtables-addons-1.36-absolute-M.patch, + -files/xtables-addons-1.36-kernel-detection.patch, + xtables-addons-1.37.ebuild, +xtables-addons-1.38.ebuild: + Mark 1.37 stable, bug #381611. Version bump, ignore in-kernel CHECKSUM + module. Drop old. 15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> xtables-addons-1.37.ebuild: diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch b/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch deleted file mode 100644 index 3dd3b1f86631..000000000000 --- a/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 146395e3dac0015850d0fd61f9db206499161e1c Mon Sep 17 00:00:00 2001 -From: Peter Volkov <pva@gentoo.org> -Date: Mon, 20 Jun 2011 10:50:29 +0400 -Subject: [PATCH] build: use absolute path for M= - -Use absolute path for M during checking kernelrelease. This will force -temporary objects be built in the current directory and not $kbuilddir -as it happenes with the current kernel scripts/Kbuild.include, where -e.g. try-run target called with TMPOUT=M=. while at the time it is -called pwd=$kbuilddir. This should fix sandbox violation (modification -of files outside build dir) in Gentoo: -https://bugs.gentoo.org/show_bug.cgi?id=371997 ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0660eea..6361e48 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ - - if test -n "$kbuilddir"; then - AC_MSG_CHECKING([kernel version that we will build against]) -- krel="$(make -sC "$kbuilddir" M=. kernelrelease)"; -+ krel="$(make -sC "$kbuilddir" M="$(pwd)" kernelrelease)"; - kmajor="${krel%%[[^0-9]]*}"; - kmajor="$(($kmajor+0))"; - krel="${krel:${#kmajor}}"; --- -1.7.3.4 - diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch b/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch deleted file mode 100644 index 0d6098eabf81..000000000000 --- a/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ff0e171..0660eea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,7 +65,7 @@ if test -n "$kbuilddir"; then - echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; - elif test "$kmajor" -eq 3; then - :; -- elif test "$kmajor" -eq 2 -a "$kminor" -ge 29; then -+ elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 29; then - :; - else - echo "WARNING: That kernel version is not supported."; diff --git a/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild b/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild deleted file mode 100644 index e97530dd9c24..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild,v 1.6 2011/04/28 18:54:21 ulm Exp $ - -EAPI="3" - -inherit eutils linux-mod multilib - -DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="modules" - -MODULES="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude checksum chaos account" - -for mod in ${MODULES}; do - IUSE="${IUSE} xtables_addons_${mod}" -done - -DEPEND=">=net-firewall/iptables-1.4.3" - -RDEPEND="${DEPEND} - xtables_addons_ipset? ( !net-firewall/ipset ) - xtables_addons_geoip? ( virtual/perl-Getopt-Long - dev-perl/Text-CSV_XS )" - -DEPEND="${DEPEND} - virtual/linux-sources" - -pkg_setup() { - if use modules; then - get_version - check_modules_supported - # CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22 - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK" - linux-mod_pkg_setup - - if ! linux_chkconfig_present IPV6; then - SKIP_IPV6_MODULES="ip6table_rawpost" - fi - fi -} - -# Helper for maintainer: cheks if all possible MODULES are listed. -XA_qa_check() { - local all_modules - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig") - if [[ ${all_modules} != ${MODULES} ]]; then - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild." - ewarn "Please, update MODULES in ebuild." - ewarn "'${all_modules}'" - fi -} - -# Is there any use flag set? -XA_has_something_to_build() { - local mod - for mod in ${MODULES}; do - use xtables_addons_${mod} && return - done - - eerror "All modules are disabled. What do you want me to build?" - eerror "Please, set XTABLES_ADDONS to any combination of" - eerror "${MODULES}" - die "All modules are disabled." -} - -# Parse Kbuid files and generates list of sources -XA_get_module_name() { - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument." - local mod objdir build_mod sources_list - mod=${1} - objdir=${S}/extensions - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig") - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - - if [[ -d ${S}/extensions/${sources_list} ]]; then - objdir=${S}/extensions/${sources_list} - sources_list=$(sed -n "/^obj-m/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - fi - for mod_src in ${sources_list}; do - has ${mod_src} ${SKIP_IPV6_MODULES} || \ - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})" - done -} - -src_prepare() { - XA_qa_check - XA_has_something_to_build - - local mod module_name - if use modules; then - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" - fi - for mod in ${MODULES}; do - if use xtables_addons_${mod}; then - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die - if use modules; then - for module_name in $(XA_get_module_name ${mod}); do - MODULE_NAMES+=" ${module_name}" - done - fi - else - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die - fi - done - - sed -e 's/depmod -a/true/' -i Makefile.in || die - sed -e '/^all-local:/{s: modules::}' \ - -e '/^install-exec-local:/{s: modules_install::}' \ - -i extensions/Makefile.in || die - - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in -} - -src_configure() { - unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources - export KBUILD_EXTMOD=${S} # Avoid build in /usr/src/linux #250407 - econf --prefix="${EPREFIX}/" \ - --libexecdir="${EPREFIX}/$(get_libdir)/" \ - --with-kbuild="${KV_DIR}" -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 || die - use modules && BUILD_TARGETS="modules" linux-mod_src_compile -} - -src_install() { - emake DESTDIR="${D}" install || die - use modules && linux-mod_src_install - dodoc README doc/* || die - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-1.30.ebuild b/net-firewall/xtables-addons/xtables-addons-1.30.ebuild deleted file mode 100644 index 35c1a386d246..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-1.30.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.30.ebuild,v 1.4 2011/04/28 18:54:21 ulm Exp $ - -EAPI="3" - -inherit eutils linux-mod multilib - -DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="modules" - -MODULES="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude checksum chaos account" - -for mod in ${MODULES}; do - IUSE="${IUSE} xtables_addons_${mod}" -done - -DEPEND=">=net-firewall/iptables-1.4.3" - -RDEPEND="${DEPEND} - xtables_addons_ipset? ( !net-firewall/ipset ) - xtables_addons_geoip? ( virtual/perl-Getopt-Long - dev-perl/Text-CSV_XS )" - -DEPEND="${DEPEND} - virtual/linux-sources" - -pkg_setup() { - if use modules; then - get_version - check_modules_supported - # CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22 - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK" - linux-mod_pkg_setup - - if ! linux_chkconfig_present IPV6; then - SKIP_IPV6_MODULES="ip6table_rawpost" - fi - fi -} - -# Helper for maintainer: cheks if all possible MODULES are listed. -XA_qa_check() { - local all_modules - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig") - if [[ ${all_modules} != ${MODULES} ]]; then - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild." - ewarn "Please, update MODULES in ebuild." - ewarn "'${all_modules}'" - fi -} - -# Is there any use flag set? -XA_has_something_to_build() { - local mod - for mod in ${MODULES}; do - use xtables_addons_${mod} && return - done - - eerror "All modules are disabled. What do you want me to build?" - eerror "Please, set XTABLES_ADDONS to any combination of" - eerror "${MODULES}" - die "All modules are disabled." -} - -# Parse Kbuid files and generates list of sources -XA_get_module_name() { - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument." - local mod objdir build_mod sources_list - mod=${1} - objdir=${S}/extensions - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig") - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - - if [[ -d ${S}/extensions/${sources_list} ]]; then - objdir=${S}/extensions/${sources_list} - sources_list=$(sed -n "/^obj-m/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - fi - for mod_src in ${sources_list}; do - has ${mod_src} ${SKIP_IPV6_MODULES} || \ - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})" - done -} - -src_prepare() { - XA_qa_check - XA_has_something_to_build - - local mod module_name - if use modules; then - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" - fi - for mod in ${MODULES}; do - if use xtables_addons_${mod}; then - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die - if use modules; then - for module_name in $(XA_get_module_name ${mod}); do - MODULE_NAMES+=" ${module_name}" - done - fi - else - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die - fi - done - - sed -e 's/depmod -a/true/' -i Makefile.in || die - sed -e '/^all-local:/{s: modules::}' \ - -e '/^install-exec-local:/{s: modules_install::}' \ - -i extensions/Makefile.in || die - - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in -} - -src_configure() { - unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources - export KBUILD_EXTMOD=${S} # Avoid build in /usr/src/linux #250407 - econf --prefix="${EPREFIX}/" \ - --libexecdir="${EPREFIX}/$(get_libdir)/" \ - --with-kbuild="${KV_DIR}" -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 || die - use modules && BUILD_TARGETS="modules" linux-mod_src_compile -} - -src_install() { - emake DESTDIR="${D}" install || die - use modules && linux-mod_src_install - dodoc README doc/* || die - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-1.31.ebuild b/net-firewall/xtables-addons/xtables-addons-1.31.ebuild deleted file mode 100644 index 3c0348e2f0e6..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-1.31.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.31.ebuild,v 1.5 2011/05/11 19:22:58 angelos Exp $ - -EAPI="3" - -inherit eutils linux-mod multilib - -DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="modules" - -MODULES="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude checksum chaos account" - -for mod in ${MODULES}; do - IUSE="${IUSE} xtables_addons_${mod}" -done - -DEPEND=">=net-firewall/iptables-1.4.3" - -RDEPEND="${DEPEND} - xtables_addons_ipset? ( !net-firewall/ipset ) - xtables_addons_geoip? ( virtual/perl-Getopt-Long - dev-perl/Text-CSV_XS )" - -DEPEND="${DEPEND} - virtual/linux-sources" - -pkg_setup() { - if use modules; then - get_version - check_modules_supported - # CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22 - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK" - linux-mod_pkg_setup - - if ! linux_chkconfig_present IPV6; then - SKIP_IPV6_MODULES="ip6table_rawpost" - fi - fi -} - -# Helper for maintainer: cheks if all possible MODULES are listed. -XA_qa_check() { - local all_modules - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig") - if [[ ${all_modules} != ${MODULES} ]]; then - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild." - ewarn "Please, update MODULES in ebuild." - ewarn "'${all_modules}'" - fi -} - -# Is there any use flag set? -XA_has_something_to_build() { - local mod - for mod in ${MODULES}; do - use xtables_addons_${mod} && return - done - - eerror "All modules are disabled. What do you want me to build?" - eerror "Please, set XTABLES_ADDONS to any combination of" - eerror "${MODULES}" - die "All modules are disabled." -} - -# Parse Kbuid files and generates list of sources -XA_get_module_name() { - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument." - local mod objdir build_mod sources_list - mod=${1} - objdir=${S}/extensions - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig") - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - - if [[ -d ${S}/extensions/${sources_list} ]]; then - objdir=${S}/extensions/${sources_list} - sources_list=$(sed -n "/^obj-m/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - fi - for mod_src in ${sources_list}; do - has ${mod_src} ${SKIP_IPV6_MODULES} || \ - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})" - done -} - -src_prepare() { - XA_qa_check - XA_has_something_to_build - - local mod module_name - if use modules; then - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" - fi - for mod in ${MODULES}; do - if use xtables_addons_${mod}; then - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die - if use modules; then - for module_name in $(XA_get_module_name ${mod}); do - MODULE_NAMES+=" ${module_name}" - done - fi - else - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die - fi - done - - sed -e 's/depmod -a/true/' -i Makefile.in || die - sed -e '/^all-local:/{s: modules::}' \ - -e '/^install-exec-local:/{s: modules_install::}' \ - -i extensions/Makefile.in || die - - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in -} - -src_configure() { - unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources - export KBUILD_EXTMOD=${S} # Avoid build in /usr/src/linux #250407 - econf --prefix="${EPREFIX}/" \ - --libexecdir="${EPREFIX}/$(get_libdir)/" \ - --with-kbuild="${KV_DIR}" -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 || die - use modules && BUILD_TARGETS="modules" linux-mod_src_compile -} - -src_install() { - emake DESTDIR="${D}" install || die - use modules && linux-mod_src_install - dodoc README doc/* || die - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild index a2b04bb4c2ce..f79c2734fe9a 100644 --- a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild,v 1.4 2011/09/15 09:56:50 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild,v 1.5 2011/09/19 13:06:30 pva Exp $ EAPI="4" inherit eutils linux-info linux-mod multilib @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="modules" REQUIRED_USE=" diff --git a/net-firewall/xtables-addons/xtables-addons-1.36.ebuild b/net-firewall/xtables-addons/xtables-addons-1.38.ebuild index 381f60e5a551..88af9bfaac8f 100644 --- a/net-firewall/xtables-addons/xtables-addons-1.36.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-1.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.36.ebuild,v 1.2 2011/06/20 08:26:05 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.38.ebuild,v 1.1 2011/09/19 13:06:30 pva Exp $ EAPI="4" inherit eutils linux-info linux-mod multilib autotools @@ -37,6 +37,26 @@ RDEPEND="${DEPEND} DEPEND="${DEPEND} virtual/linux-sources" +SKIP_MODULES="" + +# XA_kernel_check tee "2 6 26" +XA_check4internal_module() { + local mod=${1} + local version=${2} + local kconfigname=${3} + + if use xtables_addons_${mod} && kernel_is -gt ${version}; then + ewarn "${kconfigname} should be provided by the kernel. Skipping its build..." + if ! linux_chkconfig_present ${kconfigname}; then + ewarn "Please enable ${kconfigname} target in your kernel + configuration or disable checksum module in ${PN}." + fi + # SKIP_MODULES in case we need to disable building of everything + # like having this USE disabled + SKIP_MODULES+=" ${mod}" + fi +} + pkg_setup() { if use modules; then get_version @@ -54,6 +74,8 @@ pkg_setup() { die "${PN} with ipset requires kernel version >= 2.6.29" fi kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29" + XA_check4internal_module tee "2 6 35" NETFILTER_XT_TARGET_TEE + XA_check4internal_module checksum "2 6 36" NETFILTER_XT_TARGET_CHECKSUM fi } @@ -107,10 +129,6 @@ XA_get_module_name() { } src_prepare() { - epatch "${FILESDIR}/${P}-kernel-detection.patch" - epatch "${FILESDIR}/${P}-absolute-M.patch" - eautoreconf - XA_qa_check XA_has_something_to_build @@ -119,7 +137,7 @@ src_prepare() { MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" fi for mod in ${MODULES}; do - if use xtables_addons_${mod}; then + if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die if use modules; then for module_name in $(XA_get_module_name ${mod}); do |