pool/fuse
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 51522 from home:mszeredi:branches:filesystems

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/51522
OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=16
This commit is contained in:
Miklos Szeredi 2010-10-28 08:49:26 +00:00 committed by Git OBS Bridge
parent da94e54d3f
commit 98b3d25299
7 changed files with 37 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
boot.fuse
View File

@ -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

3
fuse-2.8.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4dd62801e0c3a2c976b03a9639558b100b4082a65c3f36535b534a35d76c482
size 393501

3
fuse-2.8.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11c9c14dfb0f6ef251be83ba6b9c9c6bf973431d7f05290deb4fd382ef88ab40
size 395506

16
fuse-install-fix.diff
View File

@ -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

16
fuse.changes
View File

@ -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

9
fuse.rpmlintrc
View File

@ -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")

31
fuse.spec
View File

@ -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