From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 19 Jul 2017 21:53:35 +0000 (+0200)
Subject: busybox: move passwd applet to /bin
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a3c0d5f70a0d6a466436ec090b62e9e4502449f7;p=openwrt%2Fstaging%2Fjow.git

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>
---

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
+