fix duplicate dependencies

[openwrt.git] / package / fuse / patches / 200-disable_compat.patch

diff --git a/package/fuse/patches/200-disable_compat.patch b/package/fuse/patches/200-disable_compat.patch
index 4d50ada..52c0e2e 100644 (file)
--- 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.5/include/fuse_common_compat.h
+===================================================================
+--- fuse-2.6.5.orig/include/fuse_common_compat.h       2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/include/fuse_common_compat.h    2007-06-23 13:03:51.000000000 +0200

 @@ -17,6 +17,7 @@
      unsigned int keep_cache : 1;
  };
 @@ -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
  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.5/lib/fuse.c
+===================================================================
+--- fuse-2.6.5.orig/lib/fuse.c 2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/lib/fuse.c      2007-06-23 13:03:51.000000000 +0200

 @@ -128,6 +128,7 @@
  static pthread_mutex_t fuse_context_lock = PTHREAD_MUTEX_INITIALIZER;
  static int fuse_context_ref;
 @@ -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
  __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.5/lib/fuse_lowlevel.c
+===================================================================
+--- fuse-2.6.5.orig/lib/fuse_lowlevel.c        2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/lib/fuse_lowlevel.c     2007-06-23 13:03:51.000000000 +0200

 @@ -1297,6 +1297,7 @@
  }
  
 @@ -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
  
  __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.5/lib/helper.c
+===================================================================
+--- fuse-2.6.5.orig/lib/helper.c       2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/lib/helper.c    2007-06-23 13:03:51.000000000 +0200

 @@ -195,7 +195,7 @@
                                             struct fuse_args *args)
  {
 @@ -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
  __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.5/lib/mount.c
+===================================================================
+--- fuse-2.6.5.orig/lib/mount.c        2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/lib/mount.c     2007-06-23 13:03:51.000000000 +0200

 @@ -219,11 +219,16 @@
      waitpid(pid, NULL, 0);
  }
 @@ -219,11 +219,16 @@
      waitpid(pid, NULL, 0);
  }