diff options
| -rw-r--r-- | abs/core/fuse/PKGBUILD | 23 | ||||
| -rwxr-xr-x | abs/core/fuse/fuse.rc.d | 49 |
2 files changed, 13 insertions, 59 deletions
diff --git a/abs/core/fuse/PKGBUILD b/abs/core/fuse/PKGBUILD index c16e6d7..fcfb387 100644 --- a/abs/core/fuse/PKGBUILD +++ b/abs/core/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ +# $Id: PKGBUILD 197300 2013-10-25 01:41:17Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.9.0 -pkgrel=1 +pkgver=2.9.3 +pkgrel=2 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" @@ -15,18 +15,22 @@ makedepends=('pkg-config') backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') -options=(!libtool) -sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' +sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') -build() { +prepare() { cd "$pkgname-$pkgver" # fix building with glibc-2.14 - sed -i '1i#define _GNU_SOURCE' util/fusermount.c + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure +} - ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ - --enable-util --bindir=/bin +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-lib --enable-util make } @@ -38,7 +42,6 @@ package() { # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d - #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf diff --git a/abs/core/fuse/fuse.rc.d b/abs/core/fuse/fuse.rc.d deleted file mode 100755 index 768da5b..0000000 --- a/abs/core/fuse/fuse.rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# fuse Init script for Filesystem in Userspace -# Based on the script by Miklos Szeredi <miklos@szeredi.hu> - -. /etc/rc.conf -. /etc/rc.d/functions -FUSECTL=/sys/fs/fuse/connections - -case "$1" in - start) - stat_busy "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then - mount -t fusectl none $FUSECTL >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - add_daemon fuse - stat_done - ;; - stop) - stat_busy "Stopping fuse" - umount $FUSECTL >/dev/null 2>&1 - rmmod fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fuse - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 |