updates

3 files changed, 38 insertions, 2 deletions

diff --git a/repos/core/busybox/.files b/repos/core/busybox/.files
index d3008fa1..a119564d 100644
--- a/repos/core/busybox/.files
+++ b/repos/core/busybox/.files
@@ -30,6 +30,8 @@ lrwxrwxrwx root/root    bin/fgrep -> busybox
 lrwxrwxrwx root/root    bin/fsync -> busybox
 lrwxrwxrwx root/root    bin/getopt -> busybox
 lrwxrwxrwx root/root    bin/grep -> busybox
+lrwxrwxrwx root/root    bin/gunzip -> busybox
+lrwxrwxrwx root/root    bin/gzip -> busybox
 lrwxrwxrwx root/root    bin/hostname -> busybox
 lrwxrwxrwx root/root    bin/ionice -> busybox
 lrwxrwxrwx root/root    bin/iostat -> busybox
@@ -85,6 +87,7 @@ lrwxrwxrwx root/root    bin/uname -> busybox
 lrwxrwxrwx root/root    bin/usleep -> busybox
 lrwxrwxrwx root/root    bin/vi -> busybox
 lrwxrwxrwx root/root    bin/watch -> busybox
+lrwxrwxrwx root/root    bin/zcat -> busybox
 drwxr-xr-x root/root    etc/
 -rw-r--r-- root/root    etc/mdev.conf.new
 drwxr-xr-x root/root    etc/sv/
@@ -157,6 +160,7 @@ lrwxrwxrwx root/root    sbin/mkswap -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/modinfo -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/modprobe -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/nameif -> ../bin/busybox
+lrwxrwxrwx root/root    sbin/nologin -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/pivot_root -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/poweroff -> ../bin/busybox
 lrwxrwxrwx root/root    sbin/raidautorun -> ../bin/busybox
@@ -215,6 +219,7 @@ lrwxrwxrwx root/root    usr/bin/expr -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/factor -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/fallocate -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/fgconsole -> ../../bin/busybox
+lrwxrwxrwx root/root    usr/bin/find -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/flock -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/fold -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/free -> ../../bin/busybox
@@ -240,7 +245,6 @@ lrwxrwxrwx root/root    usr/bin/lsof -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/lspci -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/lsscsi -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/lsusb -> ../../bin/busybox
-lrwxrwxrwx root/root    usr/bin/man -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/md5sum -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/mesg -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/microcom -> ../../bin/busybox
@@ -333,6 +337,7 @@ lrwxrwxrwx root/root    usr/bin/which -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/who -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/whoami -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/whois -> ../../bin/busybox
+lrwxrwxrwx root/root    usr/bin/xargs -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/xxd -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/bin/yes -> ../../bin/busybox
 drwxr-xr-x root/root    usr/sbin/
@@ -368,7 +373,6 @@ lrwxrwxrwx root/root    usr/sbin/mim -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/nanddump -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/nandwrite -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/nbd-client -> ../../bin/busybox
-lrwxrwxrwx root/root    usr/sbin/nologin -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/ntpd -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/partprobe -> ../../bin/busybox
 lrwxrwxrwx root/root    usr/sbin/popmaildir -> ../../bin/busybox
diff --git a/repos/core/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch b/repos/core/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
new file mode 100644
index 00000000..5fbcacc0
--- /dev/null
+++ b/repos/core/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -0,0 +1,31 @@
+From 9d796b508575b2e1673512d4103e6049af189bc6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 13 Feb 2019 18:41:43 +0100
+Subject: [PATCH] nologin: Install applet to /sbin instead of /usr/sbin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is required to retain compatibility with our old custom nologin
+applet written in C which was also installed to /sbin.
+
+Compatibility with the old path is required because login shell paths
+are hardcoded in /etc/passwd.
+
+---
+ util-linux/nologin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util-linux/nologin.c b/util-linux/nologin.c
+index 5a8b047a5..d3b6fe77e 100644
+--- a/util-linux/nologin.c
++++ b/util-linux/nologin.c
+@@ -19,7 +19,7 @@
+ //config:	If you know these will be available externally you can
+ //config:	disable this option.
+ 
+-//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_USR_SBIN, BB_SUID_DROP, nologin))
++//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_SBIN, BB_SUID_DROP, nologin))
+ 
+ //usage:#define nologin_trivial_usage
+ //usage:	""
diff --git a/repos/core/busybox/info b/repos/core/busybox/info
index 240a0204..62919e3a 100644
--- a/repos/core/busybox/info
+++ b/repos/core/busybox/info
@@ -12,6 +12,7 @@ source="https://${name}.net/downloads/${name}-${version}.tar.bz2
 	lsusb-vendor-product.patch
 	print-unicode.patch
 	modprobe-kernel-version.patch
+	0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
 	acpid.run
 	crond.run
 	ntpd.run