summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-06-03 18:32:14 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-06-03 18:32:14 (EDT)
commitb84218d4bb0c53fb4e45dfb2c73899ccb5ef51c1 (patch)
tree1f9f2a6376b4d365900f61263bb7057dc4598536
parent8f87c16164764212311b4f61428ed870b30fa5af (diff)
Add patch to fix fakeroot on BusyBox.
-rw-r--r--patches/01_hardcode-shell-and-hide-getopt-error.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/01_hardcode-shell-and-hide-getopt-error.patch b/patches/01_hardcode-shell-and-hide-getopt-error.patch
new file mode 100644
index 0000000..a91f2ef
--- /dev/null
+++ b/patches/01_hardcode-shell-and-hide-getopt-error.patch
@@ -0,0 +1,27 @@
+From: "P. J. McDermott" <pjm@nac.net>
+Description: Hardcode shell interpreter and hide BusyBox getopt error
+ When building fakeroot on a GNU system, configure sets SHELL to /bin/bash. The
+ resulting fakeroot script then can't be run on ProteanOS without manually
+ executing the correct shell interpreter.
+ .
+ BusyBox's getopt applet doesn't recognize the "--version" option, so fakeroot
+ ends up printing BusyBox's long error message.
+
+diff -Naur src/scripts/fakeroot.in src.orig/scripts/fakeroot.in
+--- src/scripts/fakeroot.in 2013-06-03 18:25:46.040882928 -0400
++++ src.orig/scripts/fakeroot.in 2011-11-30 23:00:36.000000000 -0500
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!@SHELL@
+
+ # This script first starts faked (the daemon), and then it will run
+ # the requested program with fake root privileges.
+@@ -43,7 +43,7 @@
+
+ libfound=no
+
+-GETOPTEST=`getopt --version 2>/dev/null`
++GETOPTEST=`getopt --version`
+ case $GETOPTEST in
+ getopt*) # GNU getopt
+ FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"`