summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-06-18 20:47:47 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-06-18 20:47:47 (EDT)
commit530e578f9354e3b064a3bc7e2a7a5fc3a4975063 (patch)
tree0c68424063c6026f07905ec87a5f7d6565833bb0
parent8583253992d8568dd58cb9d5c249fe71df8cc4bc (diff)
patches: Fix error on BusyBox without FEATURE_GETOPT_LONG
-rw-r--r--changelog6
-rw-r--r--patches/02_specifically-check-for-getopt-long-options.patch15
2 files changed, 21 insertions, 0 deletions
diff --git a/changelog b/changelog
index 47da0d1..8aff3de 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+fakeroot (1.23-2) trunk
+
+ * Fix /usr/bin/fakeroot to run on BusyBox without FEATURE_GETOPT_LONG.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com> Tue, 18 Jun 2019 20:46:00 -0400
+
fakeroot (1.23-1) trunk
* New upstream version.
diff --git a/patches/02_specifically-check-for-getopt-long-options.patch b/patches/02_specifically-check-for-getopt-long-options.patch
new file mode 100644
index 0000000..bd3130d
--- /dev/null
+++ b/patches/02_specifically-check-for-getopt-long-options.patch
@@ -0,0 +1,15 @@
+Author: Patrick McDermott <patrick.mcdermott@libiquity.com>
+Subject: Specifically check for getopt long options
+
+diff -Naurp src.orig/scripts/fakeroot.in src/scripts/fakeroot.in
+--- src.orig/scripts/fakeroot.in 2018-07-01 15:01:34.000000000 -0400
++++ src/scripts/fakeroot.in 2019-06-18 20:43:28.874732245 -0400
+@@ -43,7 +43,7 @@ export FAKED_MODE
+
+ libfound=no
+
+-GETOPTTEST=`getopt -T`
++GETOPTTEST=`getopt -l test -T >/dev/null 2>&1`
+ if test "$?" -eq 4; then # 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 "$@"`
+ else