Added gradm match description.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 153 insertions, 12 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 17b80f11a088..754e67bab5a0 100644
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/xtables-addons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.11 2010/10/25 08:18:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.12 2010/11/11 16:41:29 pva Exp $
+
+*xtables-addons-1.31 (11 Nov 2010)
+
+  11 Nov 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.31.ebuild:
+  Version bump. New grsecurity match for bug #339596, thank Anthony Basile
+  for pushing this upstream!
 
   25 Oct 2010; Sven Wegener <swegener@gentoo.org>
   xtables-addons-1.28-r1.ebuild, xtables-addons-1.30.ebuild:
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 0011085f78cb..2477f0cb621c 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xtables-addons-1.28.tar.xz 333440 RMD160 b9906c6d08870ed6e3c9e2843b16e22df2442092 SHA1 1c1a7e1be38ef1a756b504c90dd5cdffa696e2ac SHA256 3d06d6d1d8b8adeae7c9edee20ffd3f2a754eb0b187e8b9f397666e26a7dbbcc
 DIST xtables-addons-1.30.tar.xz 337148 RMD160 98e4390c1e8ca14164435067583b19c78f599585 SHA1 e33972bfd34f68212bf385431b6e7663f148fb3a SHA256 51ff5fda46acb3da55f338343fde53258b3604df6878e3da86506a58e5f8c831
+DIST xtables-addons-1.31.tar.xz 338224 RMD160 116771c966d01229bcbb2044323fe963a2ee7a01 SHA1 7afaa43bf9975a846a146a0335f6fa2644779b85 SHA256 030e16513775266c2832cbd96f3703d390e58b67892abe9ec72c3e1e16c9dd53
 EBUILD xtables-addons-1.28-r1.ebuild 4217 RMD160 66f7cd4480c4c6a46def346fced7953f2e542922 SHA1 ef4d9abfc4d0076db20643ca9532b8445d5aaf79 SHA256 a256edd7b88499b2744b695f53cdae2606b6bd9526a60ed98ab43c3d1ad4cdf0
 EBUILD xtables-addons-1.30.ebuild 4216 RMD160 bcee202364d165f6e4ce8d8a45f840a661061254 SHA1 1d7f9a25fe1b717b27d3b1d9bfc9833a636945af SHA256 4dbb015504f8276cfd174ecae2fe678cfbf3e65140b3e81fbfbf2e8151a6e42d
-MISC ChangeLog 2115 RMD160 891ae1115beee32f5499dcc35c7ee8cd6d91a50a SHA1 4e670f6b7cab43cb23566cb76ae8b42310ee1b3e SHA256 f3d36aeb5206378ab0bcae28db9440063cc0e73e05b7066e0e613e57d24ca313
+EBUILD xtables-addons-1.31.ebuild 4217 RMD160 8c0e171e37d0565bd43f247a00c01e3f331d3b80 SHA1 4a7f4cb2aff846cad1108662eccef5003e08b0c0 SHA256 a469298168ab1a41dd73dfa32aeccd731024ae50468d71edd46d39dd5c16c6d7
+MISC ChangeLog 2325 RMD160 ba79b723177b475908d51d4cff83169fbd2455a2 SHA1 bfba28292763b85c10c00463bceb8f943c15d9b7 SHA256 eb368ecb5523428a3d49097632e82e3f0d599376c3901fca227207cc97d05a71
 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzFPXYACgkQI1lqEGTUzyRbkgCgxuu4tvMUHpoDXFbDAN++gr7Y
-+98AoLvUvUBolgz1R6rS34Nx1iK/P18U
-=767k
------END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/xtables-addons-1.31.ebuild b/net-firewall/xtables-addons/xtables-addons-1.31.ebuild
new file mode 100644
index 000000000000..00b3bdac7286
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.31.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2010 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.1 2010/11/11 16:41:29 pva 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="virtual/modutils
+	>=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-2.6.22"
+
+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 '{}' '+'
+}