rpms/fuse/F-7 fuse-chkconfig_support.diff, NONE, 1.1 fuse-openfix.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 fuse-udev_rules.patch, 1.7, 1.8 fuse.spec, 1.25, 1.26 sources, 1.11, 1.12 fuse-README.fedora, 1.3, NONE
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Wed Feb 20 21:44:51 UTC 2008
- Previous message (by thread): rpms/fuse/F-8 fuse-chkconfig_support.diff, NONE, 1.1 fuse-openfix.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 fuse-udev_rules.patch, 1.7, 1.8 fuse.spec, 1.28, 1.29 sources, 1.11, 1.12 fuse-2.7.0-openfix.patch, 1.1, NONE fuse-README.fedora, 1.3, NONE
- Next message (by thread): rpms/ipod-sharp/devel ipod-sharp.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/extras/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6888/F-7
Modified Files:
.cvsignore fuse-udev_rules.patch fuse.spec sources
Added Files:
fuse-chkconfig_support.diff fuse-openfix.patch
Removed Files:
fuse-README.fedora
Log Message:
Ver. 2.7.3 without fuse usergroup
fuse-chkconfig_support.diff:
--- NEW FILE fuse-chkconfig_support.diff ---
--- util/init_script.patch2 2008-02-19 22:51:28.000000000 +0300
+++ util/init_script 2008-02-21 00:12:51.000000000 +0300
@@ -1,11 +1,16 @@
#! /bin/sh
+
+# Startup script for fuse
+#
+# chkconfig: 345 25 75
+
### BEGIN INIT INFO
# Provides: fuse
# Required-Start:
# Should-Start: udev
# Required-Stop:
-# Default-Start: S
-# Default-Stop:
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
# Short-Description: Start and stop fuse.
# Description: Load the fuse module and mount the fuse control
# filesystem.
fuse-openfix.patch:
--- NEW FILE fuse-openfix.patch ---
diff -up fuse-2.7.2/lib/fuse.c.BAD fuse-2.7.2/lib/fuse.c
--- lib/fuse.c 2008-01-21 09:55:42.000000000 -0500
+++ lib/fuse.c 2008-01-21 09:57:20.000000000 -0500
@@ -633,17 +633,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.2/lib/fuse_lowlevel.c.BAD fuse-2.7.2/lib/fuse_lowlevel.c
--- lib/fuse_lowlevel.c 2008-01-21 09:57:52.000000000 -0500
+++ lib/fuse_lowlevel.c 2008-01-21 09:58:15.000000000 -0500
@@ -605,7 +605,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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 22 Jul 2007 06:00:34 -0000 1.11
+++ .cvsignore 20 Feb 2008 21:44:13 -0000 1.12
@@ -1 +1 @@
-fuse-2.7.0.tar.gz
+fuse-2.7.3.tar.gz
fuse-udev_rules.patch:
Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/fuse-udev_rules.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fuse-udev_rules.patch 11 Nov 2006 06:14:37 -0000 1.7
+++ fuse-udev_rules.patch 20 Feb 2008 21:44:13 -0000 1.8
@@ -2,4 +2,4 @@
+++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100
@@ -1 +1 @@
-KERNEL=="fuse", MODE="0666"
-+KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root"
Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fuse.spec 1 Oct 2007 10:27:57 -0000 1.25
+++ fuse.spec 20 Feb 2008 21:44:13 -0000 1.26
@@ -1,39 +1,38 @@
Name: fuse
-Version: 2.7.0
-Release: 6%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: File System in Userspace (FUSE) utilities
Group: System Environment/Base
-License: GPL
+License: GPL+
URL: http://fuse.sf.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: fuse-udev.nodes
Source2: fuse-makedev.d-fuse
-Source3: fuse-README.fedora
Patch0: fuse-udev_rules.patch
+Patch1: fuse-openfix.patch
+Patch2: fuse-chkconfig_support.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kernel >= 2.6.14
Requires: which
-Requires(pre): %{_sbindir}/groupadd
-Requires(post): /sbin/MAKEDEV
-Requires(postun): %{_sbindir}/groupdel
BuildRequires: libselinux-devel
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/MAKEDEV
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun):/sbin/service
+
%description
With FUSE it is possible to implement a fully functional filesystem in a
userspace program. This package contains the FUSE userspace tools to
mount a FUSE filesystem.
-Note: For security reasons only members of the group "fuse" are allowed to
-(u)mount fuse filesystems. You can find more details on this issue in
-%{_docdir}/%{name}-%{version}/README.fedora
-
-
%package libs
Summary: File System in Userspace (FUSE) libraries
Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
%description libs
Devel With FUSE it is possible to implement a fully functional filesystem in a
@@ -45,7 +44,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
-License: LGPL
+License: LGPLv2+
%description devel
With FUSE it is possible to implement a fully functional filesystem in a
@@ -57,8 +56,9 @@
%setup -q
#disable device creation during build/install
sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-%patch0 -b .patch0
-cp %{SOURCE3} README.fedora
+%patch0 -p0 -b .patch0
+%patch1 -p0 -b .patch1
+%patch2 -p0 -b .patch2
%build
# Can't pass --disable-static here, or else the utils don't build
@@ -95,29 +95,30 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
-if [ $1 -eq 1 ]; then
- %{_sbindir}/groupadd -r fuse &>/dev/null || :
-fi
-
%post
/sbin/MAKEDEV fuse
+/sbin/chkconfig --add fuse
-%postun
+%preun
if [ $1 = 0 ]; then
- %{_sbindir}/groupdel fuse || :
+ /sbin/service fuse stop >/dev/null 2>&1
+ /sbin/chkconfig --del fuse
+fi
+
+%postun
+if [ "$1" -ge "1" ]; then
+ /sbin/service fuse condrestart >/dev/null 2>&1 || :
fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
+%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS
/sbin/mount.fuse
-%attr(4754,root,fuse) /bin/fusermount
+/bin/fusermount
/bin/ulockmgr_server
%{_sysconfdir}/init.d/fuse
%{_sysconfdir}/makedev.d/z-fuse
@@ -143,16 +144,36 @@
%{_includedir}/fuse
%changelog
+* Wed Feb 20 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.3-1
+- Ver. 2.7.3
+- Removed usergroup fuse
+- Added chkconfig support (BZ#228088)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.7.2-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-1
+- bump to 2.7.2
+- fix license tag
-* Mon Oct 1 2007 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-6
+* Sun Nov 4 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-9
+- fix initscript to work with chkconfig
+
+* Mon Oct 1 2007 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
- Added Require: which (BZ#312511)
-* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-7
- revert udev rules change
-* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-6
- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+* 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.
+
* Sun Jul 22 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
- put pkgconfig file in correct place
- enable compat symlinks for files in /bin
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 22 Jul 2007 06:00:34 -0000 1.11
+++ sources 20 Feb 2008 21:44:13 -0000 1.12
@@ -1 +1 @@
-7c3d52f81816e3a8e0cc2b5822a37e86 fuse-2.7.0.tar.gz
+98563fc7b265b7479a3178181cbcf59a fuse-2.7.3.tar.gz
--- fuse-README.fedora DELETED ---
- Previous message (by thread): rpms/fuse/F-8 fuse-chkconfig_support.diff, NONE, 1.1 fuse-openfix.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 fuse-udev_rules.patch, 1.7, 1.8 fuse.spec, 1.28, 1.29 sources, 1.11, 1.12 fuse-2.7.0-openfix.patch, 1.1, NONE fuse-README.fedora, 1.3, NONE
- Next message (by thread): rpms/ipod-sharp/devel ipod-sharp.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list