net-firewall/xtables-addons: Fix warning, and try to fix sandbox violation reported in bug 371997 by Marcin Mirosław.

svn path=/; revision=498

4 files changed, 62 insertions, 6 deletions

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 265eeab..80aba37 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,4 +1,6 @@
-DIST xtables-addons-1.35.tar.xz 420500 RMD160 9b0a2712ba6b3ca7e43b8e365470a9fd74bbefbe SHA1 53459b0ef10698327cd67b49691da3c1091b5ad8 SHA256 d57b40178e994e4c0e5d9eea16f3d387c253673011a7535f5b1c4abe9e2564be
-EBUILD xtables-addons-1.35.ebuild 4674 RMD160 d28efbe38240a1c2e76dabc919849335a8dd9a31 SHA1 0f0439148df109fe829f1e5dc9f050925ce1c528 SHA256 d33ace47c9fb7d2e8c4938270a365b3781b30da17f27d76971f4c54fad818212
+AUX xtables-addons-1.36-absolute-M.patch 1154 RMD160 155e34d5b4291728dcc984924a8aed4c67b562d5 SHA1 f1e029ba718d3c4f06d0528090d1e2ff1a8ccbab SHA256 ac7758f8ad09d154e0bfb16d66983fc07b80fb4fdb9ca46221e92e52a265dba2
+AUX xtables-addons-1.36-kernel-detection.patch 476 RMD160 e949144870a630d8f590eb9879e7ad6101eab752 SHA1 d3c47ea269b7a7f416815ca13e8c0feffdc20449 SHA256 825c87dc5f42b234104cea06666524d47ca3ab8ac8ed2821870059d9c633d2ed
+DIST xtables-addons-1.36.tar.xz 423580 RMD160 e7e14935d41c93df184ffa20c02d6c159285c982 SHA1 4e46d094353fe2fe11f6845ed8f3c72a2386b7ac SHA256 cfa2109c332f1c8b91cf64973e79a20dae6643da0c35b9d80c16ad2687bc21c4
+EBUILD xtables-addons-1.36.ebuild 4930 RMD160 27c6f0b344d07c47a84244dd8e19ad5e79af63fc SHA1 366f521aa839226058f9d7b60ff8b2c5304e267c SHA256 627caaaeee8f481582c9918f50fa809e8e44efb3f68844754b765cd23559013e
 MISC ChangeLog 2748 RMD160 100441045c3bb094f1a18a82973cef4ac403e8a6 SHA1 79384fd746cfc51c38d7f227b7968263fcb75d6c SHA256 b3c785341ee505931d61a269a09c02d5c5a901935bdb2cd95d44a967cbffb020
 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad
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
new file mode 100644
index 0000000..e9513f0
--- /dev/null
+++ b/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch
@@ -0,0 +1,31 @@
+From 1493c53e2c3ade2c3ba1f4ec706b6d2860db73c2 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 happened, e.g. in the current kernel scripts/Kbuild.include
+try-run target (it is called with TMPOUT=M=. and during call
+pwd=$kbuilddir). This should fix sandbox violation 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
new file mode 100644
index 0000000..0d6098e
--- /dev/null
+++ b/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch
@@ -0,0 +1,13 @@
+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.35.ebuild b/net-firewall/xtables-addons/xtables-addons-1.36.ebuild
index 6650c55..ddbdcbd 100644
--- a/net-firewall/xtables-addons/xtables-addons-1.35.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-1.36.ebuild
@@ -1,9 +1,9 @@
 # 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.3 2011/04/28 18:54:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.36.ebuild,v 1.1 2011/06/16 13:50:06 pva Exp $
 
 EAPI="4"
-inherit eutils linux-info linux-mod multilib
+inherit eutils linux-info linux-mod multilib autotools
 
 DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
 HOMEPAGE="http://xtables-addons.sourceforge.net/"
@@ -14,6 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="modules"
 
+REQUIRED_USE="
+	xtables_addons_ipset4? ( !xtables_addons_ipset6 )
+	xtables_addons_ipset6? ( !xtables_addons_ipset4 )"
+
 MODULES="quota2 psd pknock lscan length2 ipv4options ipset6 ipset4 ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
 
 for mod in ${MODULES}; do
@@ -24,7 +28,9 @@ DEPEND=">=net-firewall/iptables-1.4.3"
 
 RDEPEND="${DEPEND}
 	xtables_addons_ipset4? ( !net-firewall/ipset )
-	xtables_addons_ipset6? ( !net-firewall/ipset )
+	xtables_addons_ipset6? (
+		!net-firewall/ipset
+		net-libs/libmnl )
 	xtables_addons_geoip? ( virtual/perl-Getopt-Long
 		dev-perl/Text-CSV_XS )"
 
@@ -101,6 +107,10 @@ 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
 
@@ -138,7 +148,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
 	use modules && BUILD_TARGETS="modules" linux-mod_src_compile
 }