Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Islam Amer
committed
May 21, 2013
1 parent
c692987
commit 75d22ff
Showing
6 changed files
with
284 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001 | ||
From: Peter Lemenkov <lemenkov@gmail.com> | ||
Date: Mon, 9 Aug 2010 12:10:40 +0400 | ||
Subject: [PATCH 1/1] More parentheses | ||
|
||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> | ||
--- | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- a/util/udev.rules 2005-11-03 19:38:05.000000000 +0100 | ||
+++ b/util/udev.rules 2005-11-03 19:38:13.000000000 +0100 | ||
@@ -1 +1 @@ | ||
-KERNEL=="fuse", MODE="0666" | ||
+KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
* Mon Dec 10 2012 Marko Saukko <marko.saukko@jollamobile.com> - 2.9.0 | ||
- Updated packaging. | ||
|
||
* Wed May 16 2012 Marko Saukko <sage@merproject.org> - 2.9.0 | ||
- Update to version 2.9.0 | ||
- Dropped makedev.d files 99-fuse.nodes and z-fuse. | ||
|
||
* Fri Mar 30 2012 Maurice de la Ferté <Maurice.Ferte@basyskom.com> - 2.8.6 | ||
- Add 06-clone_newns.patch from https://launchpadlibrarian.net/94590211/fuse.debdiff | ||
|
||
* Wed Nov 16 2011 Marko Saukko <marko.saukko@cybercom.com> - 2.8.6 | ||
- Update to 2.8.6 | ||
|
||
* Wed May 11 2011 Anas Nashif <anas.nashif@intel.com> - 2.8.5 | ||
- Update to 2.8.5 | ||
|
||
* Mon May 02 2011 Chris Ferron <chris.e.ferron@linux.intel.com> - 2.8.4 | ||
- FEA#16109 - [FEA] Implement SystemD as MeeGo init provide | ||
- As systemd is now the MeeGo init provider there is no need for | ||
chkconfig to be used. | ||
|
||
* Thu Jul 15 2010 Anas Nashif <anas.nashif@intel.com> - 2.8.4 | ||
- Install udev rules in /lib/udev (bmc #3424) | ||
|
||
* Fri Feb 26 2010 Anas Nashif <anas.nashif@intel.com> - 2.8.3 | ||
- Removed requirement on kernel | ||
- Fixed groups | ||
|
||
* Thu Feb 25 2010 Passion Zhao <passion.zhao@intel.com> - 2.8.3 | ||
- Update to 2.8.3 | ||
|
||
* Tue Feb 16 2010 Anas Nashif <anas.nashif@intel.com> - 2.7.4 | ||
- Use spectacle | ||
|
||
* Fri Feb 05 2010 Auke Kok <auke-jan.h.kok@intel.com> - 2.7.4 | ||
- remove obsolete udev rule key | ||
|
||
* Tue Sep 01 2009 Auke Kok <auke-jan.h.kok@intel.com> - 2.7.4 | ||
- Fix Extras use in ini | ||
|
||
* Wed Apr 08 2009 Passion Zhao <passion.zhao@intel.com> - 2.7.4 | ||
- Update to 2.7.4 | ||
|
||
* Fri Dec 19 2008 Arjan van de Ven <arjan@linux.intel.com> - 2.7.3 | ||
- Move the libs and pkgconfig files to /usr/lib | ||
|
||
* Tue Dec 16 2008 Arjan van de Ven <arjan@linux.intel.com> - 2.7.3 | ||
- Create standardized spec file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# mount_max = 1000 | ||
# user_allow_other |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
# | ||
# Do NOT Edit the Auto-generated Part! | ||
# Generated by: spectacle version 0.26 | ||
# | ||
|
||
Name: fuse | ||
|
||
# >> macros | ||
# << macros | ||
|
||
Summary: File System in Userspace (FUSE) utilities | ||
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: %{name}.conf | ||
Source100: fuse.yaml | ||
Patch0: fuse-udev_rules.patch | ||
Patch1: fuse-0001-More-parentheses.patch | ||
Requires: which | ||
BuildRequires: gettext-devel | ||
|
||
%description | ||
With FUSE it is possible to implement a fully functional filesystem in a | ||
userspace program. This package contains the FUSE userspace tools to | ||
mount a FUSE filesystem. | ||
|
||
|
||
%package devel | ||
Summary: File System in Userspace (FUSE) devel files | ||
Group: Development/Libraries | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description devel | ||
With FUSE it is possible to implement a fully functional filesystem in a | ||
userspace program. This package contains development files (headers, | ||
pgk-config) to develop FUSE based applications/filesystems. | ||
|
||
|
||
%package libs | ||
Summary: File System in Userspace (FUSE) libraries | ||
Group: System/Libraries | ||
Requires: %{name} = %{version}-%{release} | ||
Requires(post): /sbin/ldconfig | ||
Requires(postun): /sbin/ldconfig | ||
|
||
%description libs | ||
Devel With FUSE it is possible to implement a fully functional filesystem in a | ||
userspace program. This package contains the FUSE libraries. | ||
|
||
|
||
%prep | ||
%setup -q -n %{name}-%{version}/%{name} | ||
|
||
# fuse-udev_rules.patch | ||
%patch0 -p1 | ||
# fuse-0001-More-parentheses.patch | ||
%patch1 -p1 | ||
# >> setup | ||
# << setup | ||
|
||
%build | ||
# >> build pre | ||
export UDEV_RULES_PATH=/lib/udev/rules.d | ||
./makeconf.sh | ||
# << build pre | ||
|
||
%configure --disable-static \ | ||
--bindir=/bin \ | ||
--exec-prefix=/ \ | ||
--enable-example | ||
|
||
make %{?jobs:-j%jobs} | ||
|
||
# >> build post | ||
# << build post | ||
|
||
%install | ||
rm -rf %{buildroot} | ||
# >> install pre | ||
# << install pre | ||
%make_install | ||
|
||
# >> 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 | ||
|
||
%post libs -p /sbin/ldconfig | ||
|
||
%postun libs -p /sbin/ldconfig | ||
|
||
%files | ||
%defattr(-,root,root,-) | ||
# >> files | ||
%doc COPYING | ||
/sbin/mount.fuse | ||
%attr(4755,root,root) /bin/fusermount | ||
/bin/ulockmgr_server | ||
%exclude %{_sysconfdir}/init.d/fuse | ||
%config /lib/udev/rules.d/99-fuse.rules | ||
%{_mandir}/man1/fusermount.1.gz | ||
%{_mandir}/man1/ulockmgr_server.1.gz | ||
%{_mandir}/man8/mount.fuse.8.gz | ||
%config(noreplace) %{_sysconfdir}/%{name}.conf | ||
# << files | ||
|
||
%files devel | ||
%defattr(-,root,root,-) | ||
# >> files devel | ||
%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS | ||
%{_libdir}/libfuse.so | ||
%{_libdir}/libulockmgr.so | ||
%{_libdir}/pkgconfig/*.pc | ||
%{_includedir}/fuse.h | ||
%{_includedir}/ulockmgr.h | ||
%{_includedir}/fuse | ||
# << files devel | ||
|
||
%files libs | ||
%defattr(-,root,root,-) | ||
# >> files libs | ||
%doc COPYING.LIB | ||
%{_libdir}/libfuse.so.* | ||
%{_libdir}/libulockmgr.so.* | ||
# << files libs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
Name: fuse | ||
Summary: File System in Userspace (FUSE) utilities | ||
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 | ||
- "%{name}.conf" | ||
Patches: | ||
- fuse-udev_rules.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 | ||
mount a FUSE filesystem. | ||
PkgBR: | ||
- gettext-devel | ||
Requires: | ||
- which | ||
SetupOptions: -q -n %{name}-%{version}/%{name} | ||
Configure: configure | ||
ConfigOptions: | ||
- --bindir=/bin | ||
- --exec-prefix=/ | ||
- --enable-example | ||
SubPackages: | ||
- Name: devel | ||
Summary: File System in Userspace (FUSE) devel files | ||
Group: Development/Libraries | ||
Description: | | ||
With FUSE it is possible to implement a fully functional filesystem in a | ||
userspace program. This package contains development files (headers, | ||
pgk-config) to develop FUSE based applications/filesystems. | ||
- Name: libs | ||
Summary: File System in Userspace (FUSE) libraries | ||
Group: System/Libraries | ||
Description: | | ||
Devel With FUSE it is possible to implement a fully functional filesystem in a | ||
userspace program. This package contains the FUSE libraries. | ||