[package] crda: new package (thanks to Hauke Mehrtens <hauke@hauke-m.de>)

[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 8d81275..d946f32 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,20 +1,28 @@
-Index: busybox-1.7.2/include/applets.h
-===================================================================
---- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:35:03.000000000 -0500
-+++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:03.000000000 -0500
-@@ -209,6 +209,7 @@
+--- a/include/applets.h
++++ b/include/applets.h
+@@ -220,6 +220,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_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_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))
  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))

-Index: busybox-1.7.2/miscutils/Config.in
-===================================================================
---- busybox-1.7.2.orig/miscutils/Config.in     2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/miscutils/Config.in  2007-10-30 15:35:03.000000000 -0500
-@@ -244,6 +244,12 @@
+--- a/include/usage.h
++++ b/include/usage.h
+@@ -2138,6 +2138,9 @@
+ #define loadkmap_example_usage \
+        "$ loadkmap < /etc/i18n/lang-keymap\n"
+ 
++#define lock_trivial_usage NOUSAGE_STR
++#define lock_full_usage ""
++
+ #define logger_trivial_usage \
+        "[OPTION]... [MESSAGE]"
+ #define logger_full_usage "\n\n" \
+--- a/miscutils/Config.in
++++ b/miscutils/Config.in
+@@ -364,6 +364,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.
  


@@ -27,23 +35,19 @@ Index: busybox-1.7.2/miscutils/Config.in
  config MAKEDEVS
        bool "makedevs"
        default n
  config MAKEDEVS
        bool "makedevs"
        default n

-Index: busybox-1.7.2/miscutils/Kbuild
-===================================================================
---- busybox-1.7.2.orig/miscutils/Kbuild        2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/miscutils/Kbuild     2007-10-30 15:35:03.000000000 -0500
-@@ -16,6 +16,7 @@
- lib-$(CONFIG_HDPARM)      += hdparm.o
- lib-$(CONFIG_LAST)        += last.o
+--- a/miscutils/Kbuild
++++ b/miscutils/Kbuild
+@@ -20,6 +20,7 @@
+ lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
+ lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o

  lib-$(CONFIG_LESS)        += less.o
 +lib-$(CONFIG_LOCK)        += lock.o
  lib-$(CONFIG_MAKEDEVS)    += makedevs.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
-Index: busybox-1.7.2/miscutils/lock.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/miscutils/lock.c     2007-10-30 15:35:03.000000000 -0500
-@@ -0,0 +1,135 @@
+ lib-$(CONFIG_MAN)         += man.o
+ lib-$(CONFIG_MICROCOM)    += microcom.o
+--- /dev/null
++++ b/miscutils/lock.c
+@@ -0,0 +1,132 @@

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


@@ -56,7 +60,7 @@ Index: busybox-1.7.2/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;


@@ -84,19 +88,19 @@ Index: busybox-1.7.2/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;
 +static int do_lock(void)
 +{
 +      int pid;


@@ -118,7 +122,7 @@ Index: busybox-1.7.2/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);


@@ -142,11 +146,8 @@ Index: busybox-1.7.2/miscutils/lock.c
 +      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;