add an abs2rel.pl helper script (returns a path relative to another)

[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 c1197e2..5bce455 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,7 +1,8 @@
-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 @@
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h       2007-06-04 13:21:34.188779184 +0200
++++ busybox-1.4.2/include/applets.h    2007-06-04 13:21:34.786688288 +0200
+@@ -178,6 +178,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))
  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))


@@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h
  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))
  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.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 @@
+Index: busybox-1.4.2/miscutils/Config.in
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Config.in     2007-06-04 13:21:32.136091240 +0200
++++ busybox-1.4.2/miscutils/Config.in  2007-06-04 13:21:34.786688288 +0200
+@@ -237,6 +237,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.
  


@@ -25,9 +27,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.i
  config MAKEDEVS
        bool "makedevs"
        default n
  config MAKEDEVS
        bool "makedevs"
        default n

-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
+Index: busybox-1.4.2/miscutils/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Kbuild        2007-06-04 13:21:32.142090328 +0200
++++ busybox-1.4.2/miscutils/Kbuild     2007-06-04 13:21:34.786688288 +0200

 @@ -15,6 +15,7 @@
  lib-$(CONFIG_HDPARM)      += hdparm.o
  lib-$(CONFIG_LAST)        += last.o
 @@ -15,6 +15,7 @@
  lib-$(CONFIG_HDPARM)      += hdparm.o
  lib-$(CONFIG_LAST)        += last.o


@@ -36,9 +39,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
  lib-$(CONFIG_MAKEDEVS)    += makedevs.o
  lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
  lib-$(CONFIG_MT)          += mt.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
+Index: busybox-1.4.2/miscutils/lock.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/miscutils/lock.c     2007-06-04 13:21:34.787688136 +0200

 @@ -0,0 +1,135 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 @@ -0,0 +1,135 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>