summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/340-lock_util.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-03 00:58:46 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-03 00:58:46 +0000
commit8be628f50a9626ad6a3b44df9f1b84dc4e01394f (patch)
tree5616527ebb38eeeacb0916ef8ee7f2d1e5240721 /package/busybox/patches/340-lock_util.patch
parent15f9699e985a6d0c93283366864c2ffc43e53b2c (diff)
downloadmaster-31e0f0ae-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.tar.gz
master-31e0f0ae-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.tar.bz2
master-31e0f0ae-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.zip
busybox: update to v1.16.1 (based on v1.16.0 update patch from Peter Wagner)
SVN-Revision: 20661
Diffstat (limited to 'package/busybox/patches/340-lock_util.patch')
-rw-r--r--package/busybox/patches/340-lock_util.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index 3e90558622..05cf7e09a3 100644
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,6 +1,6 @@
--- a/include/applets.h
+++ b/include/applets.h
-@@ -233,6 +233,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN,
+@@ -234,6 +234,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN,
IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
IF_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -10,7 +10,7 @@
IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname))
--- a/include/usage.h
+++ b/include/usage.h
-@@ -2325,6 +2325,9 @@
+@@ -2357,6 +2357,9 @@
#define loadkmap_example_usage \
"$ loadkmap < /etc/i18n/lang-keymap\n"
@@ -22,7 +22,7 @@
#define logger_full_usage "\n\n" \
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
-@@ -456,6 +456,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+@@ -463,6 +463,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
help
Enables the 'hdparm -d' option to get/set using_dma flag.
@@ -36,7 +36,7 @@
default n
--- a/miscutils/Kbuild
+++ b/miscutils/Kbuild
-@@ -26,6 +26,7 @@ lib-$(CONFIG_INOTIFYD) += inotifyd.o
+@@ -27,6 +27,7 @@ lib-$(CONFIG_INOTIFYD) += inotifyd.o
lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
lib-$(CONFIG_LESS) += less.o