patches/01_hardcode-shell-and-hide-getopt-error.patch: Drop

2 files changed, 3 insertions, 28 deletions

diff --git a/changelog b/changelog
index 60c6f5c..a6e63ee 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ fakeroot (1.23-1) trunk
 
   * New upstream version.
   * Update Maintainer and Homepage fields.
+  * patches/01_hardcode-shell-and-hide-getopt-error.patch: Drop.  This patch
+    enabled bootstrapping from another OS distribution and fixed a getopt
+    issue (now changed upstream).
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Fri, 31 May 2019 17:59:56 -0400
 
diff --git a/patches/01_hardcode-shell-and-hide-getopt-error.patch b/patches/01_hardcode-shell-and-hide-getopt-error.patch
deleted file mode 100644
index 78751b9..0000000
--- a/patches/01_hardcode-shell-and-hide-getopt-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: "P. J. McDermott" <pj@pehjota.net>
-Subject: 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.orig/scripts/fakeroot.in src/scripts/fakeroot.in
---- src.orig/scripts/fakeroot.in	2011-11-30 23:00:36.000000000 -0500
-+++ src/scripts/fakeroot.in	2013-06-03 18:25:46.040882928 -0400
-@@ -1,4 +1,4 @@
--#!@SHELL@
-+#!/bin/sh
- 
- # 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`
-+GETOPTEST=`getopt --version 2>/dev/null`
- 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 "$@"`