refresh all package patches in the buildroot using quilt

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 36 insertions, 27 deletions

diff --git a/package/fuse/patches/100-cross_compile.patch b/package/fuse/patches/100-cross_compile.patch
index b7ec1518ce..ffb8265537 100644
--- a/package/fuse/patches/100-cross_compile.patch
+++ b/package/fuse/patches/100-cross_compile.patch
@@ -1,5 +1,7 @@
---- fuse.old/kernel/configure	2007-04-01 21:04:47.000000000 +0200
-+++ fuse.dev/kernel/configure	2007-04-01 21:05:44.000000000 +0200
+Index: fuse-2.6.3/kernel/configure
+===================================================================
+--- fuse-2.6.3.orig/kernel/configure	2007-06-04 13:22:29.716337712 +0200
++++ fuse-2.6.3/kernel/configure	2007-06-04 13:22:29.783327528 +0200
 @@ -1851,7 +1851,9 @@
  
  	{ echo "$as_me:$LINENO: checking kernel source version" >&5
diff --git a/package/fuse/patches/102-no_depmod.patch b/package/fuse/patches/102-no_depmod.patch
index ea9539a200..a6b9732517 100644
--- a/package/fuse/patches/102-no_depmod.patch
+++ b/package/fuse/patches/102-no_depmod.patch
@@ -1,7 +1,8 @@
-diff -ruN fuse-2.5.3-old/kernel/Makefile.in fuse-2.5.3-new/kernel/Makefile.in
---- fuse-2.5.3-old/kernel/Makefile.in	2006-06-17 00:04:06.000000000 +0200
-+++ fuse-2.5.3-new/kernel/Makefile.in	2006-06-17 00:08:44.000000000 +0200
-@@ -31,11 +31,9 @@
+Index: fuse-2.6.3/kernel/Makefile.in
+===================================================================
+--- fuse-2.6.3.orig/kernel/Makefile.in	2007-06-04 13:22:29.695340904 +0200
++++ fuse-2.6.3/kernel/Makefile.in	2007-06-04 13:22:29.975298344 +0200
+@@ -25,11 +25,9 @@
  install-y: all
  	$(mkdir_p) $(DESTDIR)$(fusemoduledir)
  	$(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)
diff --git a/package/fuse/patches/112-no_break_on_mknod.patch b/package/fuse/patches/112-no_break_on_mknod.patch
index 96ed70f291..38c75c29d4 100644
--- a/package/fuse/patches/112-no_break_on_mknod.patch
+++ b/package/fuse/patches/112-no_break_on_mknod.patch
@@ -1,12 +1,13 @@
-diff -ruN fuse-2.4.1-old/util/Makefile.in fuse-2.4.1-new/util/Makefile.in
---- fuse-2.4.1-old/util/Makefile.in	2005-10-17 12:29:20.000000000 +0200
-+++ fuse-2.4.1-new/util/Makefile.in	2005-10-19 17:11:13.000000000 +0200
-@@ -445,7 +445,7 @@
+Index: fuse-2.6.3/util/Makefile.in
+===================================================================
+--- fuse-2.6.3.orig/util/Makefile.in	2007-06-04 13:22:29.674344096 +0200
++++ fuse-2.6.3/util/Makefile.in	2007-06-04 13:22:30.163269768 +0200
+@@ -489,7 +489,7 @@
  install-exec-hook:
  	-chown root $(DESTDIR)$(bindir)/fusermount
  	-chmod u+s $(DESTDIR)$(bindir)/fusermount
 -	@if test ! -e $(DESTDIR)/dev/fuse; then \
 +	-@if test ! -e $(DESTDIR)/dev/fuse; then \
  		$(mkdir_p) $(DESTDIR)/dev; \
- 		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
- 		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
+ 		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+ 		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
diff --git a/package/fuse/patches/200-disable_compat.patch b/package/fuse/patches/200-disable_compat.patch
index 4d50ada566..93c0dfc104 100644
--- a/package/fuse/patches/200-disable_compat.patch
+++ b/package/fuse/patches/200-disable_compat.patch
@@ -1,6 +1,7 @@
-diff -ur fuse.old/include/fuse_common_compat.h fuse.dev/include/fuse_common_compat.h
---- fuse.old/include/fuse_common_compat.h	2006-09-22 21:30:16.000000000 +0200
-+++ fuse.dev/include/fuse_common_compat.h	2007-02-27 15:42:40.370284776 +0100
+Index: fuse-2.6.3/include/fuse_common_compat.h
+===================================================================
+--- fuse-2.6.3.orig/include/fuse_common_compat.h	2007-06-04 13:22:29.628351088 +0200
++++ fuse-2.6.3/include/fuse_common_compat.h	2007-06-04 13:22:30.344242256 +0200
 @@ -17,6 +17,7 @@
      unsigned int keep_cache : 1;
  };
@@ -15,9 +16,10 @@ diff -ur fuse.old/include/fuse_common_compat.h fuse.dev/include/fuse_common_comp
  void fuse_unmount_compat22(const char *mountpoint);
 -
 +#endif
-diff -ur fuse.old/lib/fuse.c fuse.dev/lib/fuse.c
---- fuse.old/lib/fuse.c	2007-02-02 12:57:48.000000000 +0100
-+++ fuse.dev/lib/fuse.c	2007-02-27 15:46:09.721458560 +0100
+Index: fuse-2.6.3/lib/fuse.c
+===================================================================
+--- fuse-2.6.3.orig/lib/fuse.c	2007-06-04 13:22:29.634350176 +0200
++++ fuse-2.6.3/lib/fuse.c	2007-06-04 13:22:30.345242104 +0200
 @@ -128,6 +128,7 @@
  static pthread_mutex_t fuse_context_lock = PTHREAD_MUTEX_INITIALIZER;
  static int fuse_context_ref;
@@ -130,9 +132,10 @@ diff -ur fuse.old/lib/fuse.c fuse.dev/lib/fuse.c
  __asm__(".symver fuse_new_compat25,fuse_new@FUSE_2.5");
 +
 +#endif
-diff -ur fuse.old/lib/fuse_lowlevel.c fuse.dev/lib/fuse_lowlevel.c
---- fuse.old/lib/fuse_lowlevel.c	2006-12-09 19:52:22.000000000 +0100
-+++ fuse.dev/lib/fuse_lowlevel.c	2007-02-27 15:32:35.903177744 +0100
+Index: fuse-2.6.3/lib/fuse_lowlevel.c
+===================================================================
+--- fuse-2.6.3.orig/lib/fuse_lowlevel.c	2007-06-04 13:22:29.639349416 +0200
++++ fuse-2.6.3/lib/fuse_lowlevel.c	2007-06-04 13:22:30.346241952 +0200
 @@ -1297,6 +1297,7 @@
  }
  
@@ -146,9 +149,10 @@ diff -ur fuse.old/lib/fuse_lowlevel.c fuse.dev/lib/fuse_lowlevel.c
  
  __asm__(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5");
 +#endif
-diff -ur fuse.old/lib/helper.c fuse.dev/lib/helper.c
---- fuse.old/lib/helper.c	2006-12-09 19:52:22.000000000 +0100
-+++ fuse.dev/lib/helper.c	2007-02-27 15:35:17.340635520 +0100
+Index: fuse-2.6.3/lib/helper.c
+===================================================================
+--- fuse-2.6.3.orig/lib/helper.c	2007-06-04 13:22:29.645348504 +0200
++++ fuse-2.6.3/lib/helper.c	2007-06-04 13:22:30.346241952 +0200
 @@ -195,7 +195,7 @@
                                             struct fuse_args *args)
  {
@@ -171,9 +175,10 @@ diff -ur fuse.old/lib/helper.c fuse.dev/lib/helper.c
  __asm__(".symver fuse_main_real_compat25,fuse_main_real@FUSE_2.5");
  __asm__(".symver fuse_mount_compat25,fuse_mount@FUSE_2.5");
 +#endif
-diff -ur fuse.old/lib/mount.c fuse.dev/lib/mount.c
---- fuse.old/lib/mount.c	2007-01-02 18:10:33.000000000 +0100
-+++ fuse.dev/lib/mount.c	2007-02-27 15:40:13.645590320 +0100
+Index: fuse-2.6.3/lib/mount.c
+===================================================================
+--- fuse-2.6.3.orig/lib/mount.c	2007-06-04 13:22:29.652347440 +0200
++++ fuse-2.6.3/lib/mount.c	2007-06-04 13:22:30.346241952 +0200
 @@ -219,11 +219,16 @@
      waitpid(pid, NULL, 0);
  }