Add patch to fix some bugs thanks to Butchie <butchie@free.fr> in bug 148566

Package-Manager: portage-2.1.2_pre1

5 files changed, 166 insertions, 5 deletions

diff --git a/net-fs/davfs2/ChangeLog b/net-fs/davfs2/ChangeLog
index f5192847e9c5..8c938fbda025 100644
--- a/net-fs/davfs2/ChangeLog
+++ b/net-fs/davfs2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/davfs2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.28 2006/08/22 14:43:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.29 2006/09/22 19:48:47 genstef Exp $
+
+*davfs2-1.0.2_p20060820-r1 (22 Sep 2006)
+
+  22 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/davfs2-cvs1.0.2-badpointer.patch,
+  +davfs2-1.0.2_p20060820-r1.ebuild:
+  Add patch to fix some bugs thanks to Butchie <butchie@free.fr> in bug 148566
 
 *davfs2-1.0.2_p20060820 (22 Aug 2006)
 
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index a7c6eb14e8d2..13db249fd5c3 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,17 +1,25 @@
+AUX davfs2-cvs1.0.2-badpointer.patch 1712 RMD160 14c0fd3fbe4fa4d3633931f8e80e89b79b13e292 SHA1 cb57669b2d43356587018fb7a62cf16170edabcb SHA256 e22dfbf4196b91f6f2474fab793a01aaa093c64dfc691ba108523e9721bbadf8
+MD5 7bbe18fb5e5339e7a8d02bf7217926ce files/davfs2-cvs1.0.2-badpointer.patch 1712
+RMD160 14c0fd3fbe4fa4d3633931f8e80e89b79b13e292 files/davfs2-cvs1.0.2-badpointer.patch 1712
+SHA256 e22dfbf4196b91f6f2474fab793a01aaa093c64dfc691ba108523e9721bbadf8 files/davfs2-cvs1.0.2-badpointer.patch 1712
 DIST davfs2-0.2.8.tar.gz 150594 RMD160 3a8b5661d145c74652d310d760e5f39c356ae490 SHA1 40b682f6673003a237336e30b6c465d9df0063c6 SHA256 04f98a83e6339f490046d908c0fcca1275e79462f11592187eb23c7368a172f1
 DIST davfs2-1.0.2_p20060820.tar.bz2 80240 RMD160 b07b6b0a458d7da6c3dba9a5a194b693c04e6828 SHA1 fa6e0dc350de54fb02b0c0a20f982cc0952fb6de SHA256 1446e1cf1800d6b85d44f5c0f593d4616b0514dd3e3b4f6034f94ccfce6acd0e
 EBUILD davfs2-0.2.8.ebuild 1802 RMD160 e07d528da1ee79a4e0dca9ab065778de392a3e56 SHA1 96f82504bf8bab1f509bb69fcb45197c8e7e298e SHA256 2a01eff9fa6c35e715d31c5621ac958f06f0b002e62a4e93e57d5daf40378a24
 MD5 5360c73ca032ebe43a0aa79ae4dbe8a0 davfs2-0.2.8.ebuild 1802
 RMD160 e07d528da1ee79a4e0dca9ab065778de392a3e56 davfs2-0.2.8.ebuild 1802
 SHA256 2a01eff9fa6c35e715d31c5621ac958f06f0b002e62a4e93e57d5daf40378a24 davfs2-0.2.8.ebuild 1802
+EBUILD davfs2-1.0.2_p20060820-r1.ebuild 2078 RMD160 102d8fc2c33ed4decdc245c2863af6d6611a9847 SHA1 8b505411266fe3352834601c5c576348b14f334a SHA256 544e41df2cc35a602c0e6138ac4c89c0dcc62d23a29dd313c1bff7f7e2c2e9f1
+MD5 1d842c4f67f221b1b47016f20ba62708 davfs2-1.0.2_p20060820-r1.ebuild 2078
+RMD160 102d8fc2c33ed4decdc245c2863af6d6611a9847 davfs2-1.0.2_p20060820-r1.ebuild 2078
+SHA256 544e41df2cc35a602c0e6138ac4c89c0dcc62d23a29dd313c1bff7f7e2c2e9f1 davfs2-1.0.2_p20060820-r1.ebuild 2078
 EBUILD davfs2-1.0.2_p20060820.ebuild 1876 RMD160 d7322a8550b83187a5875f1e25112062dea7eb7f SHA1 7fb050ed909dc83061497f14b7bdbe43ce394f95 SHA256 d86665d8de4aadcf1900c15b63a2ca3899ff10f544fd2f6746a1721ddc399ea1
 MD5 c9a250ac765c7990631ad1f97327ea63 davfs2-1.0.2_p20060820.ebuild 1876
 RMD160 d7322a8550b83187a5875f1e25112062dea7eb7f davfs2-1.0.2_p20060820.ebuild 1876
 SHA256 d86665d8de4aadcf1900c15b63a2ca3899ff10f544fd2f6746a1721ddc399ea1 davfs2-1.0.2_p20060820.ebuild 1876
-MISC ChangeLog 6147 RMD160 eae242999ee7dc98e87001f3347d98af8aeca273 SHA1 537082e132edc4ad9b45759616e639bb323aba0e SHA256 c7e05de211042406156ed50649f46c0943f725c84b502b1038cc885767ad4da2
-MD5 50579c0eb14a9eb5a3391db880f535c0 ChangeLog 6147
-RMD160 eae242999ee7dc98e87001f3347d98af8aeca273 ChangeLog 6147
-SHA256 c7e05de211042406156ed50649f46c0943f725c84b502b1038cc885767ad4da2 ChangeLog 6147
+MISC ChangeLog 6402 RMD160 e3892051c49de5bf5674064d5527c407203076e7 SHA1 2d1fff158826054217a2d770aabcca49fc65018d SHA256 471ff0604c7602608960527660194fc3f98c1a58146f5ef84cd722de538ba94d
+MD5 550eba3e9b94aaa05f8ebb1608b581f0 ChangeLog 6402
+RMD160 e3892051c49de5bf5674064d5527c407203076e7 ChangeLog 6402
+SHA256 471ff0604c7602608960527660194fc3f98c1a58146f5ef84cd722de538ba94d ChangeLog 6402
 MISC metadata.xml 264 RMD160 2f8b1195d6d7e399bb5c66301c2035afe54ddd73 SHA1 294a3324f4ba64623163fe2da2ef2c12a4e6922b SHA256 5eb597f5a232999a303e75d3fd716eb086cb87b40f0b50bb80e6c2693323f8b0
 MD5 90d54af17451a3725b7244f94d7ac81a metadata.xml 264
 RMD160 2f8b1195d6d7e399bb5c66301c2035afe54ddd73 metadata.xml 264
@@ -22,3 +30,6 @@ SHA256 4d64f0dd2950a36334086fc2eb3442dbd4f45ce64c16ce7668881a35ec1e0008 files/di
 MD5 121667c2e9a7c09462461d6bcc2303d9 files/digest-davfs2-1.0.2_p20060820 268
 RMD160 ea1ff3c3cbc96274f1b5459016a7b5fe614f20e7 files/digest-davfs2-1.0.2_p20060820 268
 SHA256 4238571adfda06191d218a3fca3a08c31a22b5570df1a08f69f55fea274ad778 files/digest-davfs2-1.0.2_p20060820 268
+MD5 121667c2e9a7c09462461d6bcc2303d9 files/digest-davfs2-1.0.2_p20060820-r1 268
+RMD160 ea1ff3c3cbc96274f1b5459016a7b5fe614f20e7 files/digest-davfs2-1.0.2_p20060820-r1 268
+SHA256 4238571adfda06191d218a3fca3a08c31a22b5570df1a08f69f55fea274ad778 files/digest-davfs2-1.0.2_p20060820-r1 268
diff --git a/net-fs/davfs2/davfs2-1.0.2_p20060820-r1.ebuild b/net-fs/davfs2/davfs2-1.0.2_p20060820-r1.ebuild
new file mode 100644
index 000000000000..6915cb95f7e8
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.0.2_p20060820-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.0.2_p20060820-r1.ebuild,v 1.1 2006/09/22 19:48:47 genstef Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
+HOMEPAGE="http://dav.sourceforge.net"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl debug socks5"
+RESTRICT="test"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+		socks5? ( >=net-proxy/dante-1.1.13 )
+		dev-libs/libxml2
+		net-misc/neon
+		sys-libs/zlib"
+SLOT="0"
+S=${WORKDIR}/${PN}
+
+#CONFIG_CHECK="CODA_FS !CODA_FS_OLD_API"
+CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/davfs2-cvs1.0.2-badpointer.patch
+}
+
+src_compile() {
+	./autogen.sh
+	local myconf
+
+	if use debug; then
+		myconf="--with-debug"
+	fi
+	if kernel_is 2 4; then
+		myconf="${myconf} --with-kernel-src=${KV_DIR}"
+	else
+		myconf="${myconf} --without-kernel-src"
+	fi
+
+	econf \
+		$(use_with ssl) \
+		$(use_with socks5 socks) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "make install failed"
+	cd doc
+	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO BUGS
+
+	#fix einstalled files in wrong places
+	cd ${D}/usr/share/davfs2
+	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO BUGS GPL
+	rmdir ${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
+
+	dodir /etc/modules.d
+	cat >${D}/etc/modules.d/davfs2 <<EOF
+alias char-major-67	coda
+alias /dev/davfs*	coda
+EOF
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	ewarn "This is a cvs version - please report bugs upstream"
+}
diff --git a/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch b/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch
new file mode 100644
index 000000000000..f2b75a47c83b
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch
@@ -0,0 +1,63 @@
+diff -Naur davfs2/src/cache.c davfs2-new/src/cache.c
+--- davfs2/src/cache.c	2006-08-21 22:51:51.000000000 +0200
++++ davfs2-new/src/cache.c	2006-09-17 10:29:06.720200399 +0200
+@@ -236,7 +236,7 @@
+ 
+ static int is_busy(const dav_node *node);
+ 
+-static inline int is_cached(const dav_node *node) {
++static inline int is_cached(dav_node *node) {
+ 
+     if (!S_ISREG(node->mode) || node->cache_path == NULL)
+         return 0;
+@@ -244,6 +244,7 @@
+         return 1;
+     } else {
+         free(node->cache_path);
++        node->cache_path = NULL;
+         return 0;
+     }
+ }
+@@ -299,6 +300,8 @@
+ 
+ static inline void set_cache_file_times(dav_node *node) {
+ 
++    if (node->cache_path == NULL)
++        return;
+     struct utimbuf t;
+     t.actime = node->atime;
+     t.modtime = node->mtime;
+@@ -1790,6 +1793,7 @@
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR),
+                "Error %i creating: %s", errno, node->cache_path);
+         free(node->cache_path);
++        node->cache_path = NULL;
+         return EIO;
+     }
+ 
+@@ -1817,6 +1821,7 @@
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR),
+                "Error %i creating: %s", errno, node->cache_path);
+         free(node->cache_path);
++        node->cache_path = NULL;
+         return EIO;
+     }
+ 
+@@ -1839,6 +1844,7 @@
+                "Error writing directory %s", node->cache_path);
+         remove(node->cache_path);
+         free(node->cache_path);
++        node->cache_path = NULL;
+         return EIO;
+     }
+ }
+@@ -1973,7 +1979,7 @@
+ 
+     struct stat st;
+     if (stat(index, &st) == 0) {
+-        blocksize = st.st_blksize;
++        blocksize = (st.st_blksize > 4096) ? 4096 : st.st_blksize;
+     } else {
+         blocksize = 1024;
+     }
+
diff --git a/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1 b/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1
new file mode 100644
index 000000000000..3754423c8bcd
--- /dev/null
+++ b/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1
@@ -0,0 +1,3 @@
+MD5 b508ee29fe5f06ded4fc43f87fe9e54b davfs2-1.0.2_p20060820.tar.bz2 80240
+RMD160 b07b6b0a458d7da6c3dba9a5a194b693c04e6828 davfs2-1.0.2_p20060820.tar.bz2 80240
+SHA256 1446e1cf1800d6b85d44f5c0f593d4616b0514dd3e3b4f6034f94ccfce6acd0e davfs2-1.0.2_p20060820.tar.bz2 80240