I have made the following changes intended for : CE:Utils / fuse CE:Utils / utfs
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/4838 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4838: Messages from BOSS: State: review at 2012-05-16T07:44:24 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Utils / fuse -> CE:Utils / fuse changes files: -------------- --- fuse.changes +++ fuse.changes @@ -0,0 +1,4 @@ +* Wed May 16 2012 Marko Saukko <[email protected]> - 2.9.0 +- Update to version 2.9.0 +- Dropped makedev.d files 99-fuse.nodes and z-fuse. + old: ---- 06-clone_newns.patch 99-fuse.nodes fuse-2.8.6.tar.gz fuse-openfix.patch z-fuse new: ---- fuse-0001-More-parentheses.patch fuse-2.9.0.tar.gz fuse.conf spec files: ----------- --- fuse.spec +++ fuse.spec @@ -7,18 +7,16 @@ Name: fuse Summary: File System in Userspace (FUSE) utilities -Version: 2.8.6 +Version: 2.9.0 Release: 1 Group: System/Base License: LGPLv2+ URL: http://fuse.sf.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: 99-fuse.nodes -Source2: z-fuse +Source1: %{name}.conf Source100: fuse.yaml Patch0: fuse-udev_rules.patch -Patch1: fuse-openfix.patch -Patch2: 06-clone_newns.patch +Patch1: fuse-0001-More-parentheses.patch Requires: which @@ -58,10 +56,8 @@ # fuse-udev_rules.patch %patch0 -p1 -# fuse-openfix.patch +# fuse-0001-More-parentheses.patch %patch1 -p1 -# 06-clone_newns.patch -%patch2 -p1 # >> setup # << setup @@ -71,9 +67,9 @@ # << build pre %configure --disable-static \ - --disable-kernel-module \ --bindir=/bin \ - --exec-prefix=/ + --exec-prefix=/ \ + --enable-example make %{?jobs:-j%jobs} @@ -84,13 +80,16 @@ # >> install pre # << install pre %make_install -mkdir -p %{buildroot}/lib/udev/makedev.d -cp -a %{SOURCE1} %{buildroot}/lib/udev/makedev.d -mkdir -p %{buildroot}/etc/makedev.d -cp -a %{SOURCE2} %{buildroot}/etc/makedev.d - # >> install post +install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fuse.conf +%ifnarch %{ix86} +# HACK!!! Please remove when possible. +# For some reason /dev/fuse doesn't exist on ARM builds and make install +# creates the node which doesn't belong to the package, thus these lines. +rm %{buildroot}/dev/fuse +rm -r %{buildroot}/dev +%endif # << install post @@ -114,9 +113,11 @@ %attr(4755,root,root) /bin/fusermount /bin/ulockmgr_server %exclude %{_sysconfdir}/init.d/fuse -%{_sysconfdir}/makedev.d/z-fuse %config /lib/udev/rules.d/99-fuse.rules -%config /lib/udev/makedev.d/99-fuse.nodes +%{_mandir}/man1/fusermount.1.gz +%{_mandir}/man1/ulockmgr_server.1.gz +%{_mandir}/man8/mount.fuse.8.gz +%config(noreplace) %{_sysconfdir}/%{name}.conf # << files @@ -124,9 +125,9 @@ %defattr(-,root,root,-) # >> files devel %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS -/%{_libdir}/libfuse.so -/%{_libdir}/libulockmgr.so -/%{_libdir}/pkgconfig/*.pc +%{_libdir}/libfuse.so +%{_libdir}/libulockmgr.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/fuse.h %{_includedir}/ulockmgr.h %{_includedir}/fuse @@ -136,7 +137,7 @@ %defattr(-,root,root,-) # >> files libs %doc COPYING.LIB -/%{_libdir}/libfuse.so.* -/%{_libdir}/libulockmgr.so.* +%{_libdir}/libfuse.so.* +%{_libdir}/libulockmgr.so.* # << files libs other changes: -------------- ++++++ fuse-0001-More-parentheses.patch (new) --- fuse-0001-More-parentheses.patch +++ fuse-0001-More-parentheses.patch @@ -0,0 +1,52 @@ +From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov <[email protected]> +Date: Mon, 9 Aug 2010 12:10:40 +0400 +Subject: [PATCH 1/1] More parentheses + +Signed-off-by: Peter Lemenkov <[email protected]> +--- + lib/fuse.c | 8 +++----- + lib/fuse_lowlevel.c | 2 +- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/lib/fuse.c b/lib/fuse.c +index d511964..328ebba 100644 +--- a/lib/fuse.c ++++ b/lib/fuse.c +@@ -991,17 +991,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, + { + int err; + if (!fs->compat || fs->compat >= 25) +- err = fs->op.open(path, fi); ++ err = (fs->op.open)(path, fi); + else if (fs->compat == 22) { + struct fuse_file_info_compat tmp; + memcpy(&tmp, fi, sizeof(tmp)); +- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, +- &tmp); ++ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); + memcpy(fi, &tmp, sizeof(tmp)); + fi->fh = tmp.fh; + } else +- err = ((struct fuse_operations_compat2 *) &fs->op) +- ->open(path, fi->flags); ++ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); + return err; + } + +diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c +index c86a910..4f19d61 100644 +--- a/lib/fuse_lowlevel.c ++++ b/lib/fuse_lowlevel.c +@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) + fi.flags = arg->flags; + + if (req->f->op.open) +- req->f->op.open(req, nodeid, &fi); ++ (req->f->op.open)(req, nodeid, &fi); + else + fuse_reply_open(req, &fi); + } +-- +1.7.9.3 + ++++++ fuse-2.8.6.tar.gz -> fuse-2.9.0.tar.gz (23505 lines skipped) ++++++ fuse.conf (new) --- fuse.conf +++ fuse.conf @@ -0,0 +1,2 @@ +# mount_max = 1000 +# user_allow_other ++++++ fuse.yaml --- fuse.yaml +++ fuse.yaml @@ -1,19 +1,16 @@ Name: fuse Summary: File System in Userspace (FUSE) utilities -Version: 2.8.6 +Version: 2.9.0 Release: 1 Group: System/Base License: LGPLv2+ URL: http://fuse.sf.net Sources: - http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -ExtraSources: - - 99-fuse.nodes;/lib/udev/makedev.d - - z-fuse;/etc/makedev.d + - "%{name}.conf" Patches: - fuse-udev_rules.patch - - fuse-openfix.patch - - 06-clone_newns.patch + - fuse-0001-More-parentheses.patch Description: | With FUSE it is possible to implement a fully functional filesystem in a userspace program. This package contains the FUSE userspace tools to @@ -23,9 +20,9 @@ - which Configure: configure ConfigOptions: - - --disable-kernel-module - --bindir=/bin - --exec-prefix=/ + - --enable-example SubPackages: - Name: devel Summary: File System in Userspace (FUSE) devel files ++++++ deleted files: --- 06-clone_newns.patch --- 99-fuse.nodes --- fuse-openfix.patch --- z-fuse submit: home:sage:branches:CE:Utils / utfs -> CE:Utils / utfs changes files: -------------- --- utfs.changes +++ utfs.changes @@ -0,0 +1,3 @@ +* Wed May 16 2012 Marko Saukko <[email protected]> - 1.959 +- Added utfs-1.959-linking-fix.patch to fix the build. + new: ---- utfs-1.959-linking-fix.patch spec files: ----------- --- utfs.spec +++ utfs.spec @@ -14,6 +14,7 @@ URL: http://www.guru-group.fi/~too/sw/utfs/ Source0: http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}.tar.gz Source100: utfs.yaml +Patch0: utfs-1.959-linking-fix.patch BuildRequires: pkgconfig(fuse) @@ -47,6 +48,8 @@ %prep %setup -q -n %{name}-%{version} +# utfs-1.959-linking-fix.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ utfs-1.959-linking-fix.patch (new) --- utfs-1.959-linking-fix.patch +++ utfs-1.959-linking-fix.patch @@ -0,0 +1,26 @@ +From 85df6c7a5d40c5c2460980f13ef7699b6a142e6b Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 16 May 2012 10:40:33 +0300 +Subject: [PATCH] Fix linking of the client by adding missing libs. + +Signed-off-by: Marko Saukko <[email protected]> +--- + Makefile.build | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.build b/Makefile.build +index f52e7e9..9475851 100644 +--- a/Makefile.build ++++ b/Makefile.build +@@ -74,7 +74,7 @@ utfs-server: $(SRVOBJS) + + + utfs-client: $(CLIOBJS) +- $(CC) $(LF) -o $@ $(CLIOBJS) `pkg-config --libs fuse` ++ $(CC) $(LF) -o $@ $(CLIOBJS) `pkg-config --libs fuse` -lpthread + + $(SRVOBJS): $(SRVSRC) $(CSRC) utfs-buffer.c $(OD)/utfs-server-errmap.c + $(CLIOBJS): $(CLISRC) $(CSRC) utfs-buffer.c +-- +1.7.7 + ++++++ utfs.yaml --- utfs.yaml +++ utfs.yaml @@ -7,6 +7,9 @@ URL: http://www.guru-group.fi/~too/sw/utfs/ Sources: - http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}.tar.gz +Patches: + - utfs-1.959-linking-fix.patch + Description: User TCP FileSystem, Filesystem in USErspace based custom networking fs. PkgConfigBR:
