diff options
Diffstat (limited to 'package/busybox/patches/340-lock_util.patch')
| -rw-r--r-- | package/busybox/patches/340-lock_util.patch | 53 |
1 files changed, 24 insertions, 29 deletions
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch index acb4457f38..f832df7d91 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -1,12 +1,7 @@ -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h ---- busybox-1.2.0-old/include/applets.h 2006-07-31 11:21:00.000000000 +0200 -+++ busybox-1.2.0-new/include/applets.h 2006-08-01 10:21:15.000000000 +0200 -@@ -169,6 +169,7 @@ +diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h +--- busybox-1.3.1-old/include/applets.h 2006-12-28 07:43:24.000000000 +0100 ++++ busybox-1.3.1/include/applets.h 2006-12-28 03:11:36.000000000 +0100 +@@ -180,6 +180,7 @@ USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) @@ -14,25 +9,36 @@ diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets. USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS)) USE_LOGNAME(APPLET(logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -ruN busybox-1.2.0-old/miscutils/Config.in busybox-1.2.0-new/miscutils/Config.in ---- busybox-1.2.0-old/miscutils/Config.in 2006-07-01 00:42:09.000000000 +0200 -+++ busybox-1.2.0-new/miscutils/Config.in 2006-08-01 10:21:15.000000000 +0200 -@@ -231,6 +231,12 @@ +diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.in +--- busybox-1.3.1-old/miscutils/Config.in 2006-12-27 05:56:09.000000000 +0100 ++++ busybox-1.3.1/miscutils/Config.in 2006-12-28 03:14:16.000000000 +0100 +@@ -232,6 +232,12 @@ Enables the 'hdparm -d' option to get/set using_dma flag. This is dangerous stuff, so you should probably say N. -+config CONFIG_LOCK ++config LOCK + bool "lock" + default y + help + Small utility for using locks in scripts + - config CONFIG_MAKEDEVS + config MAKEDEVS bool "makedevs" default n -diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c ---- busybox-1.2.0-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.2.0-new/miscutils/lock.c 2006-08-01 10:21:15.000000000 +0200 +diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild +--- busybox-1.3.1-old/miscutils/Kbuild 2006-12-27 05:56:09.000000000 +0100 ++++ busybox-1.3.1/miscutils/Kbuild 2006-12-28 03:15:47.000000000 +0100 +@@ -15,6 +15,7 @@ + lib-$(CONFIG_HDPARM) += hdparm.o + lib-$(CONFIG_LAST) += last.o + lib-$(CONFIG_LESS) += less.o ++lib-$(CONFIG_LOCK) += lock.o + lib-$(CONFIG_MAKEDEVS) += makedevs.o + lib-$(CONFIG_MOUNTPOINT) += mountpoint.o + lib-$(CONFIG_MT) += mt.o +diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c +--- busybox-1.3.1-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.3.1/miscutils/lock.c 2006-12-28 03:11:36.000000000 +0100 @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> @@ -169,14 +175,3 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c + else + return do_lock(); +} -diff -ruN busybox-1.2.0-old/miscutils/Makefile.in busybox-1.2.0-new/miscutils/Makefile.in ---- busybox-1.2.0-old/miscutils/Makefile.in 2006-07-01 00:42:09.000000000 +0200 -+++ busybox-1.2.0-new/miscutils/Makefile.in 2006-08-01 10:21:15.000000000 +0200 -@@ -20,6 +20,7 @@ - MISCUTILS-$(CONFIG_EJECT) += eject.o - MISCUTILS-$(CONFIG_HDPARM) += hdparm.o - MISCUTILS-$(CONFIG_LAST) += last.o -+MISCUTILS-$(CONFIG_LOCK) += lock.o - MISCUTILS-${CONFIG_LESS} += less.o - MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o - MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o |