From 807f42c30ddb00c4e2d4034ce1720d7cb494e074 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 28 Oct 2011 23:14:50 +0000
Subject: Fri Oct 28 23:14:50 UTC 2011

---
 extra/fuse/PKGBUILD     | 32 +++++++++++++++++++-------------
 extra/fuse/fuse.install |  4 ----
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'extra/fuse')

diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index f3863969e..1dfd3e069 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $
+# $Id: PKGBUILD 141256 2011-10-27 14:45:14Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
@@ -16,20 +16,23 @@ install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b'
+sha1sums=('c2c0f9fff8bfee217da200888123e5abb5b498f2'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix building with glibc-2.14
+  sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+
   ./configure --prefix=/usr --enable-lib \
               --enable-util --bindir=/bin
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # static device nodes will cause collision.
   rm -rf ${pkgdir}/dev
@@ -40,16 +43,19 @@ package() {
   #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
+  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/
+  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver}
+  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2
+  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/
+  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1
+  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1
 
   # install sample config file
-  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1
+  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
   # Fix udev rule location
   install -d -m755 "${pkgdir}/lib"
   mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+
+  # remove udev rules (should already be in udev package}
+  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
 }
diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install
index 595ac7c12..f186d64c7 100644
--- a/extra/fuse/fuse.install
+++ b/extra/fuse/fuse.install
@@ -8,7 +8,3 @@ post_install() {
  -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229
 EOM
 }
-
-op=$1
-shift
-$op $*
-- 
cgit v1.2.3-54-g00ecf