summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-06-20 08:26:05 +0000
committerPeter Volkov <pva@gentoo.org>2011-06-20 08:26:05 +0000
commitcb8d18f168212ab1a936c11dcaa661b63073fc7d (patch)
treec2a9595aea61fa0b4101b325984512c8342facd0 /net-firewall/xtables-addons
parentx86 stable wrt bug #371763 (diff)
downloadhistorical-cb8d18f168212ab1a936c11dcaa661b63073fc7d.tar.gz
historical-cb8d18f168212ab1a936c11dcaa661b63073fc7d.tar.bz2
historical-cb8d18f168212ab1a936c11dcaa661b63073fc7d.zip
Fix sandbox violations reported by Marcin Mirosław in byg 371997.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/xtables-addons')
-rw-r--r--net-firewall/xtables-addons/ChangeLog7
-rw-r--r--net-firewall/xtables-addons/Manifest6
-rw-r--r--net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch32
-rw-r--r--net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch13
-rw-r--r--net-firewall/xtables-addons/xtables-addons-1.36.ebuild8
5 files changed, 61 insertions, 5 deletions
diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 6f22eb53446f..19d50b1079b7 100644
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,11 @@
# 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.17 2011/06/16 13:50:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.18 2011/06/20 08:26:05 pva Exp $
+
+ 20 Jun 2011; Peter Volkov <pva@gentoo.org> xtables-addons-1.36.ebuild,
+ +files/xtables-addons-1.36-absolute-M.patch,
+ +files/xtables-addons-1.36-kernel-detection.patch:
+ Fix sandbox violations reported by Marcin Mirosław in byg 371997.
*xtables-addons-1.36 (16 Jun 2011)
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 43d87cb342f6..200ff2f08e1e 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,3 +1,5 @@
+AUX xtables-addons-1.36-absolute-M.patch 1211 RMD160 4ccc5cee34ffc9f7f3533117bdbdc633e39fe5f4 SHA1 5b57f48b6f2e17591ebc4563dd39184bde2c6a57 SHA256 3ec317b4115ac86eae0c19f9a9a296c07d9ab1db33105feff10a11b750d03082
+AUX xtables-addons-1.36-kernel-detection.patch 476 RMD160 e949144870a630d8f590eb9879e7ad6101eab752 SHA1 d3c47ea269b7a7f416815ca13e8c0feffdc20449 SHA256 825c87dc5f42b234104cea06666524d47ca3ab8ac8ed2821870059d9c633d2ed
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
@@ -5,6 +7,6 @@ DIST xtables-addons-1.36.tar.xz 423580 RMD160 e7e14935d41c93df184ffa20c02d6c1592
EBUILD xtables-addons-1.28-r1.ebuild 4186 RMD160 b362f70b738c4680e0ca7dd8f1ae2584767028bf SHA1 9cfa66cf0489fa6e51c3fce5513748858d858d4f SHA256 3cd3f236209d0c6d0f5fb7204e8f95ff3f876e97ad4889298071fd9e097de472
EBUILD xtables-addons-1.30.ebuild 4185 RMD160 67edabf5a465e90de16c8cc9664016de9c26d03c SHA1 9b7463c6debd14998ed3831156566830f0102a80 SHA256 780cb489b912d5ebe699a4f5d74da4f7924ab962abed31a94a65cc38b3f78036
EBUILD xtables-addons-1.31.ebuild 4193 RMD160 62d7312a966c4d91acb7c36e4c809c8c61b0e091 SHA1 9fb25977596054d7441f106930cb5784715294e0 SHA256 762ff274a169d37ac5d77bd456bc2f9ad247e06ccfa350c918c5a337efa69388
-EBUILD xtables-addons-1.36.ebuild 4812 RMD160 3b10f68d5aa1e898ec87576fc40d0fef73ebd531 SHA1 88495a38a753c4cf874ed01f8bdf1243986facc9 SHA256 affc37c5366208c4a90deffcbed91f9cb19df0988af639ecc5ba3c35bc337d46
-MISC ChangeLog 3094 RMD160 00855d7728278aa9e96124953766169e35b6b893 SHA1 7f2bd8aa457143805402f0f6de56d2752b7dfd8b SHA256 be17ce31e9f905ad48d5ccdb81aa85cd2dc5763ba883ef7a80f1cea7b5ab1baf
+EBUILD xtables-addons-1.36.ebuild 4930 RMD160 c964eb1409a539cae9baf697cc054f991465d7ad SHA1 7cfa731fe771458c4a98f7e06ea3bc5e91848f26 SHA256 84707e6e1bfc79a55e93461a35731cab4b2150be6d1d5667e73671824bae68fb
+MISC ChangeLog 3337 RMD160 50110995d76993d8d74201501c4b134985e7dbbb SHA1 3b078148532558e6e486e70a3dfb5553d65e82bc SHA256 293687c1fd615e60c66a58b3c0095d6403329897192404c8289f2df47546d46c
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 000000000000..3dd3b1f86631
--- /dev/null
+++ b/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..0d6098eabf81
--- /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.36.ebuild b/net-firewall/xtables-addons/xtables-addons-1.36.ebuild
index 015baa75581d..381f60e5a551 100644
--- a/net-firewall/xtables-addons/xtables-addons-1.36.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.36.ebuild,v 1.1 2011/06/16 13:50:06 pva Exp $
+# $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 $
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/"
@@ -107,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