Version bump, security bug #163781.

(Portage version: 2.1.2.2)

4 files changed, 87 insertions, 1 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index caaafc6c1f01..602836915cdc 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.17 2007/03/01 01:13:06 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.18 2007/03/15 22:33:44 ticho Exp $
+
+*dokuwiki-20061106 (15 Mar 2007)
+
+  15 Mar 2007; Andrej Kacian <ticho@gentoo.org> +dokuwiki-20061106.ebuild:
+  Version bump, security bug #163781.
 
   01 Mar 2007; Renat Lumpau <rl03@gentoo.org> -dokuwiki-20060309-r1.ebuild,
   -dokuwiki-20060309c.ebuild, -dokuwiki-20060309d.ebuild:
diff --git a/www-apps/dokuwiki/dokuwiki-20061106.ebuild b/www-apps/dokuwiki/dokuwiki-20061106.ebuild
new file mode 100644
index 000000000000..13fb547c577b
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20061106.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20061106.ebuild,v 1.1 2007/03/15 22:33:44 ticho Exp $
+
+inherit webapp
+
+# Upstream uses dashes in the datestamp
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
+documentation needs."
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
+SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/php"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${PN}-${MY_PV}.tgz
+	mv ${PN}-${MY_PV} ${P}
+}
+
+src_compile() {
+	# Default compile hangs
+	echo "Nothing to compile"
+}
+
+src_install() {
+	local docs="README"
+	webapp_src_preinst
+
+	# NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} COPYING; do
+		rm -f ${doc}
+	done
+
+	# Move bin directory to safe location (outside of docroot)
+	# To resolve security bug #146800
+	docinto scripts
+	dodoc bin/*
+	rm -rf bin
+
+	einfo "Copying main files"
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	# Install the htaccess file for pretty urls
+	cp .htaccess ${D}/${MY_HTDOCSDIR}
+
+	# Create initial changes file
+	touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
+
+	# The data dir needs to be owned by the server
+	for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
+
+	webapp_configfile ${MY_HTDOCSDIR}/conf
+	for x in $( cd ${D}/${MY_HTDOCSDIR}/conf && echo * ) ; do
+		webapp_configfile ${MY_HTDOCSDIR}/conf/$x
+	done
+
+	webapp_src_install
+}
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20061106 b/www-apps/dokuwiki/files/digest-dokuwiki-20061106
new file mode 100644
index 000000000000..ddfb1ba514e0
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20061106
@@ -0,0 +1,3 @@
+MD5 4abab36f55f90ff1f780b5b48b4c47f1 dokuwiki-2006-11-06.tgz 1058194
+RMD160 6b1eee41b7eb464e3a7aaa314a2332256906790e dokuwiki-2006-11-06.tgz 1058194
+SHA256 97c63ef56234a5031223b9a69582910ff692a3d0929e18481ff39203b13aeb7d dokuwiki-2006-11-06.tgz 1058194
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index c881626d8ae2..c9be0f890745 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/metadata.xml
@@ -6,6 +6,11 @@
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
 	</maintainer>
+	<maintainer>
+		<email>ticho@gentoo.org</email>
+		<name>Andrej Kacian</name>
+		<description>Backup maintainer</description>
+	</maintainer>
 	<longdescription lang="en">
 		DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
 		creating documentation of any kind. It is targeted at developer teams,