diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-12-07 16:56:04 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-12-07 16:56:04 +0000 |
| commit | 6b306ba7b836261b2abcee6977ff27f909338282 (patch) | |
| tree | 49c8e4e216c8e7316f5f746c0db3e58841345acf /package/busybox/patches/340-lock_util.patch | |
| parent | a653c7602e243dcc4e89f467d4c97576ddd7a77f (diff) | |
| download | mtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.zip mtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.tar.gz mtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.tar.bz2 | |
update busybox to 1.15.2 (#5926)
SVN-Revision: 18684
Diffstat (limited to 'package/busybox/patches/340-lock_util.patch')
| -rw-r--r-- | package/busybox/patches/340-lock_util.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch index 8cffe45..3e90558 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -1,16 +1,16 @@ --- a/include/applets.h +++ b/include/applets.h -@@ -228,6 +228,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN - USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) - USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) - USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) -+USE_LOCK(APPLET(lock, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS)) - USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname)) +@@ -233,6 +233,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)) ++IF_LOCK(APPLET(lock, _BB_DIR_BIN, _BB_SUID_DROP)) + IF_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_DROP)) + IF_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_REQUIRE)) + IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname)) --- a/include/usage.h +++ b/include/usage.h -@@ -2246,6 +2246,9 @@ +@@ -2325,6 +2325,9 @@ #define loadkmap_example_usage \ "$ loadkmap < /etc/i18n/lang-keymap\n" @@ -18,11 +18,11 @@ +#define lock_full_usage "" + #define logger_trivial_usage \ - "[OPTION]... [MESSAGE]" + "[OPTIONS] [MESSAGE]" #define logger_full_usage "\n\n" \ --- a/miscutils/Config.in +++ b/miscutils/Config.in -@@ -420,6 +420,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA +@@ -456,6 +456,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 -@@ -23,6 +23,7 @@ lib-$(CONFIG_INOTIFYD) += inotifyd.o +@@ -26,6 +26,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 |