From dbf4b64186765adecfde1b8ce10fd628a8824a70 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 4 Jan 2012 07:42:36 +0000 Subject: main/busybox: fix location for vi ref #889 --- main/busybox/APKBUILD | 4 ++-- main/busybox/bb-app-location.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'main/busybox') diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 88c11a30c1..fcfb6088c2 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=busybox pkgver=1.19.3 -pkgrel=1 +pkgrel=2 _bbsuidver=0.6 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net @@ -87,7 +87,7 @@ md5sums="c3938e1ac59602387009bbf1dd1af7f6 busybox-1.19.3.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 +754916e52fa11d3fe7c29c93248b6707 bb-app-location.patch 784383013b8f015fb0d214618c46b4b8 0001-loginutils-use-sha512.patch 5ed72ca85b8fba4598d64a550210b31f busybox-1.19.3-getty.patch 41636628e481f22b8774b6bee1eebfb1 busybox-1.19.3-modinfo.patch diff --git a/main/busybox/bb-app-location.patch b/main/busybox/bb-app-location.patch index 95a9d8daee..acad1f3313 100644 --- a/main/busybox/bb-app-location.patch +++ b/main/busybox/bb-app-location.patch @@ -18,3 +18,14 @@ 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)) +--- ./editors/vi.c.orig ++++ ./editors/vi.c +@@ -145,7 +145,7 @@ + //config: This will make the cursor movement faster, but requires more memory + //config: and it makes the applet a tiny bit larger. + +-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) ++//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) + + //kbuild:lib-$(CONFIG_VI) += vi.o + -- cgit v1.2.3