fuse: upgrade

2 files changed, 46 insertions, 20 deletions

diff --git a/abs/core/fuse/PKGBUILD b/abs/core/fuse/PKGBUILD
index 62d8f81..f386396 100644
--- a/abs/core/fuse/PKGBUILD
+++ b/abs/core/fuse/PKGBUILD
@@ -1,38 +1,55 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Mark Rosenstand <mark@archlinux.org>
+# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Mark Rosenstand <mark@archlinux.org>
+
 pkgname=fuse
-pkgver=2.7.3
+pkgver=2.8.5
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://fuse.sourceforge.net/"
 license="GPL2"
 depends=('glibc')
-makedepends=('pkgconfig')
+makedepends=('pkg-config')
+backup=(etc/fuse.conf)
 install=fuse.install
-source=(http://mesh.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	'fuse.conf')
 options=(!libtool)
-md5sums=('98563fc7b265b7479a3178181cbcf59a')
+sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b'
+          '3b42e37a741d4651099225987dc40e7f02a716ad')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-kernel-module --enable-lib \
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-lib \
               --enable-util --bindir=/bin
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install || return 1
 
   # static device nodes will cause collision.
-  rm -rf $startdir/pkg/dev
+  rm -rf ${pkgdir}/dev
+ 
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
-  rm -rf $startdir/pkg/etc/init.d
-  #install -D -m755 $startdir/src/fuse.rc.d $startdir/pkg/etc/rc.d/fuse
+  rm -rf ${pkgdir}/etc/init.d
+  #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
+
+  install -d ${pkgdir}/lib
+  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1
+  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1
+  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1
+  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1
+  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1
+  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1
 
-  mkdir -p $startdir/pkg/lib
-  mv $startdir/pkg/usr/lib/libfuse.so.${pkgver} $startdir/pkg/lib/ || return 1
-  ln -s ../../lib/libfuse.so.${pkgver} $startdir/pkg/usr/lib/libfuse.so.${pkgver} || return 1
-  ln -s libfuse.so.${pkgver} $startdir/pkg/lib/libfuse.so.2 || return 1
-  mv $startdir/pkg/usr/lib/libulockmgr.so.1.0.1 $startdir/pkg/lib/ || return 1
-  ln -s ../../lib/libulockmgr.so.1.0.1 $startdir/pkg/usr/lib/libulockmgr.so.1.0.1 || return 1
-  ln -s libulockmgr.so.1.0.1 $startdir/pkg/lib/libulockmgr.so.1 || return 1
+  # install sample config file
+  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1
+  # Fix udev rule location
+  install -d -m755 "${pkgdir}/lib"
+  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
 }
diff --git a/abs/core/fuse/fuse.conf b/abs/core/fuse/fuse.conf
new file mode 100644
index 0000000..cb6c631
--- /dev/null
+++ b/abs/core/fuse/fuse.conf
@@ -0,0 +1,9 @@
+# Set the maximum number of FUSE mounts allowed to non-root users.
+# The default is 1000.
+#
+#mount_max = 1000
+
+# Allow non-root users to specify the 'allow_other' or 'allow_root'
+# mount options.
+#
+#user_allow_other