summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2007-08-01 11:08:15 +0000
committerFabian Groffen <grobian@gentoo.org>2007-08-01 11:08:15 +0000
commit01264420cb5db28019764402cd0933e146796dd7 (patch)
tree2fb0cb565468264f08470901298ca3ff8b87428f /gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
parentmerged from overlay 67:159, eprefixified (it actually works!) (diff)
downloadprefix-01264420cb5db28019764402cd0933e146796dd7.tar.gz
prefix-01264420cb5db28019764402cd0933e146796dd7.tar.bz2
prefix-01264420cb5db28019764402cd0933e146796dd7.zip
add patch to avoid sandbox violation/issue because the real installation root (not using the DESTDIR) is used, this patch makes this check go inside the DESTDIR instead
(Portage 2.2.00.7521-prefix/SVN/Linux 2.6.20-1.2925.fc6 AMD Athlon(tm) 64 X2 Dual Core Processor 3800+) svn path=/prefix-overlay/; revision=177
Diffstat (limited to 'gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch')
-rw-r--r--gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
new file mode 100644
index 0000000..407a514
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
@@ -0,0 +1,21 @@
+* grobian@gentoo.org: because we use sandbox this check fails (cannot
+ write outside the DESTDIR. Allowing to write in the
+ GNUSTEP_INSTALLATION_DIR means our sandbox is useless, since then
+ everything can be written, so prefer to just check the DESTDIR
+ location instead.
+
+--- Master/rules.make
++++ Master/rules.make
+@@ -107,9 +107,9 @@
+
+ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
+ internal-check-install-permissions:
+- @if [ -d "$(GNUSTEP_INSTALLATION_DIR)" \
+- -a ! -w "$(GNUSTEP_INSTALLATION_DIR)" ]; then \
+- echo "*ERROR*: the software is configured to install itself into $(GNUSTEP_INSTALLATION_DIR)"; \
++ @if [ -d "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" \
++ -a ! -w "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" ]; then \
++ echo "*ERROR*: the software is configured to install itself into $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)"; \
+ echo "but you do not have permissions to write in that directory:";\
+ echo "Aborting installation."; \
+ echo ""; \