From 554d956faca20f3244c6496d83a14307911e6715 Mon Sep 17 00:00:00 2001
From: Iskren Slavov <iskren.s@gmail.com>
Date: Tue, 19 Oct 2010 23:28:08 +0300
Subject: Patch a naughty fstab bug in davfs-1.4.5

---
 net-fs/davfs2/Manifest                             |  4 ++
 net-fs/davfs2/davfs2-1.4.5-r1.ebuild               | 60 ++++++++++++++++++++++
 .../davfs2/files/davfs2-1.4.5-fstab-bugfix.patch   | 17 ++++++
 net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch    | 59 +++++++++++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 net-fs/davfs2/Manifest
 create mode 100644 net-fs/davfs2/davfs2-1.4.5-r1.ebuild
 create mode 100644 net-fs/davfs2/files/davfs2-1.4.5-fstab-bugfix.patch
 create mode 100644 net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch

diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
new file mode 100644
index 0000000..882d997
--- /dev/null
+++ b/net-fs/davfs2/Manifest
@@ -0,0 +1,4 @@
+AUX davfs2-1.4.5-fstab-bugfix.patch 497 RMD160 1fcbc3e63d39eca4d0bdf640f22b0da64ee670fc SHA1 496edb3c4ea0551093add24b32c4af82b44095f7 SHA256 7ae3fa7bcedb854129c67b0014c713c8ac0f9574fe39b013734d698e0b64b91c
+AUX davfs2-1.4.5-glibc212.patch 1071 RMD160 d0cf01fbd7ec855dcf1bd6b942b0365ca54fa15d SHA1 9b884678b13c5ec096055e904fde7f9dd748c248 SHA256 1851bffcc1321e5bdcff3598cc2ce2c2a3985eb3082dfe5110d70c4ba0875927
+DIST davfs2-1.4.5.tar.gz 429635 RMD160 7abb4ad3e0814532922c257f8c866f74440ed5e9 SHA1 2146dceb1e1a38441cb50753bc10a18f0e9536cb SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de
+EBUILD davfs2-1.4.5-r1.ebuild 1593 RMD160 2f95659a50b9a32908f21b1ce1bed1c34a5d00f9 SHA1 d409a9e931d724d5e9ad84b6c141c1382a62a6c0 SHA256 9b4234d98d22647de61d7cc02fba3cb8e06a3b7caf719ccc7d8b31bfd311a236
diff --git a/net-fs/davfs2/davfs2-1.4.5-r1.ebuild b/net-fs/davfs2/davfs2-1.4.5-r1.ebuild
new file mode 100644
index 0000000..78a3556
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.4.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.4.5.ebuild,v 1.3 2010/08/17 19:20:50 ssuominen Exp $
+
+EAPI="2"
+
+inherit autotools eutils linux-mod
+
+DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses fuse (or coda) for kernel driver and neon for WebDAV interface"
+HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
+SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/libxml2
+		net-libs/neon
+		sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+	# fix naughty bug when user mounts davfs entry from fstab
+	epatch "${FILESDIR}"/${P}-fstab-bugfix.patch
+
+	sed -e "s/^NE_REQUIRE_VERSIONS.*29/& 30/" -i configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-largefile
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO
+
+	# Remove wrong locations created by install.
+	rm -fr "${D}/usr/share/doc/davfs2"
+	rm -fr "${D}/usr/share/davfs2"
+
+	dodir /var/run/mount.davfs
+	keepdir /var/run/mount.davfs
+	fowners root:users /var/run/mount.davfs
+	fperms 1774 /var/run/mount.davfs
+
+	# Ignore nobody's home
+	cat>>"${D}/etc/davfs2/davfs2.conf"<<EOF
+
+# nobody is a system account in Gentoo
+ignore_home nobody
+EOF
+}
diff --git a/net-fs/davfs2/files/davfs2-1.4.5-fstab-bugfix.patch b/net-fs/davfs2/files/davfs2-1.4.5-fstab-bugfix.patch
new file mode 100644
index 0000000..e90f7bd
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.4.5-fstab-bugfix.patch
@@ -0,0 +1,17 @@
+--- src/mount_davfs.c.old	2009-10-18 18:34:19.000000000 +0300
++++ src/mount_davfs.c	2010-10-19 23:23:18.243000000 +0300
+@@ -682,6 +682,13 @@
+ 
+     setfsent();
+     struct fstab *ft = getfsfile(mpoint);
++    if (!ft) {
++        char *mp = NULL;
++        if (asprintf(&mp, "%s/", mpoint) < 0) abort();
++        ft = getfsfile(mp);
++        if (mp) free(mp);
++    }
++
+     if (!ft || !ft->fs_spec)
+         error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url,
+               _PATH_FSTAB);
+
diff --git a/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch b/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch
new file mode 100644
index 0000000..18d65bb
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch
@@ -0,0 +1,59 @@
+http://bugs.gentoo.org/332865
+
+--- src/dav_coda.c
++++ src/dav_coda.c
+@@ -52,6 +52,9 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ 
+ #include "defaults.h"
+ #include "mount_davfs.h"
+--- src/dav_fuse.c
++++ src/dav_fuse.c
+@@ -41,6 +41,12 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ 
+ #include "defaults.h"
+ #include "mount_davfs.h"
+--- src/kernel_interface.c
++++ src/kernel_interface.c
+@@ -44,6 +44,12 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ 
+ #ifdef HAVE_SYS_MOUNT_H
+ #include <sys/mount.h>
+--- src/webdav.c
++++ src/webdav.c
+@@ -47,6 +47,12 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ 
+ #include <ne_alloc.h>
+ #include <ne_auth.h>
-- 
cgit v1.2.3