From d37cde2b89a79a4758fecd62f507b92ac1643727 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 25 May 2015 10:06:11 +0000
Subject: main/fuse: upgrade to 2.9.4

---
 main/fuse/APKBUILD           | 15 +++++--------
 main/fuse/fix-includes.patch | 50 --------------------------------------------
 2 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 main/fuse/fix-includes.patch

(limited to 'main/fuse')

diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index 95e58f4615..82fca9417c 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fuse
-pkgver=2.9.3
-pkgrel=3
+pkgver=2.9.4
+pkgrel=0
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 url="http://fuse.sourceforge.net/"
 arch="all"
@@ -11,7 +11,6 @@ makedepends="gettext-dev"
 install=
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	fix-includes.patch
 	fix-realpath.patch
 	fuse.initd"
 options="suid"
@@ -21,7 +20,6 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -69,15 +67,12 @@ _EOF_
 
 }
 
-md5sums="33cae22ca50311446400daf8a6255c6a  fuse-2.9.3.tar.gz
-c08ad52ccd6ff8cc7c8ebf73c5d588ea  fix-includes.patch
+md5sums="ecb712b5ffc6dffd54f4a405c9b372d8  fuse-2.9.4.tar.gz
 790b837275346e77d5f88a4778062ab7  fix-realpath.patch
 45fb51535c96a7d1fe2eb9690ac48814  fuse.initd"
-sha256sums="0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c  fuse-2.9.3.tar.gz
-72cf0964e5713f363d9dc0f9881512cdbdd05a5866ac95f1ea9df6305a189459  fix-includes.patch
+sha256sums="6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1  fuse-2.9.4.tar.gz
 9031e6df6e0b3e46c7e0117bba6e2eeb879de8d742dc54f592a16033d4dda89b  fix-realpath.patch
 66ce65e2459fef26bb1711d706a23643a9af7a80e03ee6be836a377310b00682  fuse.initd"
-sha512sums="03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c  fuse-2.9.3.tar.gz
-147edb099e9dc5dad806882393b9a59feac0d22105764c87f7674b5f8b5242517034ca20ce36c931c5dd6ab18864f5aa267d1e1cd0adb81518f479de3c392d80  fix-includes.patch
+sha512sums="055ec2a78793276102bc5a0afea9eebd18b151cf752d0985380ffbde1c554e9fb7bc3a43838618e3957b274aa06624303ea12f32c659365c4768dad887bb557d  fuse-2.9.4.tar.gz
 5672ceb35acabb4bd97b6efc30614f22def62882fe198e2a8598a074d45b6b5337c082a5e09b5e399b6e5212dc1fbde9071c2a5051534c32091444c350b9c657  fix-realpath.patch
 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1  fuse.initd"
diff --git a/main/fuse/fix-includes.patch b/main/fuse/fix-includes.patch
deleted file mode 100644
index 4a24a0f5dc..0000000000
--- a/main/fuse/fix-includes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- fuse-2.9.3.orig/lib/fuse.c
-+++ fuse-2.9.3/lib/fuse.c
-@@ -35,6 +35,7 @@
- #include <poll.h>
- #include <sys/param.h>
- #include <sys/uio.h>
-+#include <sys/file.h>
- #include <sys/time.h>
- #include <sys/mman.h>
- 
---- fuse-2.9.3.orig/lib/fuse_lowlevel.c
-+++ fuse-2.9.3/lib/fuse_lowlevel.c
-@@ -24,6 +24,7 @@
- #include <limits.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/file.h>
- 
- #ifndef F_LINUX_SPECIFIC_BASE
- #define F_LINUX_SPECIFIC_BASE       1024
---- fuse-2.9.3.orig/lib/mount_util.c
-+++ fuse-2.9.3/lib/mount_util.c
-@@ -15,6 +15,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <limits.h>
- #ifndef __NetBSD__
- #include <mntent.h>
---- fuse-2.9.3.orig/util/fusermount.c
-+++ fuse-2.9.3/util/fusermount.c
-@@ -19,6 +19,7 @@
- #include <getopt.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <pwd.h>
- #include <mntent.h>
- #include <sys/wait.h>
---- fuse-2.9.3.orig/util/mount_util.c
-+++ fuse-2.9.3/util/mount_util.c
-@@ -15,6 +15,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <limits.h>
- #ifndef __NetBSD__
- #include <mntent.h>
-- 
cgit v1.2.3