rpms/fuse/devel fuse-2.7.0-openfix.patch, NONE, 1.1 fuse.spec, 1.23, 1.24
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Wed Aug 29 21:25:09 UTC 2007
- Previous message: rpms/pdfedit/devel pdfedit.spec, 1.5, 1.6 pdfedit-doxygen.patch, 1.1, NONE
- Next message: rpms/virt-manager/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 virt-manager.spec, 1.25, 1.26 virt-manager-0.4.0-device-remove.patch, 1.1, NONE virt-manager-0.4.0-file-dialog-fix.patch, 1.1, NONE virt-manager-0.4.0-toolbar-state.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17197
Modified Files:
fuse.spec
Added Files:
fuse-2.7.0-openfix.patch
Log Message:
Fix fuse in devel, close bz 265321
fuse-2.7.0-openfix.patch:
--- NEW FILE fuse-2.7.0-openfix.patch ---
diff -up fuse-2.7.0/lib/fuse.c.patch1 fuse-2.7.0/lib/fuse.c
--- fuse-2.7.0/lib/fuse.c.patch1 2007-07-02 07:33:08.000000000 -0400
+++ fuse-2.7.0/lib/fuse.c 2007-08-29 17:16:54.000000000 -0400
@@ -628,16 +628,15 @@ static int fuse_compat_open(struct fuse_
{
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 -up fuse-2.7.0/lib/fuse_lowlevel.c.patch1 fuse-2.7.0/lib/fuse_lowlevel.c
--- fuse-2.7.0/lib/fuse_lowlevel.c.patch1 2007-08-29 17:17:13.000000000 -0400
+++ fuse-2.7.0/lib/fuse_lowlevel.c 2007-08-29 17:17:26.000000000 -0400
@@ -601,7 +601,7 @@ static void do_open(fuse_req_t req, fuse
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);
}
Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fuse.spec 29 Aug 2007 05:21:13 -0000 1.23
+++ fuse.spec 29 Aug 2007 21:24:37 -0000 1.24
@@ -1,6 +1,6 @@
Name: fuse
Version: 2.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: File System in Userspace (FUSE) utilities
Group: System Environment/Base
@@ -12,6 +12,7 @@
Source3: fuse-README.fedora
Patch0: fuse-udev_rules.patch
+Patch1: fuse-2.7.0-openfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kernel >= 2.6.14
Requires(pre): %{_sbindir}/groupadd
@@ -57,6 +58,7 @@
#disable device creation during build/install
sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
%patch0 -b .patch0
+%patch1 -p1 -b .patch1
cp %{SOURCE3} README.fedora
%build
@@ -142,6 +144,9 @@
%{_includedir}/fuse
%changelog
+* Wed Aug 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
+- fix open issue (bz 265321)
+
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.0-4
- Rebuild for selinux ppc32 issue.
- Previous message: rpms/pdfedit/devel pdfedit.spec, 1.5, 1.6 pdfedit-doxygen.patch, 1.1, NONE
- Next message: rpms/virt-manager/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 virt-manager.spec, 1.25, 1.26 virt-manager-0.4.0-device-remove.patch, 1.1, NONE virt-manager-0.4.0-file-dialog-fix.patch, 1.1, NONE virt-manager-0.4.0-toolbar-state.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list