Hello community,
here is the log from the commit of package fuse
checked in at Fri May 4 00:28:46 CEST 2007.
--------
--- fuse/fuse.changes 2007-02-09 01:08:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2007-05-02 14:11:35.044799000 +0200
@@ -1,0 +2,10 @@
+Wed May 2 14:02:28 CEST 2007 - mszeredi@suse.de
+
+- updated to version 2.6.5
+ * mount.fuse script fixes
+ * fix exiting on umount for filesystems which block SIGHUP
+- udev rule for fuse device is now in udev package
+- don't remove fuse module in the init-script
+- use 'fusectl' as the filesystem source
+
+-------------------------------------------------------------------
Old:
----
fuse-2.6.3.tar.bz2
New:
----
fuse-2.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fuse.spec ++++++
--- /var/tmp/diff_new_pack.T30179/_old 2007-05-04 00:28:28.000000000 +0200
+++ /var/tmp/diff_new_pack.T30179/_new 2007-05-04 00:28:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fuse (Version 2.6.3)
+# spec file for package fuse (Version 2.6.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
Name: fuse
Summary: Userspace File System
-Version: 2.6.3
-Release: 3
+Version: 2.6.5
+Release: 1
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Filesystems
Source: %{name}-%{version}.tar.bz2
@@ -96,9 +96,6 @@
%doc AUTHORS COPYING* ChangeLog FAQ NEWS README*
%{_libdir}/lib*.so.*
%verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/udev/rules.d/99-fuse.rules
/sbin/mount.fuse
%{_bindir}/ulockmgr_server
@@ -111,7 +108,14 @@
%{_includedir}/ulockmgr.h
%{_libdir}/pkgconfig/*.pc
-%changelog -n fuse
+%changelog
+* Wed May 02 2007 - mszeredi@suse.de
+- updated to version 2.6.5
+ * mount.fuse script fixes
+ * fix exiting on umount for filesystems which block SIGHUP
+- udev rule for fuse device is now in udev package
+- don't remove fuse module in the init-script
+- use 'fusectl' as the filesystem source
* Fri Feb 09 2007 - ro@suse.de
- change fillup_and_insserv to insserv_force_if_yast in post-script
(there is no sysconfig file involved here)
++++++ boot.fuse ++++++
--- fuse/boot.fuse 2007-02-07 16:37:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/fuse/boot.fuse 2007-05-02 14:09:16.962014000 +0200
@@ -34,7 +34,7 @@
if grep -qw fusectl /proc/filesystems && \
! grep -qw $MOUNTPOINT /proc/mounts; then
echo -n "Mounting fuse control filesystem"
- mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1
+ mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1
else
echo -n "Fuse control filesystem already available"
fi
@@ -54,13 +54,6 @@
echo -n "Fuse control filesystem not mounted"
fi
rc_status -v
- if grep -qw "^fuse" /proc/modules; then
- echo -n "Unloading fuse module"
- rmmod fuse >/dev/null 2>&1
- else
- echo -n "Fuse module not loaded"
- fi
- rc_status -v
;;
reload)
echo -n "Reloading fuse filesystem"
++++++ fuse-2.6.3.tar.bz2 -> fuse-2.6.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/ChangeLog new/fuse-2.6.5/ChangeLog
--- old/fuse-2.6.3/ChangeLog 2007-02-04 14:46:11.000000000 +0100
+++ new/fuse-2.6.5/ChangeLog 2007-04-29 11:05:29.000000000 +0200
@@ -1,3 +1,54 @@
+2007-04-28 Miklos Szeredi
+
+ * Released 2.6.5
+
+2007-04-28 Miklos Szeredi
+
+ * Fix in typo in mount.fuse. Reported by Jakub Moc
+
+2007-04-27 Miklos Szeredi
+
+ * Released 2.6.4
+
+2007-04-26 Miklos Szeredi
+
+ * Ublock SIGHUP in multithreaded loop, since it's needed for
+ exiting on unmount. Reported by Elena
+
+2007-04-18 Miklos Szeredi
+
+ * Use patch from Debian Bug#413403 to fix problems with bash in
+ mount.fuse
+
+2007-04-15 Miklos Szeredi
+
+ * Add -lulockmgr to compilation comment in fusexmp_fh.c
+
+2007-04-05 Miklos Szeredi
+
+ * mount.fuse should handle spaces in paths. Debian Bug#417834.
+ Reported by Alexander Blazej
+
+ * Use "fusectl" as the device for the fusectl filesystem. Debian
+ Bug#417945. Reported by Laurent Bonnaud
+
+2007-03-05 Miklos Szeredi
+
+ * mount.fuse should use /bin/bash. Debian Bug#413403. Reported
+ by Thomas Weinbrenner
+
+2007-02-26 Miklos Szeredi
+
+ * Fix detection of installed fuse in init script. Reported and
+ fix suggested by Davide Canova
+
+2007-02-05 Miklos Szeredi
+
+ * Fix 2.6.9 RHEL kernels, which have compatibility mutex.h, but
+ don't define mutex_destroy(), bummer. Patch from Phil Schwan
+
+ * Fix option parsing in mount.fuse. Patch from Jens M. Noedler
+
2007-02-04 Miklos Szeredi
* Released 2.6.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/configure new/fuse-2.6.5/configure
--- old/fuse-2.6.3/configure 2007-02-04 15:30:48.000000000 +0100
+++ new/fuse-2.6.5/configure 2007-04-29 11:13:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse 2.6.3.
+# Generated by GNU Autoconf 2.61 for fuse 2.6.5.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -721,8 +721,8 @@
# Identity of this package.
PACKAGE_NAME='fuse'
PACKAGE_TARNAME='fuse'
-PACKAGE_VERSION='2.6.3'
-PACKAGE_STRING='fuse 2.6.3'
+PACKAGE_VERSION='2.6.5'
+PACKAGE_STRING='fuse 2.6.5'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1386,7 +1386,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fuse 2.6.3 to adapt to many kinds of systems.
+\`configure' configures fuse 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fuse 2.6.3:";;
+ short | recursive ) echo "Configuration of fuse 2.6.5:";;
esac
cat <<\_ACEOF
@@ -1558,7 +1558,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fuse configure 2.6.3
+fuse configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1572,7 +1572,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fuse $as_me 2.6.3, which was
+It was created by fuse $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2368,7 +2368,7 @@
# Define the identity of the package.
PACKAGE='fuse'
- VERSION='2.6.3'
+ VERSION='2.6.5'
cat >>confdefs.h <<_ACEOF
@@ -12053,7 +12053,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fuse $as_me 2.6.3, which was
+This file was extended by fuse $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12106,7 +12106,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fuse config.status 2.6.3
+fuse config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/configure.in new/fuse-2.6.5/configure.in
--- old/fuse-2.6.3/configure.in 2007-02-04 01:10:25.000000000 +0100
+++ new/fuse-2.6.5/configure.in 2007-04-29 11:05:35.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.6.3)
+AC_INIT(fuse, 2.6.5)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(include/config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/example/fusexmp_fh.c new/fuse-2.6.5/example/fusexmp_fh.c
--- old/fuse-2.6.3/example/fusexmp_fh.c 2006-12-09 19:51:13.000000000 +0100
+++ new/fuse-2.6.5/example/fusexmp_fh.c 2007-04-15 21:31:57.000000000 +0200
@@ -5,7 +5,7 @@
This program can be distributed under the terms of the GNU GPL.
See the file COPYING.
- gcc -Wall `pkg-config fuse --cflags --libs` fusexmp_fh.c -o fusexmp_fh
+ gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
*/
#define FUSE_USE_VERSION 26
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/configure new/fuse-2.6.5/kernel/configure
--- old/fuse-2.6.3/kernel/configure 2007-02-04 15:30:25.000000000 +0100
+++ new/fuse-2.6.5/kernel/configure 2007-04-29 11:12:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse-kernel 2.6.3.
+# Generated by GNU Autoconf 2.61 for fuse-kernel 2.6.5.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='fuse-kernel'
PACKAGE_TARNAME='fuse-kernel'
-PACKAGE_VERSION='2.6.3'
-PACKAGE_STRING='fuse-kernel 2.6.3'
+PACKAGE_VERSION='2.6.5'
+PACKAGE_STRING='fuse-kernel 2.6.5'
PACKAGE_BUGREPORT=''
ac_subst_vars='SHELL
@@ -1130,7 +1130,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fuse-kernel 2.6.3 to adapt to many kinds of systems.
+\`configure' configures fuse-kernel 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1191,7 +1191,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fuse-kernel 2.6.3:";;
+ short | recursive ) echo "Configuration of fuse-kernel 2.6.5:";;
esac
cat <<\_ACEOF
@@ -1266,7 +1266,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fuse-kernel configure 2.6.3
+fuse-kernel configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1280,7 +1280,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fuse-kernel $as_me 2.6.3, which was
+It was created by fuse-kernel $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2473,7 +2473,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fuse-kernel $as_me 2.6.3, which was
+This file was extended by fuse-kernel $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2522,7 +2522,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fuse-kernel config.status 2.6.3
+fuse-kernel config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/configure.ac new/fuse-2.6.5/kernel/configure.ac
--- old/fuse-2.6.3/kernel/configure.ac 2007-02-04 14:25:22.000000000 +0100
+++ new/fuse-2.6.5/kernel/configure.ac 2007-04-29 11:05:44.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.6.3)
+AC_INIT(fuse-kernel, 2.6.5)
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/fuse_i.h new/fuse-2.6.5/kernel/fuse_i.h
--- old/fuse-2.6.3/kernel/fuse_i.h 2007-02-04 14:27:57.000000000 +0100
+++ new/fuse-2.6.5/kernel/fuse_i.h 2007-02-05 09:08:48.000000000 +0100
@@ -67,6 +67,10 @@
#define mutex semaphore
#endif
#ifndef HAVE_I_MUTEX
+#ifndef mutex_destroy
+/* Some RHEL kernels include a backported mutex.h, which lacks mutex_destroy */
+#define mutex_destroy(m) do { } while (0)
+#endif
#define i_mutex i_sem /* Hack for struct inode */
#endif
#ifndef KERNEL_2_6_19_PLUS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/fuse_loop_mt.c new/fuse-2.6.5/lib/fuse_loop_mt.c
--- old/fuse-2.6.3/lib/fuse_loop_mt.c 2006-12-09 19:51:14.000000000 +0100
+++ new/fuse-2.6.5/lib/fuse_loop_mt.c 2007-04-26 18:00:13.000000000 +0200
@@ -182,6 +182,13 @@
err = fuse_start_thread(&mt);
pthread_mutex_unlock(&mt.lock);
if (!err) {
+ sigset_t set;
+
+ /* We need SIGHUP for exiting */
+ sigemptyset(&set);
+ sigaddset(&set, SIGHUP);
+ pthread_sigmask(SIG_UNBLOCK, &set, NULL);
+
while (!fuse_session_exited(se))
pause();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/Makefile.am new/fuse-2.6.5/lib/Makefile.am
--- old/fuse-2.6.3/lib/Makefile.am 2007-02-04 01:29:48.000000000 +0100
+++ new/fuse-2.6.5/lib/Makefile.am 2007-04-29 11:05:56.000000000 +0200
@@ -26,7 +26,7 @@
helper.c \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:3 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:5 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
libulockmgr_la_SOURCES = ulockmgr.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/Makefile.in new/fuse-2.6.5/lib/Makefile.in
--- old/fuse-2.6.3/lib/Makefile.in 2007-02-04 15:31:02.000000000 +0100
+++ new/fuse-2.6.5/lib/Makefile.in 2007-04-29 11:13:27.000000000 +0200
@@ -219,7 +219,7 @@
helper.c \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:3 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:5 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
libulockmgr_la_SOURCES = ulockmgr.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/util/init_script new/fuse-2.6.5/util/init_script
--- old/fuse-2.6.3/util/init_script 2006-10-01 15:46:02.000000000 +0200
+++ new/fuse-2.6.5/util/init_script 2007-04-05 20:37:37.000000000 +0200
@@ -12,7 +12,7 @@
MOUNTPOINT=/sys/fs/fuse/connections
# Gracefully exit if the package has been removed.
-test -x `which fusermount` || exit 0
+which fusermount &>/dev/null || exit 0
error()
{
@@ -28,7 +28,7 @@
fi
if grep -qw fusectl /proc/filesystems && \
! grep -qw $MOUNTPOINT /proc/mounts; then
- mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
+ mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1 || \
error "mounting control filesystem"
fi
echo "done."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/util/mount.fuse new/fuse-2.6.5/util/mount.fuse
--- old/fuse-2.6.3/util/mount.fuse 2006-12-09 19:51:15.000000000 +0100
+++ new/fuse-2.6.5/util/mount.fuse 2007-04-29 09:23:21.000000000 +0200
@@ -6,7 +6,7 @@
# to kick me to the right way
#
-VERSION="0.0.1"
+VERSION="0.0.2"
PRGNAME=`basename $0`
if [ -z "$HOME" ]; then
@@ -20,8 +20,8 @@
example: ${PRGNAME} sshfs#root@tux:/ /mnt/tuxssh -o rw
"
-function die {
- echo -e "$PRGNAME# $1" >&2
+die() {
+ echo "$PRGNAME# $1" >&2
[ -z "$2" ] && exit 128
exit "$2"
}
@@ -45,8 +45,20 @@
shift
shift
-ignore_opts='\(user\|nouser\|users\|auto\|noauto\|_netdev\)'
-
-OPTIONS=`echo $@ | sed "s/,${ignore_opts}\|${ignore_opts},//g"`
-
-${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}
+# loop over each mount option and skip all that should be ignored
+IFS=","
+for OPT in $@; do
+ OPT=`echo $OPT | sed "s/^\(-o\|user\|nouser\|users\|auto\|noauto\|_netdev\)$/IGNORE/"`
+ if [ "$OPT" == "IGNORE" ]; then continue; fi
+ OPTIONS="$OPTIONS$OPT,"
+done
+IFS=" "
+
+# add "-o " and remove trailing comma
+OPTIONS="-o `echo $OPTIONS | sed "s/,$//"`"
+
+if test -z "$MOUNTPATH"; then
+ "${FSTYPE}" "${MOUNTPOINT}" ${OPTIONS}
+else
+ "${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
