Hello community, here is the log from the commit of package fuse for openSUSE:11.3 checked in at Mon Feb 28 17:49:55 CET 2011. -------- --- old-versions/11.3/UPDATES/all/fuse/fuse.changes 2010-12-02 17:22:54.000000000 +0100 +++ 11.3/fuse/fuse.changes 2011-02-21 20:00:28.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 21 15:43:30 CET 2011 - mszeredi@suse.cz + +- Re-add /etc/init.d/boot.fuse [bnc#670585] + +------------------------------------------------------------------- +Thu Feb 17 17:51:15 CET 2011 - mszeredi@suse.cz + +- In case of failure to add to /etc/mtab don't umount. [bnc#668820] + [CVE-2011-0541] + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- boot.fuse fuse-fix-cleanup-in-case-of-failed-mount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.plQr18/_old 2011-02-28 17:49:42.000000000 +0100 +++ /var/tmp/diff_new_pack.plQr18/_new 2011-02-28 17:49:42.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fuse (Version 2.8.5) +# spec file for package fuse # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,16 +21,18 @@ Name: fuse Summary: User space File System Version: 2.8.5 -Release: 2.<RELEASE4> +Release: 2.<RELEASE6> License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://sourceforge.net/projects/fuse/files/fuse-2.X/%%{version}/fuse-%%{version}.tar.gz/download Source: %{name}-%{version}.tar.bz2 +Source1: boot.fuse Source2: fuse.rpmlintrc Source3: baselibs.conf Patch: fuse-install-fix.diff Patch2: fuse-pc-remove-libdir-from-Libs.diff Patch3: fuse-umount-race-fix.patch +Patch4: fuse-fix-cleanup-in-case-of-failed-mount.patch Url: http://fuse.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: util-linux(fake+no-canonicalize) @@ -41,7 +43,7 @@ Supplements: filesystem(fuse) %endif %endif -PreReq: permissions +PreReq: %insserv_prereq permissions %description With FUSE, a user space program can export a file system through the @@ -225,6 +227,7 @@ %patch2 %endif %patch3 -p1 +%patch4 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" @@ -240,6 +243,7 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d +install -m755 -D %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/boot.fuse ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING.LIB | sed 's/ .*//') COPYING.LIB # Needed for OpenSUSE buildservice @@ -262,10 +266,19 @@ %{__rm} -rf example/.deps example/Makefile.am example/Makefile.in %post +%{insserv_force_if_yast boot.fuse} %run_permissions %verifyscript %verify_permissions -e %{_bindir}/fusermount +%preun +if ! test -f /.buildenv ; then +%stop_on_removal boot.fuse +fi + +%postun +%insserv_cleanup + %post -n libfuse2 -p /sbin/ldconfig %postun -n libfuse2 -p /sbin/ldconfig @@ -275,6 +288,7 @@ %files %defattr(-,root,root) +%config %{_sysconfdir}/init.d/boot.fuse %doc AUTHORS ChangeLog FAQ NEWS README* COPYING* %if %suse_version <= 1020 %dir %{_sysconfdir}/udev ++++++ boot.fuse ++++++ #! /bin/sh ### BEGIN INIT INFO # Provides: boot.fuse # Required-Start: # Should-Start: boot.udev $local_fs # Required-Stop: # Default-Start: B # Default-Stop: # Short-Description: Start and stop fuse. # Description: Load the fuse module and mount the fuse control # filesystem. ### END INIT INFO PATH="/sbin:/bin" MOUNTPOINT=/sys/fs/fuse/connections . /etc/rc.status case "$1" in start|restart|force-reload) if ! grep -qw fuse /proc/filesystems; then echo -n "Loading fuse module " if ! modprobe fuse >/dev/null 2>&1; then rc_status -v rc_exit fi else echo -n "Fuse filesystem already available" fi rc_status -v if grep -qw fusectl /proc/filesystems && \ ! grep -qw $MOUNTPOINT /proc/mounts; then echo -n "Mounting fuse control filesystem" mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1 else echo -n "Fuse control filesystem already available" fi rc_status -v ;; stop) if ! grep -qw fuse /proc/filesystems; then echo -n "Fuse filesystem not loaded" rc_failed 7 rc_status -v rc_exit fi if grep -qw $MOUNTPOINT /proc/mounts; then echo -n "Unmounting fuse control filesystem" umount $MOUNTPOINT >/dev/null 2>&1 else echo -n "Fuse control filesystem not mounted" fi rc_status -v ;; reload) echo -n "Reloading fuse filesystem" rc_failed 3 rc_status -v ;; status) echo -n "Checking fuse filesystem" rc_reset if ! grep -qw fuse /proc/filesystems; then rc_failed 3 fi rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" exit 1 ;; esac rc_exit ++++++ fuse-fix-cleanup-in-case-of-failed-mount.patch ++++++ --- util/fusermount.c | 1 - 1 file changed, 1 deletion(-) Index: fuse-2.7.2/util/fusermount.c =================================================================== --- fuse-2.7.2.orig/util/fusermount.c 2011-02-21 17:30:34.000000000 +0100 +++ fuse-2.7.2/util/fusermount.c 2011-02-21 17:31:11.682067022 +0100 @@ -770,7 +770,6 @@ static int mount_fuse(const char *mnt, c if (geteuid() == 0) { res = add_mount(source, mnt, type, mnt_opts); if (res == -1) { - umount2(mnt, 2); /* lazy umount */ close(fd); return -1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org