From b0fa420aad5ca2f9f5605848a22e6b39f49be17eb469a4492ad456ea5cccf784 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 23 Apr 2012 15:02:46 +0000 Subject: [PATCH] Accepting request 114939 from home:puzel:branches:filesystems - update to 2.9.0 - Add "zero copy" support for kernel 2.6.35 or newer - Make maximum background requests tunable on kernel 2.6.32 or newer - Require --no-canonicalize in (u)mount (util-linux version 2.18 or newer) to fix security problems with fusermount - Use dynamically sized hash tables in high level library - Memory use of filesystem daemon can shrink more easily - Add "auto_unmount" option - Add "remember" option - Add man pages for fusermount, mount.fuse and ulockmgr_server - API changes: - Introduce "store" and "retrieve" for accessing kernel buffers on kernel 2.6.36 or newer - Introduce abstract buffer for zero copy operations - Allow path calculation to be omitted on certain operations - Allow batching forget requests - Add "flock" method - Add support for ioctl on directories - Add delete notification - drop fuse-pc-remove-libdir-from-Libs.diff (upstream) OBS-URL: https://build.opensuse.org/request/show/114939 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=34 --- fuse-2.8.7.tar.bz2 | 3 --- fuse-2.9.0.tar.gz | 3 +++ fuse-gnu_source.patch | 4 +++- fuse-install-fix.diff | 20 ++++++++++++-------- fuse-pc-remove-libdir-from-Libs.diff | 9 --------- fuse.changes | 25 +++++++++++++++++++++++++ fuse.spec | 26 +++++++++++--------------- fusermount-compile-as-pie.patch | 21 ++++++++++----------- 8 files changed, 64 insertions(+), 47 deletions(-) delete mode 100644 fuse-2.8.7.tar.bz2 create mode 100644 fuse-2.9.0.tar.gz delete mode 100644 fuse-pc-remove-libdir-from-Libs.diff diff --git a/fuse-2.8.7.tar.bz2 b/fuse-2.8.7.tar.bz2 deleted file mode 100644 index 97e8d25..0000000 --- a/fuse-2.8.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd9b14ce4e593be9f69f5f0e3dd5c187c5f1c322092d7fda3572e8c393660b09 -size 429969 diff --git a/fuse-2.9.0.tar.gz b/fuse-2.9.0.tar.gz new file mode 100644 index 0000000..fdbe89a --- /dev/null +++ b/fuse-2.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bf669e5388d4f256c7875079d5a6b97837bad23eb77a1cbc8b54b46a88315f2 +size 558554 diff --git a/fuse-gnu_source.patch b/fuse-gnu_source.patch index cb907d2..4c80149 100644 --- a/fuse-gnu_source.patch +++ b/fuse-gnu_source.patch @@ -1,6 +1,8 @@ +Index: configure.in +=================================================================== --- configure.in.orig +++ configure.in -@@ -5,7 +5,9 @@ AM_INIT_AUTOMAKE +@@ -6,7 +6,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R AM_CONFIG_HEADER(include/config.h) AC_PROG_LIBTOOL diff --git a/fuse-install-fix.diff b/fuse-install-fix.diff index aa6f431..09e7c3c 100644 --- a/fuse-install-fix.diff +++ b/fuse-install-fix.diff @@ -1,7 +1,9 @@ ---- 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 - +Index: util/Makefile.in +=================================================================== +--- util/Makefile.in.orig ++++ util/Makefile.in +@@ -640,26 +640,14 @@ mount_util.c: $(top_srcdir)/lib/mount_ut + @cp $(top_srcdir)/lib/mount_util.c . install-exec-hook: - -chmod u+s $(DESTDIR)$(bindir)/fusermount @@ -27,9 +29,11 @@ uninstall-local: rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse ---- 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 +Index: util/Makefile.am +=================================================================== +--- util/Makefile.am.orig ++++ util/Makefile.am +@@ -20,14 +20,6 @@ ulockmgr_server_SOURCES = ulockmgr_serve ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT ulockmgr_server_LDFLAGS = -pthread @@ -44,7 +48,7 @@ EXTRA_DIST = udev.rules init_script MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@ -@@ -32,14 +24,8 @@ install-exec-local: +@@ -39,14 +31,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-pc-remove-libdir-from-Libs.diff b/fuse-pc-remove-libdir-from-Libs.diff deleted file mode 100644 index 4154a4f..0000000 --- a/fuse-pc-remove-libdir-from-Libs.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- fuse.pc.in -+++ fuse.pc.in -@@ -6,5 +6,5 @@ - Name: fuse - Description: Filesystem in Userspace - Version: @VERSION@ --Libs: -L${libdir} -lfuse @libfuse_libs@ -+Libs: -lfuse @libfuse_libs@ - Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64 diff --git a/fuse.changes b/fuse.changes index a57e0c0..f56d336 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sun Apr 22 10:31:21 UTC 2012 - puzel@suse.com + +- update to 2.9.0 + - Add "zero copy" support for kernel 2.6.35 or newer + - Make maximum background requests tunable on kernel 2.6.32 or + newer + - Require --no-canonicalize in (u)mount (util-linux version 2.18 + or newer) to fix security problems with fusermount + - Use dynamically sized hash tables in high level library + - Memory use of filesystem daemon can shrink more easily + - Add "auto_unmount" option + - Add "remember" option + - Add man pages for fusermount, mount.fuse and ulockmgr_server + - API changes: + - Introduce "store" and "retrieve" for accessing kernel + buffers on kernel 2.6.36 or newer + - Introduce abstract buffer for zero copy operations + - Allow path calculation to be omitted on certain operations + - Allow batching forget requests + - Add "flock" method + - Add support for ioctl on directories + - Add delete notification +- drop fuse-pc-remove-libdir-from-Libs.diff (upstream) + ------------------------------------------------------------------- Wed Jan 25 19:57:36 CET 2012 - mszeredi@suse.cz diff --git a/fuse.spec b/fuse.spec index fbd7c5b..b2f4cc2 100644 --- a/fuse.spec +++ b/fuse.spec @@ -15,21 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: fuse Summary: User space File System -Version: 2.8.7 -Release: 10 License: GPL-2.0+ ; LGPL-2.1+ Group: System/Filesystems +Version: 2.9.0 +Release: 0 # http://sourceforge.net/projects/fuse/files/fuse-2.X/%%{version}/fuse-%%{version}.tar.gz/download -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz Source2: fuse.rpmlintrc Source3: baselibs.conf Patch: fuse-install-fix.diff -Patch2: fuse-pc-remove-libdir-from-Libs.diff Patch3: fuse-gnu_source.patch Patch4: fusermount-compile-as-pie.patch Url: http://fuse.sourceforge.net @@ -39,8 +36,8 @@ Requires: util-linux >= 2.18 %else Requires: util-linux(fake+no-canonicalize) %endif -BuildRequires: pkgconfig BuildRequires: libtool +BuildRequires: pkgconfig %if 0%{?suse_version} >= 0 && 0%{?suse_version} >= 1000 Supplements: filesystem(fuse) %endif @@ -87,7 +84,6 @@ Authors: Miklos Szeredi %package -n libulockmgr1 -License: GPL-2.0+ ; LGPL-2.1+ Summary: Library of FUSE, the User space File System for GNU/Linux and BSD Group: System/Filesystems @@ -133,7 +129,6 @@ Authors: Miklos Szeredi %package -n libfuse2 -License: GPL-2.0+ ; LGPL-2.1+ Summary: Library of FUSE, the User space File System for GNU/Linux and BSD Group: System/Filesystems @@ -179,10 +174,11 @@ Authors: Miklos Szeredi %package devel -License: GPL-2.0+ ; LGPL-2.1+ Summary: Development package for FUSE (userspace filesystem) modules Group: Development/Languages/C and C++ -Requires: fuse = %{version} libfuse2 = %{version} glibc-devel +Requires: fuse = %{version} +Requires: glibc-devel +Requires: libfuse2 = %{version} Requires: libulockmgr1 = %{version} %description devel @@ -224,7 +220,6 @@ Authors: Miklos Szeredi %package devel-static -License: GPL-2.0+ ; LGPL-2.1+ Summary: Development package for FUSE (userspace filesystem) modules Group: Development/Languages/C and C++ Requires: fuse-devel = %{version} @@ -271,9 +266,6 @@ Authors: %prep %setup -q %patch -%if "%{_exec_prefix}" == "/" || "%{_exec_prefix}" == "/usr" -%patch2 -%endif %patch3 %patch4 -p1 @@ -307,6 +299,7 @@ done (cd example && %{__make} clean) %{__rm} -rf example/.deps example/Makefile.am example/Makefile.in +%{__rm} -rf doc/Makefile.am doc/Makefile.in doc/Makefile %post %if 0%{?suse_version} >= 1140 @@ -339,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT %verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount /sbin/mount.fuse %{_bindir}/ulockmgr_server +%{_mandir}/man1/fusermount.1.* +%{_mandir}/man1/ulockmgr_server.1.* +%{_mandir}/man8/mount.fuse.8.* %files -n libfuse2 %defattr(-,root,root) diff --git a/fusermount-compile-as-pie.patch b/fusermount-compile-as-pie.patch index 741cb04..2c6cafa 100644 --- a/fusermount-compile-as-pie.patch +++ b/fusermount-compile-as-pie.patch @@ -1,14 +1,13 @@ -Index: fuse-2.8.7/util/Makefile.am +Index: fuse-2.9.0/util/Makefile.am =================================================================== ---- fuse-2.8.7.orig/util/Makefile.am 2012-01-25 19:13:34.000000000 +0100 -+++ fuse-2.8.7/util/Makefile.am 2012-01-25 19:16:02.231609707 +0100 -@@ -7,6 +7,9 @@ noinst_PROGRAMS = mount.fuse - fusermount_SOURCES = fusermount.c - fusermount_LDADD = ../lib/mount_util.lo - fusermount_CPPFLAGS = -I../lib +--- fuse-2.9.0.orig/util/Makefile.am ++++ fuse-2.9.0/util/Makefile.am +@@ -10,6 +10,8 @@ noinst_PROGRAMS = mount.fuse + # copying it over. + fusermount_SOURCES = fusermount.c mount_util.c + fusermount_CPPFLAGS = -I$(top_srcdir)/lib +fusermount_CFLAGS = -fPIE $(AM_CFLAGS) +fusermount_LDFLAGS = -pie $(AM_LDFLAGS) -+ - mount_fuse_SOURCES = mount.fuse.c - - ulockmgr_server_SOURCES = ulockmgr_server.c + BUILT_SOURCES = mount_util.c + mount_util.c: $(top_srcdir)/lib/mount_util.c + @cp $(top_srcdir)/lib/mount_util.c .