verison bump, covers bug #149266

Package-Manager: portage-2.1.1

4 files changed, 95 insertions, 15 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index ca96061467ba..de80bd8a9c69 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.14 2006/09/14 14:40:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.15 2006/09/27 13:28:24 ramereth Exp $
+
+*dokuwiki-20060309e (27 Sep 2006)
+
+  27 Sep 2006; Lance Albertson <ramereth@gentoo.org>
+  +dokuwiki-20060309e.ebuild:
+  * Version bump (Covers bug #149266)
 
   14 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   dokuwiki-20060309d.ebuild:
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 3f6dcf8c98bc..11a9739726dd 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1 5334752ca970db3bebdba57b3cce9eff125d5888 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41
 MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
@@ -8,6 +5,7 @@ SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/po
 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
 DIST dokuwiki-2006-03-09d.tgz 835964 RMD160 13769beb4a62fea3dbed33c00d1e1bfc77b44ea9 SHA1 ab6a5223e20e56e8453c6989e84ba057c957b9c0 SHA256 9693382dcf7922d83658fd6fe8c690b5ae785422bcac84ae5cb88fb0903b9b4d
+DIST dokuwiki-2006-03-09e.tgz 835945 RMD160 77d703eaea0aa417b955f37424c9af052a2ac68a SHA1 d45aeb3aaebd777e0d7b3b45939aa35aeead9cf3 SHA256 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93
 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
@@ -20,10 +18,14 @@ EBUILD dokuwiki-20060309d.ebuild 1846 RMD160 01ec115419c0de349fe541f79e4d5f6146e
 MD5 3d884b3c43d6d9f5e18d6b2866fb70ae dokuwiki-20060309d.ebuild 1846
 RMD160 01ec115419c0de349fe541f79e4d5f6146eb7ea5 dokuwiki-20060309d.ebuild 1846
 SHA256 fca44afa5078b6855db505213362139a09e910ea01dcf1e3c0cd9842ab27b4d3 dokuwiki-20060309d.ebuild 1846
-MISC ChangeLog 2573 RMD160 316bfc0125029ab97af9be4dec47673dc317562f SHA1 fab2a21c52e6c7e1cf3eec3fbc7e2ee877fe232e SHA256 6fde1a3b92d6c8cddcce36c9f3f943d3fce259de4961f4db0c1f7b57f753ebf7
-MD5 ed77336c92fc7eaa93cce795706f1762 ChangeLog 2573
-RMD160 316bfc0125029ab97af9be4dec47673dc317562f ChangeLog 2573
-SHA256 6fde1a3b92d6c8cddcce36c9f3f943d3fce259de4961f4db0c1f7b57f753ebf7 ChangeLog 2573
+EBUILD dokuwiki-20060309e.ebuild 1847 RMD160 3e73309ef1aa560923d88497063fdba02a7c67c3 SHA1 40cfed81f13818bcd2d3a4a8a659b533202bb38b SHA256 92539b24d0404297245d27926202d6703767f8d0a9af9c04b11a4a6d91cbe88f
+MD5 0241e71b33af98cebaedfae9dd18260b dokuwiki-20060309e.ebuild 1847
+RMD160 3e73309ef1aa560923d88497063fdba02a7c67c3 dokuwiki-20060309e.ebuild 1847
+SHA256 92539b24d0404297245d27926202d6703767f8d0a9af9c04b11a4a6d91cbe88f dokuwiki-20060309e.ebuild 1847
+MISC ChangeLog 2730 RMD160 240757b6fdd791a06e18190d1fb38137a8b88106 SHA1 1345d731b768dc0665e4584cc6e33852a05c5ff5 SHA256 e19defc0d892c12c0e25a681f322bb6467a2414ab30bf680c23c6f7ff9951739
+MD5 5c683cfb0a8d026a0ac01d3ad11ffb48 ChangeLog 2730
+RMD160 240757b6fdd791a06e18190d1fb38137a8b88106 ChangeLog 2730
+SHA256 e19defc0d892c12c0e25a681f322bb6467a2414ab30bf680c23c6f7ff9951739 ChangeLog 2730
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704
@@ -37,10 +39,6 @@ SHA256 f4f33327e466f7edd85d4dd1e8d01d778f70d5c8995fd9eb68325ff2cf977843 files/di
 MD5 49de53a4c5e25cf11813358536276ac8 files/digest-dokuwiki-20060309d 253
 RMD160 21045aad827f293ae2faace4c17e0b37735fd97e files/digest-dokuwiki-20060309d 253
 SHA256 6ee7fded6a20b249f5b24b58bdd4a237e9021b9c7062674a2d95446438370a0a files/digest-dokuwiki-20060309d 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFCWnjkT4lNIS36YERAvEnAJ9K3ncurbDLB/FZlR92o1giyrREdwCdHvTW
-btC2KcSPQm/VXClmB4SNXqM=
-=7aG1
------END PGP SIGNATURE-----
+MD5 e527c2bab3312ebd2bc527001716fb9b files/digest-dokuwiki-20060309e 253
+RMD160 5eff2118181cc6a82db6a478e38ee4eb7539f2b0 files/digest-dokuwiki-20060309e 253
+SHA256 f389638b39e7ce033cfff29754df0a9a5226e1d7146a36c9a4e9aee350d833b3 files/digest-dokuwiki-20060309e 253
diff --git a/www-apps/dokuwiki/dokuwiki-20060309e.ebuild b/www-apps/dokuwiki/dokuwiki-20060309e.ebuild
new file mode 100644
index 000000000000..51cf0f848eb3
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20060309e.ebuild
@@ -0,0 +1,73 @@
+# 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-20060309e.ebuild,v 1.1 2006/09/27 13:28:24 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
+
+	# 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-20060309e b/www-apps/dokuwiki/files/digest-dokuwiki-20060309e
new file mode 100644
index 000000000000..1c23c261dfb3
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20060309e
@@ -0,0 +1,3 @@
+MD5 d6d3aa9e2f32ebbdb04ee07cd84a19e5 dokuwiki-2006-03-09e.tgz 835945
+RMD160 77d703eaea0aa417b955f37424c9af052a2ac68a dokuwiki-2006-03-09e.tgz 835945
+SHA256 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93 dokuwiki-2006-03-09e.tgz 835945