diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-06-20 09:49:07 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-06-20 09:49:07 +0000 |
| commit | f03e29d45d02ca5b519029c0fa79bd5623531d92 (patch) | |
| tree | 0d8e4f9e767acd9b5aaa6efed7afc463fc5cc5ff | |
| parent | net-firewall/xtables-addons: Fix warning, and try to fix sandbox violation re... (diff) | |
| download | pva-f03e29d45d02ca5b519029c0fa79bd5623531d92.tar.gz pva-f03e29d45d02ca5b519029c0fa79bd5623531d92.tar.bz2 pva-f03e29d45d02ca5b519029c0fa79bd5623531d92.zip | |
net-firewall/xtables-addons: use upstream patch.
svn path=/; revision=499
| -rw-r--r-- | net-firewall/xtables-addons/Manifest | 2 | ||||
| -rw-r--r-- | net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch | 31 |
2 files changed, 14 insertions, 19 deletions
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest index 80aba37..5d27897 100644 --- a/net-firewall/xtables-addons/Manifest +++ b/net-firewall/xtables-addons/Manifest @@ -1,4 +1,4 @@ -AUX xtables-addons-1.36-absolute-M.patch 1154 RMD160 155e34d5b4291728dcc984924a8aed4c67b562d5 SHA1 f1e029ba718d3c4f06d0528090d1e2ff1a8ccbab SHA256 ac7758f8ad09d154e0bfb16d66983fc07b80fb4fdb9ca46221e92e52a265dba2 +AUX xtables-addons-1.36-absolute-M.patch 1055 RMD160 596e6fb2caa77af11ff663686a22fc749739904b SHA1 f88136c66fb60517caf76c8295b39c77305f16c7 SHA256 bf4db7c5667ea9a7a5cafeea2504f5a94881f30bf4c9f6b7a1ce1d47b56ab3d5 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 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 index e9513f0..95e2ee7 100644 --- 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 @@ -1,20 +1,18 @@ -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= +commit e84391ce665cef046967f796dd91026851d6bbf3 +Author: Peter Volkov <pva@gentoo.org> +Date: Mon Jun 20 10:50:29 2011 +0400 -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(-) + 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 diff --git a/configure.ac b/configure.ac -index 0660eea..6361e48 100644 +index 0660eea..14dae83 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ @@ -22,10 +20,7 @@ index 0660eea..6361e48 100644 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)"; ++ krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; kmajor="${krel%%[[^0-9]]*}"; kmajor="$(($kmajor+0))"; krel="${krel:${#kmajor}}"; --- -1.7.3.4 - |