add extra wrt350n leds (patch from #2745)

[openwrt.git] / package / busybox / patches / 340-lock_util.patch

diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index a86948d..1d781f2 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,39 +1,49 @@
-# 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 @@
- USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
+Index: busybox-1.8.1/include/applets.h
+===================================================================
+--- busybox-1.8.1.orig/include/applets.h       2007-11-10 16:54:28.318054115 +0100
++++ busybox-1.8.1/include/applets.h    2007-11-10 17:39:21.487529096 +0100
+@@ -218,6 +218,7 @@
+ USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))

  USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
 +USE_LOCK(APPLET_NOUSAGE(lock, 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_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
 +USE_LOCK(APPLET_NOUSAGE(lock, 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(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 @@
+ USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname))
+Index: busybox-1.8.1/miscutils/Config.in
+===================================================================
+--- busybox-1.8.1.orig/miscutils/Config.in     2007-11-10 16:54:16.477379354 +0100
++++ busybox-1.8.1/miscutils/Config.in  2007-11-10 16:54:28.366056851 +0100
+@@ -244,6 +244,12 @@

          Enables the 'hdparm -d' option to get/set using_dma flag.
          This is dangerous stuff, so you should probably say N.
  
          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
 +
 +      bool "lock"
 +      default y
 +      help
 +        Small utility for using locks in scripts
 +

- config CONFIG_MAKEDEVS
+ config MAKEDEVS

        bool "makedevs"
        default n
        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
-@@ -0,0 +1,133 @@
+Index: busybox-1.8.1/miscutils/Kbuild
+===================================================================
+--- busybox-1.8.1.orig/miscutils/Kbuild        2007-11-10 16:54:16.481379580 +0100
++++ busybox-1.8.1/miscutils/Kbuild     2007-11-10 16:54:28.370057076 +0100
+@@ -16,6 +16,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_MICROCOM)    += microcom.o
+ lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
+Index: busybox-1.8.1/miscutils/lock.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.8.1/miscutils/lock.c     2007-11-10 17:40:37.203843924 +0100
+@@ -0,0 +1,132 @@

 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *


@@ -46,7 +56,7 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <stdio.h>

-+#include "busybox.h" 
++#include "busybox.h"

 +
 +static int unlock = 0;
 +static int shared = 0;
 +
 +static int unlock = 0;
 +static int shared = 0;


@@ -67,7 +77,6 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);

-+      unlink(file);

 +      exit(0);
 +}
 +
 +      exit(0);
 +}
 +


@@ -75,27 +84,29 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +{
 +      FILE *f;
 +      int i;
 +{
 +      FILE *f;
 +      int i;

-+      
++

 +      if ((f = fopen(file, "r")) == NULL)
 +              return 0;
 +      if ((f = fopen(file, "r")) == NULL)
 +              return 0;

-+      
++

 +      fscanf(f, "%d", &i);
 +      if (i > 0)
 +              kill(i, SIGTERM);
 +      fscanf(f, "%d", &i);
 +      if (i > 0)
 +              kill(i, SIGTERM);

-+      
++

 +      fclose(f);
 +
 +      return 0;
 +}
 +      fclose(f);
 +
 +      return 0;
 +}

-+              
++

 +static int do_lock(void)
 +{
 +      int pid;
 +      char pidstr[8];
 +
 +static int do_lock(void)
 +{
 +      int pid;
 +      char pidstr[8];
 +

-+      if ((fd = open(file, O_RDWR | O_CREAT, 0700)) < 0) {
-+              fprintf(stderr, "Can't open %s\n", file);
-+              return 1;
++      if ((fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0700)) < 0) {
++              if ((fd = open(file, O_RDWR)) < 0) {
++                      fprintf(stderr, "Can't open %s\n", file);
++                      return 1;
++              }

 +      }
 +
 +      if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {
 +      }
 +
 +      if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {


@@ -107,7 +118,7 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +
 +      if (pid < 0)
 +              return -1;
 +
 +      if (pid < 0)
 +              return -1;

-+      
++

 +      if (pid == 0) {
 +              signal(SIGKILL, exit_unlock);
 +              signal(SIGTERM, exit_unlock);
 +      if (pid == 0) {
 +              signal(SIGKILL, exit_unlock);
 +              signal(SIGTERM, exit_unlock);


@@ -128,13 +139,11 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +
 +              return 0;
 +      }
 +
 +              return 0;
 +      }

++      return 0;

 +}
 +
 +}
 +

-+#ifndef CONFIG_LOCK
-+int main(int argc, char **argv)
-+#else
++int lock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

 +int lock_main(int argc, char **argv)
 +int lock_main(int argc, char **argv)

-+#endif

 +{
 +      char **args = &argv[1];
 +      int c = argc - 1;
 +{
 +      char **args = &argv[1];
 +      int c = argc - 1;


@@ -167,14 +176,3 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +      else
 +              return do_lock();
 +}
 +      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