aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-03 15:42:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-03 15:47:31 +0000
commit8bfdbbec19916b572b4e15ae7148bb7621037ee4 (patch)
treee722c7e85f0016f7727b268219bd652fe792af01
parent49c8fbfcc3dcd2482e77d619a9bb3fa7273d1e07 (diff)
downloadaports-8bfdbbec19916b572b4e15ae7148bb7621037ee4.tar.bz2
aports-8bfdbbec19916b572b4e15ae7148bb7621037ee4.tar.xz
main/busybox: fix locations for vi, ip and lspci
-rw-r--r--main/busybox/APKBUILD9
-rw-r--r--main/busybox/bb-app-location.patch20
2 files changed, 23 insertions, 6 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 521694773e..287cbf5097 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.19.2
-pkgrel=2
+pkgrel=3
_bbsuidver=0.6
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
@@ -15,6 +15,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
http://git.alpinelinux.org/cgit/bbsuid.git/snapshot/bbsuid-$_bbsuidver.tar.bz2
$pkgname-1.11.1-bb.patch
busybox-uname-is-not-gnu.patch
+ bb-app-location.patch
http://busybox.net/downloads/fixes-1.19.2/busybox-1.19.2-android.patch
http://busybox.net/downloads/fixes-1.19.2/busybox-1.19.2-buildsys.patch
http://busybox.net/downloads/fixes-1.19.2/busybox-1.19.2-chpasswd.patch
@@ -42,11 +43,6 @@ prepare() {
*.patch) msg $p; patch -p1 -i "$srcdir"/$p || return 1;;
esac
done
-
- sed -i -e 's/(ip, _BB_DIR_BIN/(ip, _BB_DIR_SBIN/' \
- -e 's/(lspci, _BB_DIR_USR_BIN/(lspci, _BB_DIR_USR_SBIN/' \
- -e 's/(vi, _BB_DIR_BIN/(vi, _BB_DIR_USR_BIN/' \
- include/applets.src.h || return 1
}
build() {
@@ -95,6 +91,7 @@ md5sums="50267054345f1a0b77fe65f6e0e5ba29 busybox-1.19.2.tar.bz2
968b3a058db04f95e9c4cdb44d7d3ddb bbsuid-0.6.tar.bz2
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch
+9f73c26999ce4651e4d97f91da122813 bb-app-location.patch
c695eea6c721e4f7f66fd3a1674ea6f5 busybox-1.19.2-android.patch
b239f0a6e6556a9df9beb7d8725907c4 busybox-1.19.2-buildsys.patch
04ec247d117d93a0097185ccea03aec5 busybox-1.19.2-chpasswd.patch
diff --git a/main/busybox/bb-app-location.patch b/main/busybox/bb-app-location.patch
new file mode 100644
index 0000000000..95a9d8daee
--- /dev/null
+++ b/main/busybox/bb-app-location.patch
@@ -0,0 +1,20 @@
+--- ./include/applets.src.h.orig
++++ ./include/applets.src.h
+@@ -194,7 +194,7 @@
+ || ENABLE_FEATURE_IP_LINK \
+ || ENABLE_FEATURE_IP_TUNNEL \
+ || ENABLE_FEATURE_IP_RULE
+-IF_IP(APPLET(ip, BB_DIR_BIN, BB_SUID_DROP))
++IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
+ #endif
+ IF_IPADDR(APPLET(ipaddr, BB_DIR_BIN, BB_SUID_DROP))
+ IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
+@@ -229,7 +229,7 @@
+ IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr))
+ IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
+ IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP))
+-IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP))
+ IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
+ IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat))
+ IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))