aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2019-02-13 22:26:47 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2019-02-15 23:23:00 +0100
commit397f0cd902eaadce3b74e1e3021e941d9bb6ba72 (patch)
tree92a0f82e3ff96244c3c790320d7d78e1978775d5 /main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
parentba2aa302c949e3508b05e6de0b3aad143391a859 (diff)
downloadaports-397f0cd902eaadce3b74e1e3021e941d9bb6ba72.tar.bz2
aports-397f0cd902eaadce3b74e1e3021e941d9bb6ba72.tar.xz
main/busybox: upgrade to 1.30.0
Notable changes: * The sysklogd -Z option has been removed in favor of -t option which has been added by upstream. * Our own nologin.c applet has been replaced by an upstream nologin shell applet. * New bc applet. OK ncopa@ Fixes #9279 Fixes #7818
Diffstat (limited to 'main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch')
-rw-r--r--main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch b/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
new file mode 100644
index 0000000000..0cc4db95c9
--- /dev/null
+++ b/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -0,0 +1,27 @@
+From fa5c4b2e60a98944863097b448960d0744916b1f 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 22:32:44 +0100
+Subject: [PATCH] nologin: Install applet to /sbin instead of /usr/sbin
+
+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 5e5e42305..b03470ac6 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: ""