busybox: move passwd applet to /bin
authorDaniel Golle <daniel@makrotopia.org>
Wed, 19 Jul 2017 21:53:35 +0000 (23:53 +0200)
committerJohn Crispin <john@phrozen.org>
Wed, 30 Aug 2017 16:12:48 +0000 (18:12 +0200)
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>
package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch [new file with mode: 0644]

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 (file)
index 0000000..b19d1c9
--- /dev/null
@@ -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