security fix for #63948

5 files changed, 94 insertions, 2 deletions

diff --git a/net-www/mod_dav/ChangeLog b/net-www/mod_dav/ChangeLog
index c4137cb305ad..f191457b1b87 100644
--- a/net-www/mod_dav/ChangeLog
+++ b/net-www/mod_dav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_dav
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_dav/ChangeLog,v 1.13 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_dav/ChangeLog,v 1.14 2004/09/14 10:00:03 tigger Exp $
+
+*mod_dav-1.0.3-r2 (14 Sep 2004)
+
+  14 Sep 2004; Rob Holland <tigger@gentoo.org> +files/mod_dav_fs_lock.patch,
+  +mod_dav-1.0.3-r2.ebuild:
+  security fix for #63948
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_dav-1.0.3-r1.ebuild:
diff --git a/net-www/mod_dav/Manifest b/net-www/mod_dav/Manifest
index 6ad973599528..24a2e77a5a6c 100644
--- a/net-www/mod_dav/Manifest
+++ b/net-www/mod_dav/Manifest
@@ -1,6 +1,9 @@
+MD5 13bcff33027326438e4e968befb703a1 mod_dav-1.0.3-r2.ebuild 1534
+MD5 1243ba2084a7d633f333749bb71c0aa2 mod_dav-1.0.3-r1.ebuild 1466
 MD5 12d6da7421060d84e6b34765ef555037 ChangeLog 1295
 MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 1243ba2084a7d633f333749bb71c0aa2 mod_dav-1.0.3-r1.ebuild 1466
+MD5 7d3db28f46542782bd0dc91504945f8e files/mod_dav_fs_lock.patch 942
 MD5 48fd840765d593fa280f25c60f073e0c files/digest-mod_dav-1.0.3-r1 71
+MD5 48fd840765d593fa280f25c60f073e0c files/digest-mod_dav-1.0.3-r2 71
 MD5 9e45a81bd2b37f2eb70cb5190a60c8ff files/mod_dav-shared-expat.patch 5637
 MD5 336d5f4431aa83af65ea97a2bb8a8572 files/mod_dav.conf 186
diff --git a/net-www/mod_dav/files/digest-mod_dav-1.0.3-r2 b/net-www/mod_dav/files/digest-mod_dav-1.0.3-r2
new file mode 100644
index 000000000000..922f040fb428
--- /dev/null
+++ b/net-www/mod_dav/files/digest-mod_dav-1.0.3-r2
@@ -0,0 +1 @@
+MD5 ba83f2aa6e13b216a11d465b82aab484 mod_dav-1.0.3-1.3.6.tar.gz 185284
diff --git a/net-www/mod_dav/files/mod_dav_fs_lock.patch b/net-www/mod_dav/files/mod_dav_fs_lock.patch
new file mode 100644
index 000000000000..1df4e65e05a3
--- /dev/null
+++ b/net-www/mod_dav/files/mod_dav_fs_lock.patch
@@ -0,0 +1,22 @@
+--- mod_dav-1.0.3-1.3.6/dav_fs_lock.c	2000-12-01 23:32:23.000000000 +0000
++++ mod_dav-1.0.3-1.3.6/dav_fs_lock.c.new	2004-09-14 09:48:24.942429088 +0000
+@@ -1456,13 +1456,13 @@
+ 	}
+ 	if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
+ 	    /* the lock was refreshed. return the lock. */
+-	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
++	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
+ 	    newlock->is_locknull = !resource->exists;
+-	    newlock->scope = dp->f.scope;
+-	    newlock->type = dp->f.type;
+-	    newlock->depth = dp->f.depth;
+-	    newlock->timeout = dp->f.timeout;
+-	    newlock->owner = dp->owner;
++	    newlock->scope = dp_scan->f.scope;
++	    newlock->type = dp_scan->f.type;
++	    newlock->depth = dp_scan->f.depth;
++	    newlock->timeout = dp_scan->f.timeout;
++	    newlock->owner = dp_scan->owner;
+             newlock->auth_user = dp_scan->auth_user;
+ 
+ 	    newlock->next = *locks;
diff --git a/net-www/mod_dav/mod_dav-1.0.3-r2.ebuild b/net-www/mod_dav/mod_dav-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..634e957af943
--- /dev/null
+++ b/net-www/mod_dav/mod_dav-1.0.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_dav/mod_dav-1.0.3-r2.ebuild,v 1.1 2004/09/14 10:00:03 tigger Exp $
+
+inherit eutils
+
+MY_V=${PV}-1.3.6
+
+DESCRIPTION="Apache module for Distributed Authoring and Versioning"
+HOMEPAGE="http://www.webdav.org/mod_dav/"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+S=${WORKDIR}/${PN}-${MY_V}
+SRC_URI="http://www.webdav.org/mod_dav/${PN}-${MY_V}.tar.gz"
+
+DEPEND="virtual/libc =net-www/apache-1*"
+LICENSE="as-is"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	patch -p1 < ${FILESDIR}/${PN}-shared-expat.patch || die
+	epatch ${FILESDIR}/mod_dav_fs_lock.patch
+	autoconf || die
+}
+
+src_compile() {
+	./configure --host=${CHOST} || die
+	emake || die "compile problem"
+}
+
+src_install() {
+	exeinto /usr/lib/apache-extramodules
+	doexe libdav.so
+
+	dodoc README CHANGES INSTALL
+	dohtml LICENSE.html
+
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mod_dav.conf
+}
+
+pkg_postinst() {
+	# empty lock dir..
+	install -m0750 -o apache -g apache -d ${ROOT}/var/lock/mod_dav
+
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libdav.so mod_dav.c dav_module \
+		define=DAV addconf=conf/addon-modules/mod_dav.conf
+	:;
+}