diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-06-23 15:54:36 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-06-23 15:54:36 +0000 |
| commit | 1be80fc29adc4c7b0852db3dfe2a3b323afc314b (patch) | |
| tree | bc2ffe0ee2aad0f14cc370d530fdf01ab0b837ed /package/fuse/patches/200-disable_compat.patch | |
| parent | 0b1fdf1ad8f3c6f0fc59ecf63b18d62d9b032ed8 (diff) | |
| download | mtk-20170518-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.zip mtk-20170518-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.gz mtk-20170518-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.bz2 | |
Upgrade fuse to 2.6.5 (#1955)
SVN-Revision: 7716
Diffstat (limited to 'package/fuse/patches/200-disable_compat.patch')
| -rw-r--r-- | package/fuse/patches/200-disable_compat.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/package/fuse/patches/200-disable_compat.patch b/package/fuse/patches/200-disable_compat.patch index 93c0dfc..52c0e2e 100644 --- a/package/fuse/patches/200-disable_compat.patch +++ b/package/fuse/patches/200-disable_compat.patch @@ -1,7 +1,7 @@ -Index: fuse-2.6.3/include/fuse_common_compat.h +Index: fuse-2.6.5/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 +--- 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; }; @@ -16,10 +16,10 @@ Index: fuse-2.6.3/include/fuse_common_compat.h void fuse_unmount_compat22(const char *mountpoint); - +#endif -Index: fuse-2.6.3/lib/fuse.c +Index: fuse-2.6.5/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 +--- 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; @@ -132,10 +132,10 @@ Index: fuse-2.6.3/lib/fuse.c __asm__(".symver fuse_new_compat25,fuse_new@FUSE_2.5"); + +#endif -Index: fuse-2.6.3/lib/fuse_lowlevel.c +Index: fuse-2.6.5/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 +--- 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 @@ } @@ -149,10 +149,10 @@ Index: fuse-2.6.3/lib/fuse_lowlevel.c __asm__(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5"); +#endif -Index: fuse-2.6.3/lib/helper.c +Index: fuse-2.6.5/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 +--- 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) { @@ -175,10 +175,10 @@ Index: fuse-2.6.3/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 -Index: fuse-2.6.3/lib/mount.c +Index: fuse-2.6.5/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 +--- 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); } |