From bbdac42e5521ed8b6a58871c5d1acfb173e63b69 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Apr 16 2012 04:15:03 +0000 Subject: Ver. 2.8.7 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 4212e3e..5971f56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ fuse-2.8.4.tar.gz /fuse-2.8.5.tar.gz /fuse-2.8.6.tar.gz +/fuse-2.8.7.tar.gz diff --git a/fuse-0001-More-parentheses.patch b/fuse-0001-More-parentheses.patch new file mode 100644 index 0000000..4d34710 --- /dev/null +++ b/fuse-0001-More-parentheses.patch @@ -0,0 +1,52 @@ +From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 9 Aug 2010 12:10:40 +0400 +Subject: [PATCH 1/1] More parentheses + +Signed-off-by: Peter Lemenkov +--- + lib/fuse.c | 8 +++----- + lib/fuse_lowlevel.c | 2 +- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/lib/fuse.c b/lib/fuse.c +index d511964..328ebba 100644 +--- a/lib/fuse.c ++++ b/lib/fuse.c +@@ -991,17 +991,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, + { + int err; + if (!fs->compat || fs->compat >= 25) +- err = fs->op.open(path, fi); ++ err = (fs->op.open)(path, fi); + else if (fs->compat == 22) { + struct fuse_file_info_compat tmp; + memcpy(&tmp, fi, sizeof(tmp)); +- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, +- &tmp); ++ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); + memcpy(fi, &tmp, sizeof(tmp)); + fi->fh = tmp.fh; + } else +- err = ((struct fuse_operations_compat2 *) &fs->op) +- ->open(path, fi->flags); ++ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); + return err; + } + +diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c +index c86a910..4f19d61 100644 +--- a/lib/fuse_lowlevel.c ++++ b/lib/fuse_lowlevel.c +@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) + fi.flags = arg->flags; + + if (req->f->op.open) +- req->f->op.open(req, nodeid, &fi); ++ (req->f->op.open)(req, nodeid, &fi); + else + fuse_reply_open(req, &fi); + } +-- +1.7.9.3 + diff --git a/fuse-0002-More-parentheses.patch b/fuse-0002-More-parentheses.patch deleted file mode 100644 index bf0eef0..0000000 --- a/fuse-0002-More-parentheses.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 459c84a3e5fda1ef7f7060d44903b31215857e70 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Mon, 9 Aug 2010 12:10:40 +0400 -Subject: [PATCH 2/3] More parentheses - -Signed-off-by: Peter Lemenkov ---- - lib/fuse.c | 8 +++----- - lib/fuse_lowlevel.c | 2 +- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/lib/fuse.c b/lib/fuse.c -index 95cf50b..76c2681 100644 ---- a/lib/fuse.c -+++ b/lib/fuse.c -@@ -961,17 +961,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, - { - int err; - if (!fs->compat || fs->compat >= 25) -- err = fs->op.open(path, fi); -+ err = (fs->op.open)(path, fi); - else if (fs->compat == 22) { - struct fuse_file_info_compat tmp; - memcpy(&tmp, fi, sizeof(tmp)); -- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, -- &tmp); -+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); - memcpy(fi, &tmp, sizeof(tmp)); - fi->fh = tmp.fh; - } else -- err = ((struct fuse_operations_compat2 *) &fs->op) -- ->open(path, fi->flags); -+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); - return err; - } - -diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c -index c519bfb..d6275b5 100644 ---- a/lib/fuse_lowlevel.c -+++ b/lib/fuse_lowlevel.c -@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) - fi.flags = arg->flags; - - if (req->f->op.open) -- req->f->op.open(req, nodeid, &fi); -+ (req->f->op.open)(req, nodeid, &fi); - else - fuse_reply_open(req, &fi); - } --- -1.7.3.1 - diff --git a/fuse.spec b/fuse.spec index ea2d555..9955c04 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,6 +1,6 @@ Name: fuse -Version: 2.8.6 -Release: 4%{?dist} +Version: 2.8.7 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -9,7 +9,7 @@ URL: http://fuse.sf.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.conf -Patch2: fuse-0002-More-parentheses.patch +Patch1: fuse-0001-More-parentheses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel >= 2.6.14 Requires: which @@ -53,12 +53,12 @@ pgk-config) to develop FUSE based applications/filesystems. %setup -q #disable device creation during build/install sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in -%patch2 -p1 -b .add_parentheses +%patch1 -p1 -b .add_parentheses %build # Can't pass --disable-static here, or else the utils don't build -export MOUNT_FUSE_PATH="%{_sbindir}" -CFLAGS="%{optflags} -D_GNU_SOURCE" %configure +export MOUNT_FUSE_PATH="%{_sbindir}" +CFLAGS="%{optflags} -D_GNU_SOURCE" %configure make %{?_smp_mflags} %install @@ -118,6 +118,9 @@ fi %{_includedir}/fuse %changelog +* Mon Apr 16 2012 Peter Lemenkov - 2.8.7-1 +- Ver. 2.8.7 + * Sun Apr 15 2012 Kay Sievers - 2.8.6-4 - remove needless udev rule diff --git a/sources b/sources index 81017b2..3c4bcd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eaa32c8cef56a981656a786f258a002a fuse-2.8.6.tar.gz +001a12d8f5b4db461265e9661c7a5de4 fuse-2.8.7.tar.gz