version bump, moved scripts in bin dir to safer location to resolve bug #146800

Package-Manager: portage-2.1-r2

4 files changed, 96 insertions, 15 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index b27f6acf1cc0..acdb1c009785 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2006/09/12 09:18:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.13 2006/09/14 13:25:40 ramereth Exp $
+
+*dokuwiki-20060309d (14 Sep 2006)
+
+  14 Sep 2006; Lance Albertson <ramereth@gentoo.org>
+  +dokuwiki-20060309d.ebuild:
+  * Version bump
+  * Moved bin/ directory to /usr/share doc area to fix security bug #146800
 
   12 Sep 2006; <ticho@gentoo.org> dokuwiki-20060309c.ebuild:
   Stable on x86, security bug 146800.
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 494031ad1161..cfdd183ee37f 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,12 +1,10 @@
------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
 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
+DIST dokuwiki-2006-03-09d.tgz 835964 RMD160 13769beb4a62fea3dbed33c00d1e1bfc77b44ea9 SHA1 ab6a5223e20e56e8453c6989e84ba057c957b9c0 SHA256 9693382dcf7922d83658fd6fe8c690b5ae785422bcac84ae5cb88fb0903b9b4d
 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
@@ -15,10 +13,14 @@ EBUILD dokuwiki-20060309c.ebuild 1705 RMD160 6805f139cbeac54c6dc1c5d0f0d3f049221
 MD5 63d0f492d5561ff6745920eda97e1715 dokuwiki-20060309c.ebuild 1705
 RMD160 6805f139cbeac54c6dc1c5d0f0d3f0492213536f dokuwiki-20060309c.ebuild 1705
 SHA256 438ba81a7fd0197f345e9c2fcfc0301465d8951ff66e3e0d49e61f4420f1a53e dokuwiki-20060309c.ebuild 1705
-MISC ChangeLog 2241 RMD160 a062ac7e5245464b6cca662ffe5a5b80fba81dcf SHA1 46385da98bc2b9833e7b2e7f5260f43796f36615 SHA256 9d3ec50676516222e618a82fd9292d9e8879b57ba3fe879d61e104d7cdd51b68
-MD5 92d1faf9cae577de322007c9a87980d6 ChangeLog 2241
-RMD160 a062ac7e5245464b6cca662ffe5a5b80fba81dcf ChangeLog 2241
-SHA256 9d3ec50676516222e618a82fd9292d9e8879b57ba3fe879d61e104d7cdd51b68 ChangeLog 2241
+EBUILD dokuwiki-20060309d.ebuild 1847 RMD160 62df35772bc56f2956b27f66daf2b4a36e352c69 SHA1 b7dee1798fad22f1b8105bbae2a35876ce2ff201 SHA256 fe07f96e1532ff923090afb081d3638bbcec46b61662e665e5851793a718cb42
+MD5 1981ee0fd176afbdcee65d7458f15d5e dokuwiki-20060309d.ebuild 1847
+RMD160 62df35772bc56f2956b27f66daf2b4a36e352c69 dokuwiki-20060309d.ebuild 1847
+SHA256 fe07f96e1532ff923090afb081d3638bbcec46b61662e665e5851793a718cb42 dokuwiki-20060309d.ebuild 1847
+MISC ChangeLog 2456 RMD160 0a211c2eca970ef9d359eb4db63f361a128892a4 SHA1 9373e24389ac3aa932df33457cac3436984b9468 SHA256 2b8b351369a91d5e5f7bd62f5aa827cdfa3ed9b1730e5f4a0699dec0e09648cf
+MD5 978e014c8e40e9a1c30b12b88214e31d ChangeLog 2456
+RMD160 0a211c2eca970ef9d359eb4db63f361a128892a4 ChangeLog 2456
+SHA256 2b8b351369a91d5e5f7bd62f5aa827cdfa3ed9b1730e5f4a0699dec0e09648cf ChangeLog 2456
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704
@@ -29,10 +31,6 @@ SHA256 b9304ee7f325048fa99373c0eb967e6f79836412c2432780a618777f947ea98f files/di
 MD5 2314c2843516d99057414f1323cfc228 files/digest-dokuwiki-20060309c 253
 RMD160 3fd83ff588da53d273939fcb7f66bce8b4d2c496 files/digest-dokuwiki-20060309c 253
 SHA256 f4f33327e466f7edd85d4dd1e8d01d778f70d5c8995fd9eb68325ff2cf977843 files/digest-dokuwiki-20060309c 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFBnt910xuJSrg3/sRAvpCAJ93823d2PHKwmzuEGCQBSfe1ABV2QCfRKz8
-egdKilyQ7QvvMV0EanuTOkQ=
-=wc91
------END PGP SIGNATURE-----
+MD5 49de53a4c5e25cf11813358536276ac8 files/digest-dokuwiki-20060309d 253
+RMD160 21045aad827f293ae2faace4c17e0b37735fd97e files/digest-dokuwiki-20060309d 253
+SHA256 6ee7fded6a20b249f5b24b58bdd4a237e9021b9c7062674a2d95446438370a0a files/digest-dokuwiki-20060309d 253
diff --git a/www-apps/dokuwiki/dokuwiki-20060309d.ebuild b/www-apps/dokuwiki/dokuwiki-20060309d.ebuild
new file mode 100644
index 000000000000..e48c46d90038
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20060309d.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-20060309d.ebuild,v 1.1 2006/09/14 13:25:40 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-20060309d b/www-apps/dokuwiki/files/digest-dokuwiki-20060309d
new file mode 100644
index 000000000000..f00beada98a5
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20060309d
@@ -0,0 +1,3 @@
+MD5 e061b6f02943e9b0e47866c6d14a1df2 dokuwiki-2006-03-09d.tgz 835964
+RMD160 13769beb4a62fea3dbed33c00d1e1bfc77b44ea9 dokuwiki-2006-03-09d.tgz 835964
+SHA256 9693382dcf7922d83658fd6fe8c690b5ae785422bcac84ae5cb88fb0903b9b4d dokuwiki-2006-03-09d.tgz 835964