Version bump (bugfixes from upstream), also fix Gentoo bugs 384703 and 415011. Remove old versions.

(Portage version: 2.1.10.65/cvs/Linux i686)

6 files changed, 89 insertions, 127 deletions

diff --git a/net-fs/davfs2/ChangeLog b/net-fs/davfs2/ChangeLog
index b65c3948cfe2..f97509e09375 100644
--- a/net-fs/davfs2/ChangeLog
+++ b/net-fs/davfs2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/davfs2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.55 2012/06/26 04:39:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.56 2012/08/08 17:06:38 darkside Exp $
+
+*davfs2-1.4.7 (08 Aug 2012)
+
+  08 Aug 2012; Jeremy Olexa <darkside@gentoo.org> -davfs2-1.3.3.ebuild,
+  -davfs2-1.4.1.ebuild, +davfs2-1.4.7.ebuild,
+  +files/davfs2-1.4.7-destdir.patch, -files/fortify_sources_fix.patch:
+  Version bump (bugfixes from upstream), also fix Gentoo bugs 384703 and
+  415011. Remove old versions.
 
   26 Jun 2012; Zac Medico <zmedico@gentoo.org> davfs2-1.4.5-r1.ebuild:
   inherit user for enewgroup
diff --git a/net-fs/davfs2/davfs2-1.3.3.ebuild b/net-fs/davfs2/davfs2-1.3.3.ebuild
deleted file mode 100644
index 5b24534bb994..000000000000
--- a/net-fs/davfs2/davfs2-1.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3.3.ebuild,v 1.8 2010/06/22 20:05:45 arfrever 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://dav.sourceforge.net"
-SRC_URI="mirror://sourceforge/dav/${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}/fortify_sources_fix.patch"
-
-	sed -e "s/^NE_REQUIRE_VERSIONS.*28/& 29 30/" -i configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-largefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog FAQ INSTALL.davfs2 NEWS README \
-		README.translators THANKS TODO
-
-	# remove wrong locations created by install
-	rm -r "${D}/usr/share/doc/davfs2"
-	rm -r "${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/davfs2-1.4.1.ebuild b/net-fs/davfs2/davfs2-1.4.1.ebuild
deleted file mode 100644
index 7af58deed230..000000000000
--- a/net-fs/davfs2/davfs2-1.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.1.ebuild,v 1.4 2010/06/22 20:05:45 arfrever Exp $
-
-EAPI="2"
-
-inherit autotools 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() {
-	sed -e "s/^NE_REQUIRE_VERSIONS.*28/& 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/davfs2-1.4.7.ebuild b/net-fs/davfs2/davfs2-1.4.7.ebuild
new file mode 100644
index 000000000000..b370d24327dc
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.4.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.4.7.ebuild,v 1.1 2012/08/08 17:06:38 darkside Exp $
+
+EAPI=4
+
+inherit autotools eutils linux-mod user
+
+DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource."
+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}"
+
+pkg_setup() {
+	enewgroup davfs2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.5-glibc212.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	sed -e "s/^NE_REQUIRE_VERSIONS.*29/& 30/" -i configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf dav_user=nobody --enable-largefile --docdir=/usr/share/doc/${P}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+#	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO
+
+	dodir /var/run/mount.davfs
+	keepdir /var/run/mount.davfs
+	fowners root:davfs2 /var/run/mount.davfs
+	fperms 1774 /var/run/mount.davfs
+
+}
+
+pkg_postinst() {
+	elog
+	elog "Quick setup:"
+	elog "   (as root)"
+	elog "   # gpasswd -a \${your_user} davfs2"
+	elog "   # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto  0  0' >> /etc/fstab"
+	elog "   (as user)"
+	elog "   # mkdir -p ~/dav"
+	elog "   \$ mount ~/dav"
+	elog
+}
diff --git a/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch b/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch
new file mode 100644
index 000000000000..e6f1a17dd7d2
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/384703
+Patch by Jeroen Roovers
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,8 +51,8 @@
+ 	chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
+ 	if test "$(sbindir)" != "$(ssbindir)"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(ssbindir); \
+-	  $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
+-	  $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
++	  $(LN_S) -f $(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
++	  $(LN_S) -f $(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
+ 	fi
+ 
+ uninstall-hook:
diff --git a/net-fs/davfs2/files/fortify_sources_fix.patch b/net-fs/davfs2/files/fortify_sources_fix.patch
deleted file mode 100644
index ffc94153cf4d..000000000000
--- a/net-fs/davfs2/files/fortify_sources_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/webdav.c.org	2009-02-14 21:30:12.600987622 +0100
-+++ src/webdav.c	2009-02-14 21:33:33.020984549 +0100
-@@ -1513,7 +1513,7 @@
- 
-     get_context *ctx = (get_context *) userdata;
-     if (ctx->fd == 0)
--        ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC);
-+        ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-     if (ctx->fd <= 0) {
-         ne_set_error(session, _("%i can't open cache file"), 0);
-         ctx->error = EIO;