aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2017-07-19 23:53:35 +0200
committerJohn Crispin <john@phrozen.org>2017-08-30 18:12:48 +0200
commita3c0d5f70a0d6a466436ec090b62e9e4502449f7 (patch)
tree6159d6107bf42d97c91472292257082a0c21a018
parenta63eb74bce9e28b016ab337bc3f80570fba12909 (diff)
downloadupstream-a3c0d5f70a0d6a466436ec090b62e9e4502449f7.tar.gz
upstream-a3c0d5f70a0d6a466436ec090b62e9e4502449f7.tar.bz2
upstream-a3c0d5f70a0d6a466436ec090b62e9e4502449f7.zip
busybox: move passwd applet to /bin
busybox currently installs passwd into /usr/bin which prevents its 'full' shadow-utils variant from being installed. Move the passwd applet to /bin to avoid that collision. shadow also provides /usr/bin/login which doesn't collide with busybox as the busybox login applet is installed at /bin/login. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch b/package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch
new file mode 100644
index 0000000000..b19d1c9a39
--- /dev/null
+++ b/package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch
@@ -0,0 +1,11 @@
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -23,7 +23,7 @@
+ //config: With this option passwd will refuse new passwords which are "weak".
+
+ //applet:/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */
+-//applet:IF_PASSWD(APPLET(passwd, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
++//applet:IF_PASSWD(APPLET(passwd, BB_DIR_BIN, BB_SUID_REQUIRE))
+
+ //kbuild:lib-$(CONFIG_PASSWD) += passwd.o
+