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

Package-Manager: portage-2.1.10.65/cvs/Linux i686

7 files changed, 97 insertions, 147 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/Manifest b/net-fs/davfs2/Manifest
index 705ca5421573..8f0344d49044 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX davfs2-1.4.5-glibc212.patch 1071 RMD160 d0cf01fbd7ec855dcf1bd6b942b0365ca54fa15d SHA1 9b884678b13c5ec096055e904fde7f9dd748c248 SHA256 1851bffcc1321e5bdcff3598cc2ce2c2a3985eb3082dfe5110d70c4ba0875927
-AUX fortify_sources_fix.patch 463 RMD160 e8fbc5ca32037b639a3c1ff1ec73a121125b5458 SHA1 a2afb3f88261e48a8eb0a23d0bfe9eda67a0e10e SHA256 5b27649819fa8733be3949d400e5ae10084d63f13d851868a449e94b41377c53
-DIST davfs2-1.3.3.tar.gz 407659 RMD160 795f41e3669cffff7e1c77430eb22d164f57326a SHA1 54ab5b21f6b2abfdc1fe3693104d82d6a52ee13f SHA256 bb71b46dfd6b24885c263243cdf15de57d4798b6cee0b479324ea387f3694775
-DIST davfs2-1.4.1.tar.gz 425963 RMD160 56eb2bd1d28465c59a74ac086cc3eb68e5517814 SHA1 fc6748a436fbe392b309ef2856ea119c579e5dc8 SHA256 16628734132fd1460a1f9bf509b4046d58fbc502722ddda0fbd48f96c318183b
-DIST davfs2-1.4.5.tar.gz 429635 RMD160 7abb4ad3e0814532922c257f8c866f74440ed5e9 SHA1 2146dceb1e1a38441cb50753bc10a18f0e9536cb SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de
-EBUILD davfs2-1.3.3.ebuild 1471 RMD160 54e37c6b52a794df39e4ce1204db1eeae40eebea SHA1 0fee88433a502f6b0155c85d4423b145ac52ef1a SHA256 aa201a8e50733372ee272e2d51ad8db941e4bcc93678a4f9a63e41a4ea906d46
-EBUILD davfs2-1.4.1.ebuild 1438 RMD160 ff90fbbf25889dc4f8cc8674eb2484c60665e1ef SHA1 e21f1af6cb65967b3cd111b6e5faf2621cb46ede SHA256 14ef0dbff5bba4926e63599a2fb7e0187c59c325c8e7d335a1c609989f05f963
-EBUILD davfs2-1.4.5-r1.ebuild 1731 RMD160 bb7bc74aeece20bd63a4a0bf0c2acefab34e844c SHA1 7c49d29f5785a8dbdfd50b93f1db8f87a8749d55 SHA256 96fe94ac393f97dff66f5755cf6882dc4e4ffc6f017c4106753bb90943d08e8e
-MISC ChangeLog 10318 RMD160 805d6672ec6482710041402135e429707d4902cb SHA1 285f35a2086e49c61f0e577897062dd387ea4266 SHA256 d077750146882ae7ba38bf5435a264b826632992731f36996206001469c0c96c
-MISC metadata.xml 161 RMD160 20108ab4ad5f41adf79983fa2c927bfcd68d7f30 SHA1 eb75426b5b6a39f1321b64e7dca8854c7a396927 SHA256 d067b22721c96499a685d0b0ef3597421713a9f3befc27536b916d78f27c2951
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk/pPO0ACgkQ/ejvha5XGaNkgwCfbCKRc/QMAFsMkemaLmriy0yE
-HHEAoMoB0NOM1bEEsq5J2HQAlXbnSdNZ
-=tYrR
------END PGP SIGNATURE-----
+AUX davfs2-1.4.5-glibc212.patch 1071 SHA256 1851bffcc1321e5bdcff3598cc2ce2c2a3985eb3082dfe5110d70c4ba0875927 SHA512 b097950633242e6845687ace216b3e32bc4cd2a317c9405f20230871d64ef536a3b893b0335591dc21414709021ea6d9dd02b5eab3d180d57eed58e78d330a88 WHIRLPOOL f7cd435a06f071edbde4d76c7bb02a7d1eec4942ec13f3354a1026fc88d717b13889c9add2319999ebba30e4acf1de10d3d8ea4df4de0c04d3dd7ff71310f29f
+AUX davfs2-1.4.7-destdir.patch 608 SHA256 7506c0dc181620bd91aee79c5797551a12c1ee993e96504c7c819b65cc1e026d SHA512 b3c6c21b7013be1ac7472b47c7413a3f88b591cddbbcc494ec08ee24d314e12778e2a039577fccc872558491a9096b3ef07646af129a28dd46a20199fe10baa0 WHIRLPOOL 1e8a465f375a4255ed7fd1a36f0085116a10fff606edca8db07c88dd7f92f5131ef2899435c32cd1b31c89cc697eed0e13aab447b556194577b57bf2b716098f
+DIST davfs2-1.4.5.tar.gz 429635 SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de SHA512 0fd20e8aba8d236feec06b3f2184388691ee19a4e993cf543a2356feb9c25e1de41521c462bd01497f89ff4d16d0d3defb3227a64c0a490db2c0647e1391c9d1 WHIRLPOOL 955d98c0a2b49d5400971b9381d05f87c21420a5b52a4ef1ec330cfd6d4f451e56a6fa884164ed84dabae06aa29010df66ccd6e048e932d30e01545257152e31
+DIST davfs2-1.4.7.tar.gz 444398 SHA256 50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044 SHA512 6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae WHIRLPOOL f4c44ccc1fbd146f563605b2290068b549f6dcf247224685f2efaf9cda91a947a45dceed17d3d585407dc8e4ffa85c933d6eb5b4e78e0f00bd18cfbd53f52c7d
+EBUILD davfs2-1.4.5-r1.ebuild 1731 SHA256 96fe94ac393f97dff66f5755cf6882dc4e4ffc6f017c4106753bb90943d08e8e SHA512 a3d62e21ef3023a4e12fd6834ba4cff3f94aba1c0175b45606eeb573f03dd929d6e5666579eb4dee728cfdd5b8562d53cb3be159df204c27ef8ba47e682a7a1c WHIRLPOOL 97ebbf30b1bdbafa304f6bd2f23c83014909bb94aeb9b8733891137bb42743e99d24f8b61b153868f82af4dde4a2ff65b9631416d8290cb2a201a5d71e060e7d
+EBUILD davfs2-1.4.7.ebuild 1528 SHA256 62b589ae5868fd39e39e186422fa59a1034ed6bc86f672131e13013051b5f191 SHA512 4b2563ee87e58e28bb9daccbd79e96bf99b4ad794e17ef813c533e8742b36b4137bf885d2e60edef1f324a0003bd9d80eeb914c0562b8703b14fecbccf43d2da WHIRLPOOL e891ebc5dfd605d69ac3ec7cbe2a666f42e1a950655eb2a9ef1691ab84f9fb358087b83dc8fba085f42daf5b1ffd17d9fa4fb131e914ec2a5812f420c689901a
+MISC ChangeLog 10642 SHA256 e010a787ba9fdc23d1c15b140439e86a29a666ddb1b071ed7697e096022f4100 SHA512 c21f4e0ed714c857b1f04753918fb4be257353e82f93df0272dabc1b161f5f462cc49fce8134fb490ac26238e7685d3c8b423e9b13c4a5e356e5f62f722c74d4 WHIRLPOOL 1d8ec851417f6aba87090618eed3e5a2182c270a9247c72f795142ca77b3449fbb9ccce6d979d39a903ab0aee7d1fdb9dfa7fc517bc5dce3a758db827cabf653
+MISC metadata.xml 161 SHA256 d067b22721c96499a685d0b0ef3597421713a9f3befc27536b916d78f27c2951 SHA512 0ac0a2db6a1293d06fe3c9fd1810035d486ce6b625ce16129aed37f94c6ba96b0910ab6939ede587f7bf62e8a30f3f337a25c710c03f6c710c2eb6d4d03391d5 WHIRLPOOL c248cf5dac6752f10a180e0bd7e05005ae6c66240004266f15e66d19cb130fadd1fd2a7b9181b4d24f800aeb5a31cc788f2999b834e29ed3b0a4085277bcc13d
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;