version bump, also fixes security bug #146800

Package-Manager: portage-2.1-r2

4 files changed, 89 insertions, 5 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 123e21db31a3..75a992b20272 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.10 2006/09/05 04:25:11 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.11 2006/09/11 15:55:58 ramereth Exp $
+
+*dokuwiki-20060309c (11 Sep 2006)
+
+  11 Sep 2006; Lance Albertson <ramereth@gentoo.org>
+  +dokuwiki-20060309c.ebuild:
+  * Version bump, also fixes security bug #146800
 
   05 Sep 2006; Lance Albertson <ramereth@gentoo.org>
   -dokuwiki-20050922.ebuild:
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index b912a52172c6..b77395429bf3 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -3,14 +3,19 @@ MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/postinstall-en.txt 1590
 DIST dokuwiki-2006-03-09.tgz 834975 RMD160 180d091711a17f53b77bf1ddc8c699764fe57096 SHA1 e6b096ec765a47ada042fde745436b5083f8aba7 SHA256 1c325c120aae7834cea6f8e7caf6938ebaf5231b7134ff0bf36ca59d86286a6a
+DIST dokuwiki-2006-03-09c.tgz 835922 RMD160 9544d2c3fa6f6389610f90a331c57ec2a0053cfb SHA1 a883a5437d72d88ee45a8560b2be3d8c09621502 SHA256 85bcb6eba52f472c98e3f3a05dcd538ac6a067e82a292d9bd4e67faeed9853df
 EBUILD dokuwiki-20060309-r1.ebuild 1698 RMD160 c5baa3f0c3548c59b6190ac42264e59b8c3c096a SHA1 9f50f28b72e30fb8341bcc8a086c9a1b84b92fb4 SHA256 2d79f3c5a347385acc2c036718973dee65bd80b2a671b242f7b6fc989437a089
 MD5 8b25f5341daccdac9edea6357192235a dokuwiki-20060309-r1.ebuild 1698
 RMD160 c5baa3f0c3548c59b6190ac42264e59b8c3c096a dokuwiki-20060309-r1.ebuild 1698
 SHA256 2d79f3c5a347385acc2c036718973dee65bd80b2a671b242f7b6fc989437a089 dokuwiki-20060309-r1.ebuild 1698
-MISC ChangeLog 1975 RMD160 7e96db1be0cb76961b85b3a74df3ccfe07c2dd9d SHA1 23d4bff1f532fb882b16be4940906d5e0929c9af SHA256 c690e9cebc859e96c72cfae4d611f2e21a33c8db5d25a6d683f139e983029004
-MD5 cc7b1c3b8746e94ce8e8f996b94ec847 ChangeLog 1975
-RMD160 7e96db1be0cb76961b85b3a74df3ccfe07c2dd9d ChangeLog 1975
-SHA256 c690e9cebc859e96c72cfae4d611f2e21a33c8db5d25a6d683f139e983029004 ChangeLog 1975
+EBUILD dokuwiki-20060309c.ebuild 1709 RMD160 fbfeee271f83e74be4ff125a7f0c67447f198865 SHA1 420f3921a0a3c6c76613e55605868659c778a475 SHA256 f0b0bcb27c79c7c86b69d83996966a3949e802a9053610e3f2940e12e4fc92cb
+MD5 28d01f0c9598b03948d0d1b8d2d5e83d dokuwiki-20060309c.ebuild 1709
+RMD160 fbfeee271f83e74be4ff125a7f0c67447f198865 dokuwiki-20060309c.ebuild 1709
+SHA256 f0b0bcb27c79c7c86b69d83996966a3949e802a9053610e3f2940e12e4fc92cb dokuwiki-20060309c.ebuild 1709
+MISC ChangeLog 2144 RMD160 f56deec7cb00811f4f65dbf2c9e0588b3f4957e9 SHA1 65001f607a865dc437275d0c15b7917ea4975e86 SHA256 7c17b369dee84623329a6a8d8de9778acfad10f0740192165408837c596649ae
+MD5 79df844aae7efab05aa46c2ba1be4b8b ChangeLog 2144
+RMD160 f56deec7cb00811f4f65dbf2c9e0588b3f4957e9 ChangeLog 2144
+SHA256 7c17b369dee84623329a6a8d8de9778acfad10f0740192165408837c596649ae ChangeLog 2144
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704
@@ -18,3 +23,6 @@ SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 metadata
 MD5 3ef2eb1518b86ded6561bbf7755148ac files/digest-dokuwiki-20060309-r1 250
 RMD160 f5fca261e08bb79f06ab2dcfaf0b11298d8766ff files/digest-dokuwiki-20060309-r1 250
 SHA256 b9304ee7f325048fa99373c0eb967e6f79836412c2432780a618777f947ea98f files/digest-dokuwiki-20060309-r1 250
+MD5 2314c2843516d99057414f1323cfc228 files/digest-dokuwiki-20060309c 253
+RMD160 3fd83ff588da53d273939fcb7f66bce8b4d2c496 files/digest-dokuwiki-20060309c 253
+SHA256 f4f33327e466f7edd85d4dd1e8d01d778f70d5c8995fd9eb68325ff2cf977843 files/digest-dokuwiki-20060309c 253
diff --git a/www-apps/dokuwiki/dokuwiki-20060309c.ebuild b/www-apps/dokuwiki/dokuwiki-20060309c.ebuild
new file mode 100644
index 000000000000..f97b0eb21876
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20060309c.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20060309c.ebuild,v 1.1 2006/09/11 15:55:58 ramereth Exp $
+
+inherit webapp
+
+# Upstream uses dashes in the datestamp
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}"
+
+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
+
+	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-20060309c b/www-apps/dokuwiki/files/digest-dokuwiki-20060309c
new file mode 100644
index 000000000000..b8f54f0ae28b
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20060309c
@@ -0,0 +1,3 @@
+MD5 de5ea0e1e18c9b57d92b9e83f2fc47ac dokuwiki-2006-03-09c.tgz 835922
+RMD160 9544d2c3fa6f6389610f90a331c57ec2a0053cfb dokuwiki-2006-03-09c.tgz 835922
+SHA256 85bcb6eba52f472c98e3f3a05dcd538ac6a067e82a292d9bd4e67faeed9853df dokuwiki-2006-03-09c.tgz 835922