From 99790e77d11b45ce6dfe9f299d7d3f8551ec019fbe57bc8836a4797073f94322 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:16:29 +0000 Subject: [PATCH 1/7] converted link to branch OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=11 --- fuse-2.8.1.tar.bz2 | 3 --- fuse-2.8.3.tar.bz2 | 3 +++ fuse.changes | 19 +++++++++++++++++++ fuse.spec | 6 +++--- 4 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 fuse-2.8.1.tar.bz2 create mode 100644 fuse-2.8.3.tar.bz2 diff --git a/fuse-2.8.1.tar.bz2 b/fuse-2.8.1.tar.bz2 deleted file mode 100644 index e3d2185..0000000 --- a/fuse-2.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d50a2311b0d9b86a46551c1fa93a98b4dbcb1050e9828f274b6d1a03071ad678 -size 387027 diff --git a/fuse-2.8.3.tar.bz2 b/fuse-2.8.3.tar.bz2 new file mode 100644 index 0000000..b229897 --- /dev/null +++ b/fuse-2.8.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b51fa2678b9d5999664dc49fd546009bd75d820bd80d4c887e42bcff02edb376 +size 393479 diff --git a/fuse.changes b/fuse.changes index abef3cd..16a0506 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Feb 2 13:08:09 CET 2010 - mszeredi@suse.cz + +- update to 2.8.3 + * fix unmounting with util-linux version >= 2.17 + +------------------------------------------------------------------- +Wed Jan 27 10:06:13 CET 2010 - mszeredi@suse.cz + +- update to 2.8.2 + * fix unmount race (CVE-2009-3297) + * fix deadlock with "audit" subsystem on mount (also requires + util-linux-ng version >=2.17) + +------------------------------------------------------------------- +Wed Jan 6 15:14:33 CET 2010 - jengelh@medozas.de + +- package baselibs.conf + ------------------------------------------------------------------- Wed Dec 16 12:11:13 UTC 2009 - kruber@zib.de diff --git a/fuse.spec b/fuse.spec index 433253b..2058f01 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.8.1) +# spec file for package fuse (Version 2.8.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: fuse Summary: User space File System -Version: 2.8.1 -Release: 2 +Version: 2.8.3 +Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}.tar.gz From dc7dc376d4318b7f1d1f0dd513f935ce5c70e50a1638369f907ba6d651945d30 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 14:46:39 +0000 Subject: [PATCH 2/7] Updating link to change in openSUSE:Factory/fuse revision 27.0 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=592a3dfbbd13dc6f40be70ef64b41347 --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 9594825c6d422e00d06f75bf60009fb1db4a72c1a9a02f5dd88a599164104060 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 27 Apr 2010 15:51:18 +0000 Subject: [PATCH 3/7] Accepting request 38016 from home:jnweiger:branches:filesystems Copy from home:jnweiger:branches:filesystems/fuse via accept of submit request 38016 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/38016 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=12 --- fuse.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fuse.spec b/fuse.spec index 2058f01..f2638cf 100644 --- a/fuse.spec +++ b/fuse.spec @@ -258,6 +258,9 @@ done %{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* %{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h +(cd example && %{__make} clean) +%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in + %post %{insserv_force_if_yast boot.fuse} %run_permissions @@ -297,6 +300,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) +%doc example doc %{_libdir}/libfuse.so %{_includedir}/fuse.h %{_includedir}/fuse From e4cb3991d3a2ddb9339c0e746d92ab50ea84b9276719308e54a79a59e5b1ffd4 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 28 Apr 2010 07:59:32 +0000 Subject: [PATCH 4/7] Accepting request 38972 from home:mszeredi:branches:filesystems Copy from home:mszeredi:branches:filesystems/fuse via accept of submit request 38972 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/38972 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=13 --- fuse.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fuse.changes b/fuse.changes index 16a0506..136aa64 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 28 09:26:51 CEST 2010 - mszeredi@suse.cz + +- keep examples and internal docs in devel package (from jnweiger) + ------------------------------------------------------------------- Tue Feb 2 13:08:09 CET 2010 - mszeredi@suse.cz From 6bc35b598a09a18a67688845f46c131f0e7d3463ead0e8f430bc4b16c07908ac Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 7 May 2010 09:59:09 +0000 Subject: [PATCH 5/7] - update to 2.8.4 * fix checking for symlinks in umount from /tmp * fix umounting if /tmp is a symlink OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=14 --- fuse-2.8.3.tar.bz2 | 3 --- fuse-2.8.4.tar.bz2 | 3 +++ fuse.changes | 7 +++++++ fuse.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 fuse-2.8.3.tar.bz2 create mode 100644 fuse-2.8.4.tar.bz2 diff --git a/fuse-2.8.3.tar.bz2 b/fuse-2.8.3.tar.bz2 deleted file mode 100644 index b229897..0000000 --- a/fuse-2.8.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b51fa2678b9d5999664dc49fd546009bd75d820bd80d4c887e42bcff02edb376 -size 393479 diff --git a/fuse-2.8.4.tar.bz2 b/fuse-2.8.4.tar.bz2 new file mode 100644 index 0000000..b2a1559 --- /dev/null +++ b/fuse-2.8.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4dd62801e0c3a2c976b03a9639558b100b4082a65c3f36535b534a35d76c482 +size 393501 diff --git a/fuse.changes b/fuse.changes index 136aa64..e5af8dc 100644 --- a/fuse.changes +++ b/fuse.changes @@ -3,6 +3,13 @@ Wed Apr 28 09:26:51 CEST 2010 - mszeredi@suse.cz - keep examples and internal docs in devel package (from jnweiger) +------------------------------------------------------------------- +Mon Apr 26 15:39:52 CEST 2010 - mszeredi@suse.cz + +- update to 2.8.4 + * fix checking for symlinks in umount from /tmp + * fix umounting if /tmp is a symlink + ------------------------------------------------------------------- Tue Feb 2 13:08:09 CET 2010 - mszeredi@suse.cz diff --git a/fuse.spec b/fuse.spec index f2638cf..939ece1 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.8.3) +# spec file for package fuse (Version 2.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: fuse Summary: User space File System -Version: 2.8.3 +Version: 2.8.4 Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems From da94e54d3f9a055af96a93f0efa5c2e4a04778798600695a687cbc06b08883eb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 7 May 2010 13:43:02 +0000 Subject: [PATCH 6/7] Accepting request 39611 from filesystems checked in (request 39611) OBS-URL: https://build.opensuse.org/request/show/39611 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=15 --- fuse.changes | 5 ----- fuse.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/fuse.changes b/fuse.changes index e5af8dc..5837010 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 28 09:26:51 CEST 2010 - mszeredi@suse.cz - -- keep examples and internal docs in devel package (from jnweiger) - ------------------------------------------------------------------- Mon Apr 26 15:39:52 CEST 2010 - mszeredi@suse.cz diff --git a/fuse.spec b/fuse.spec index 939ece1..970e467 100644 --- a/fuse.spec +++ b/fuse.spec @@ -258,9 +258,6 @@ done %{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* %{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h -(cd example && %{__make} clean) -%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in - %post %{insserv_force_if_yast boot.fuse} %run_permissions @@ -300,7 +297,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) -%doc example doc %{_libdir}/libfuse.so %{_includedir}/fuse.h %{_includedir}/fuse From 98b3d25299f555b782b347a57a37c757c805b9bbaf5f2353ca88c19f0129b82b Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 28 Oct 2010 08:49:26 +0000 Subject: [PATCH 7/7] Accepting request 51522 from home:mszeredi:branches:filesystems OBS-URL: https://build.opensuse.org/request/show/51522 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=16 --- boot.fuse | 74 ------------------------------------------- fuse-2.8.4.tar.bz2 | 3 -- fuse-2.8.5.tar.bz2 | 3 ++ fuse-install-fix.diff | 16 ++++------ fuse.changes | 16 ++++++++++ fuse.rpmlintrc | 9 ------ fuse.spec | 31 +++++++----------- 7 files changed, 37 insertions(+), 115 deletions(-) delete mode 100644 boot.fuse delete mode 100644 fuse-2.8.4.tar.bz2 create mode 100644 fuse-2.8.5.tar.bz2 diff --git a/boot.fuse b/boot.fuse deleted file mode 100644 index a419bf6..0000000 --- a/boot.fuse +++ /dev/null @@ -1,74 +0,0 @@ -#! /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 diff --git a/fuse-2.8.4.tar.bz2 b/fuse-2.8.4.tar.bz2 deleted file mode 100644 index b2a1559..0000000 --- a/fuse-2.8.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4dd62801e0c3a2c976b03a9639558b100b4082a65c3f36535b534a35d76c482 -size 393501 diff --git a/fuse-2.8.5.tar.bz2 b/fuse-2.8.5.tar.bz2 new file mode 100644 index 0000000..789ad34 --- /dev/null +++ b/fuse-2.8.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11c9c14dfb0f6ef251be83ba6b9c9c6bf973431d7f05290deb4fd382ef88ab40 +size 395506 diff --git a/fuse-install-fix.diff b/fuse-install-fix.diff index d57d82e..aa6f431 100644 --- a/fuse-install-fix.diff +++ b/fuse-install-fix.diff @@ -1,10 +1,9 @@ ---- util/Makefile.in.orig 2009-09-07 00:26:57.000000000 +0200 -+++ util/Makefile.in 2009-09-07 00:27:50.000000000 +0200 -@@ -541,27 +541,14 @@ +--- util/Makefile.in.orig 2010-09-28 11:23:54.000000000 +0200 ++++ util/Makefile.in 2010-09-28 11:59:48.000000000 +0200 +@@ -583,26 +583,14 @@ uninstall-am: uninstall-binPROGRAMS unin install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -28,14 +27,13 @@ uninstall-local: rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse ---- util/Makefile.am.orig 2009-09-07 00:26:13.000000000 +0200 -+++ util/Makefile.am 2009-09-07 00:27:36.000000000 +0200 -@@ -13,15 +13,6 @@ +--- util/Makefile.am.orig 2010-09-28 10:03:09.000000000 +0200 ++++ util/Makefile.am 2010-09-28 11:59:48.000000000 +0200 +@@ -13,14 +13,6 @@ ulockmgr_server_SOURCES = ulockmgr_serve ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT ulockmgr_server_LDFLAGS = -pthread -install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -46,7 +44,7 @@ EXTRA_DIST = udev.rules init_script MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@ -@@ -33,14 +24,8 @@ +@@ -32,14 +24,8 @@ install-exec-local: $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse diff --git a/fuse.changes b/fuse.changes index 5837010..925d148 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Oct 27 15:34:16 CEST 2010 - mszeredi@suse.cz + +- Remove /etc/init.d/boot.fuse [bnc#648843] + +------------------------------------------------------------------- +Tue Sep 28 11:52:41 CEST 2010 - mszeredi@suse.cz + +- update to 2.8.5 + * fix option escaping for fusermount [bnc#641480] + +------------------------------------------------------------------- +Wed Apr 28 09:26:51 CEST 2010 - mszeredi@suse.cz + +- keep examples and internal docs in devel package (from jnweiger) + ------------------------------------------------------------------- Mon Apr 26 15:39:52 CEST 2010 - mszeredi@suse.cz diff --git a/fuse.rpmlintrc b/fuse.rpmlintrc index b904743..69bb51d 100644 --- a/fuse.rpmlintrc +++ b/fuse.rpmlintrc @@ -11,14 +11,5 @@ from Config import * # addFilter("fuse non-remote_fs-dependency") -# rpmlint message: -# The init script name should be the same as the package name in lower case, -# one with 'd' appended if it invokes a process by that name. -# -# /etc/init.d/boot.fuse is fine, no daemon is started, just a module is -# loaded (and udev creates the device) and a kernel filesystem is mounted: -# -addFilter("fuse incoherent-init-script-name") - # Everything moved away, so it got small but the docs are not huge: addFilter("fuse package-with-huge-docs") diff --git a/fuse.spec b/fuse.spec index 970e467..2b92774 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.8.4) +# spec file for package fuse (Version 2.8.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,12 @@ Name: fuse Summary: User space File System -Version: 2.8.4 +Version: 2.8.5 Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems -# http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}.tar.gz +# 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 @@ -34,13 +33,13 @@ Patch2: fuse-pc-remove-libdir-from-Libs.diff Url: http://fuse.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: licenses -BuildRequires: licenses +BuildRequires: licenses pkg-config %if 0%{?suse_version} %if 0%{?suse_version} >= 1000 Supplements: filesystem(fuse) %endif %endif -PreReq: %insserv_prereq permissions +PreReq: permissions %description With FUSE, a user space program can export a file system through the @@ -225,12 +224,11 @@ Authors: %endif %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" %configure --with-pic \ --with-pkgconfigdir=%{_libdir}/pkgconfig \ --exec-prefix=/ \ --libdir=/%{_lib} \ - --disable-kernel-module \ --enable-lib \ --enable-util \ --enable-example @@ -239,7 +237,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %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 @@ -258,19 +255,13 @@ done %{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* %{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h +(cd example && %{__make} clean) +%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in + %post -%{insserv_force_if_yast boot.fuse} %run_permissions %verifyscript -%verify_permissions -e %{usrbindir}/fusermount - -%preun -if ! test -f /.buildenv ; then -%stop_on_removal boot.fuse -fi - -%postun -%insserv_cleanup +%verify_permissions -e %{_bindir}/fusermount %post -n libfuse2 -p /sbin/ldconfig @@ -281,7 +272,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%config %{_sysconfdir}/init.d/boot.fuse %doc AUTHORS ChangeLog FAQ NEWS README* COPYING* %if %suse_version <= 1020 %dir %{_sysconfdir}/udev @@ -297,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) +%doc example doc %{_libdir}/libfuse.so %{_includedir}/fuse.h %{_includedir}/fuse