From 789a42170cb7a557f92742afefad0026f414174b Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 7 Jun 2020 01:15:22 +0300
Subject: [PATCH] debianutils: remove add-shell & remove-shell utilities

Termux doesn't control allowed shells through $PREFIX/etc/shells, so
these utilities are useless.
---
 packages/busybox/build.sh               |  1 -
 packages/debianutils/add-shell.patch    | 12 ------------
 packages/debianutils/build.sh           | 11 ++++++++++-
 packages/debianutils/remove-shell.patch | 12 ------------
 4 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 packages/debianutils/add-shell.patch
 delete mode 100644 packages/debianutils/remove-shell.patch

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 7d0099430..959a1db0b 100644
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -53,7 +53,6 @@ termux_step_post_make_install() {
 	#
 	#  * runsv, runsvdir, sv - for things like in https://github.com/termux/termux-packages/pull/3460.
 	#  * tcpsvd - required for ftpd applet.
-	#  * which - replaced by debianutils, but still good to have in bootstrap.
 	#
 	rm -Rf $TERMUX_PREFIX/bin/applets
 	mkdir -p $TERMUX_PREFIX/bin/applets
diff --git a/packages/debianutils/add-shell.patch b/packages/debianutils/add-shell.patch
deleted file mode 100644
index dc316b4a0..000000000
--- a/packages/debianutils/add-shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../debianutils-4.4/add-shell ./add-shell
---- ../debianutils-4.4/add-shell	2013-07-28 03:30:26.000000000 +0200
-+++ ./add-shell	2014-05-30 16:07:00.000000000 +0200
-@@ -6,7 +6,7 @@
- 	exit 1
- fi
- 
--file=/etc/shells
-+file=@TERMUX_PREFIX@/etc/shells
- # I want this to be GUARANTEED to be on the same filesystem as $file
- tmpfile=${file}.tmp
- 
diff --git a/packages/debianutils/build.sh b/packages/debianutils/build.sh
index fbef9fc0f..d5bf8a588 100644
--- a/packages/debianutils/build.sh
+++ b/packages/debianutils/build.sh
@@ -2,6 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/debianutils
 TERMUX_PKG_DESCRIPTION="Small utilities which are used primarily by the installation scripts of Debian packages"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=4.11
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151
-TERMUX_PKG_RM_AFTER_INSTALL="bin/installkernel share/man/man8/installkernel.8"
+
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/add-shell
+bin/installkernel
+bin/remove-shell
+share/man/man8/add-shell.8
+share/man/man8/installkernel.8
+share/man/man8/remove-shell.8
+"
diff --git a/packages/debianutils/remove-shell.patch b/packages/debianutils/remove-shell.patch
deleted file mode 100644
index ed10f4e31..000000000
--- a/packages/debianutils/remove-shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../debianutils-4.4/remove-shell ./remove-shell
---- ../debianutils-4.4/remove-shell	2013-07-28 03:30:26.000000000 +0200
-+++ ./remove-shell	2014-05-30 16:38:24.000000000 +0200
-@@ -6,7 +6,7 @@
- 	exit 1
- fi
- 
--file=/etc/shells
-+file=@TERMUX_PREFIX@/etc/shells
- # I want this to be GUARANTEED to be on the same filesystem as $file
- tmpfile=${file}.tmp
- otmpfile=${file}.tmp2