Fixes for security bug #135623, and config bug #129473

Package-Manager: portage-2.1

7 files changed, 26 insertions, 195 deletions

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 16477cb666d4..d6042612eebe 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,11 +1,28 @@
-MD5 73297cc5e57f72e43161dfa268e8efbd ChangeLog 1409
-MD5 81e31544f5fdc97318231fa56e0ecded dokuwiki-20050713.ebuild 1498
-MD5 ff3c1be2a0242be8b4c82c569291bc00 dokuwiki-20050922.ebuild 1498
-MD5 ea04a6453c070856698e0785bd86264e dokuwiki-20060305.ebuild 1503
-MD5 dc4b54730dcae7d58f055227353bdb5f dokuwiki-20060309.ebuild 1652
-MD5 a65ef20ee770f09cfcd76f346f3da136 files/digest-dokuwiki-20050713 68
-MD5 a8cdb48781eb1d76bdd22351814a2b9a files/digest-dokuwiki-20050922 68
-MD5 0adbd91b5af89c1dd5e28f21a5dc8a61 files/digest-dokuwiki-20060305 68
-MD5 11a8b6d4353a7ed4414cbd86e5785661 files/digest-dokuwiki-20060309 68
+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-2005-09-22.tgz 643401
+DIST dokuwiki-2006-03-09.tgz 834975 RMD160 180d091711a17f53b77bf1ddc8c699764fe57096 SHA1 e6b096ec765a47ada042fde745436b5083f8aba7 SHA256 1c325c120aae7834cea6f8e7caf6938ebaf5231b7134ff0bf36ca59d86286a6a
+EBUILD dokuwiki-20050922.ebuild 1498 RMD160 325d63c26cf4757132d0089834dac82446a96215 SHA1 3e10467f9eb1b2e710a6f162edaee190fea041e6 SHA256 b14d0006445f14fee5051aac7683ed5fd101541055364eff7b09d2f81d438bde
+MD5 ff3c1be2a0242be8b4c82c569291bc00 dokuwiki-20050922.ebuild 1498
+RMD160 325d63c26cf4757132d0089834dac82446a96215 dokuwiki-20050922.ebuild 1498
+SHA256 b14d0006445f14fee5051aac7683ed5fd101541055364eff7b09d2f81d438bde dokuwiki-20050922.ebuild 1498
+EBUILD dokuwiki-20060309-r1.ebuild 1700 RMD160 260af9501d710e54a748881c396bd52a778fc10e SHA1 3a5ae720f22924ebe9f6f6e3529faf6f5defc358 SHA256 e09d468f8a25bf81bcc689131048d068d5c740515861a4459206707cd6500290
+MD5 47be5a8cdeafcc0d2f51abd5575a6b76 dokuwiki-20060309-r1.ebuild 1700
+RMD160 260af9501d710e54a748881c396bd52a778fc10e dokuwiki-20060309-r1.ebuild 1700
+SHA256 e09d468f8a25bf81bcc689131048d068d5c740515861a4459206707cd6500290 dokuwiki-20060309-r1.ebuild 1700
+MISC ChangeLog 1750 RMD160 46d19ab2a82cc0873d95901d427bb7cdf3fae80d SHA1 00f13e3f5be600f4cdf7d36ed1e1546c3971e8bb SHA256 93fa23e5de7f65dc9a49498a66a3f3757d8871ae4eccb8c3031c36fcad2939fa
+MD5 a8e502297bbd47460f4852d6f761718a ChangeLog 1750
+RMD160 46d19ab2a82cc0873d95901d427bb7cdf3fae80d ChangeLog 1750
+SHA256 93fa23e5de7f65dc9a49498a66a3f3757d8871ae4eccb8c3031c36fcad2939fa ChangeLog 1750
+MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
+RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704
+SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 metadata.xml 704
+MD5 a8cdb48781eb1d76bdd22351814a2b9a files/digest-dokuwiki-20050922 68
+RMD160 85350b0056a4368832b64998ef0262bfa19a644c files/digest-dokuwiki-20050922 68
+SHA256 3485ba29a0d3bafaafc11d0897814cf21fda0759aec789ef2b98887b71cb50d9 files/digest-dokuwiki-20050922 68
+MD5 3ef2eb1518b86ded6561bbf7755148ac files/digest-dokuwiki-20060309-r1 250
+RMD160 f5fca261e08bb79f06ab2dcfaf0b11298d8766ff files/digest-dokuwiki-20060309-r1 250
+SHA256 b9304ee7f325048fa99373c0eb967e6f79836412c2432780a618777f947ea98f files/digest-dokuwiki-20060309-r1 250
diff --git a/www-apps/dokuwiki/dokuwiki-20050713.ebuild b/www-apps/dokuwiki/dokuwiki-20050713.ebuild
deleted file mode 100644
index 3f5a844fff6b..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20050713.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050713.ebuild,v 1.3 2005/11/20 05:11:07 ramereth 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/Programming/PHP/DokuWiki/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~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_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20060305.ebuild b/www-apps/dokuwiki/dokuwiki-20060305.ebuild
deleted file mode 100644
index fad006f32d3c..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20060305.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-20060305.ebuild,v 1.1 2006/03/10 04:58:49 ramereth 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
-
-	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_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20060309.ebuild b/www-apps/dokuwiki/dokuwiki-20060309.ebuild
deleted file mode 100644
index c8bb7d3b8ba4..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20060309.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-20060309.ebuild,v 1.2 2006/04/12 01:22:49 ramereth 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
-
-	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
-	# Commented out until I have time to fix this (bug #129473)
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/*
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20050713 b/www-apps/dokuwiki/files/digest-dokuwiki-20050713
deleted file mode 100644
index 8da8ed2b9370..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20050713
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a034e5cf491b2da87670a938a84643c9 dokuwiki-2005-07-13.tgz 497122
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060305 b/www-apps/dokuwiki/files/digest-dokuwiki-20060305
deleted file mode 100644
index 524bba7e2106..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060305
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a105be3d33729006513ce07b1dded9d3 dokuwiki-2006-03-05.tgz 828293
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060309 b/www-apps/dokuwiki/files/digest-dokuwiki-20060309
deleted file mode 100644
index 65cc4e0d0a36..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060309
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d67c854712347e7c3cdba6b4a951c533 dokuwiki-2006-03-09.tgz 834975