aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-06-11 06:34:47 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-06-11 06:34:47 +0000
commit3d8c5563ee0008af3f21d3284bdd0222780aed6f (patch)
tree03f592f30f5769ecca0ef9744537da2b698c2275 /main/busybox
parent173bc29632918336693bfcb27b4cb407a33cf40b (diff)
downloadaports-3d8c5563ee0008af3f21d3284bdd0222780aed6f.tar.bz2
aports-3d8c5563ee0008af3f21d3284bdd0222780aed6f.tar.xz
main/busybox: fix busybox-extras trigger, fix /bin/su suid problem
Diffstat (limited to 'main/busybox')
-rw-r--r--main/busybox/APKBUILD4
-rw-r--r--main/busybox/bbsuid.c2
-rw-r--r--main/busybox/busybox.trigger2
3 files changed, 4 insertions, 4 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 8e58247e40..d95df6a3c8 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.26.2
-pkgrel=7
+pkgrel=8
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
@@ -195,6 +195,6 @@ f26e090f5de0096ba5c4d46989ebe0ab5fa64c8bf54cd37ddec302fddfde23eac914858d86cc52bf
a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate
2b3f72c67e806748707a750201313b085aea5a3e34cfebe27841ce2b3e2dcfad741866fb0c1f0f3f09f4089e640a33290eec0f448ae58a1a8239374ec954b541 busyboxconfig
cd2683417540118b364e184a23c76742fb9da37d520ea2fcb1cf1729443c67ef6bc7938711bf1ab9ebd211ece02cf7300d4977499e82a35b879e27a2470be524 busyboxconfig-extras
-c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f bbsuid.c
+e84087a453f8c9814951c9ad496cce19f8280b80a8ab6a1c8e21385f1facb17e987adc8d1d72c7cb463c04eb0cadd2bd6fb9b6f6c0067ddd21eeacf91ca42f32 bbsuid.c
a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up
4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c"
diff --git a/main/busybox/bbsuid.c b/main/busybox/bbsuid.c
index 3786312f5c..8be2671b10 100644
--- a/main/busybox/bbsuid.c
+++ b/main/busybox/bbsuid.c
@@ -22,9 +22,9 @@
const static char * applets[] = {
"/bin/mount",
"/bin/umount",
+ "/bin/su",
"/usr/bin/crontab",
"/usr/bin/passwd",
- "/usr/bin/su",
"/usr/bin/traceroute",
"/usr/bin/traceroute6",
"/usr/bin/vlock",
diff --git a/main/busybox/busybox.trigger b/main/busybox/busybox.trigger
index 2a7535e18e..e531a45b84 100644
--- a/main/busybox/busybox.trigger
+++ b/main/busybox/busybox.trigger
@@ -15,6 +15,6 @@ done
if [ -n "$do_bb_install" ]; then
[ -e /bin/bbsuid ] && /bin/bbsuid --install
- [ -e /bin/busybux-extras ] && /bin/busybox-extras --install -s
+ [ -e /bin/busybox-extras ] && /bin/busybox-extras --install -s
/bin/busybox --install -s
fi