Version bump. Security bug #185886. Omitted conf/msg from list of config-protected webapp files, as it has to be updated unconditionally on version change.

Package-Manager: portage-2.1.3_rc8

4 files changed, 116 insertions, 8 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 04a2d74633b5..8e5ddd9a792e 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2007/06/28 01:01:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.25 2007/07/22 20:31:53 ticho Exp $
+
+*dokuwiki-20070626b (22 Jul 2007)
+
+  22 Jul 2007; Andrej Kacian <ticho@gentoo.org> +dokuwiki-20070626b.ebuild:
+  Version bump. Security bug #185886. Omitted conf/msg from list of
+  config-protected webapp files, as it has to be updated unconditionally on
+  version change.
 
 *dokuwiki-20070626 (28 Jun 2007)
 
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 0b59500ee69c..bd180fd0468c 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -7,6 +7,7 @@ RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/postinstall-en.txt 1590
 DIST dokuwiki-2006-11-06.tgz 1058194 RMD160 6b1eee41b7eb464e3a7aaa314a2332256906790e SHA1 2b3022285a4d2ccfd31c19f0ec9aa6ea4bfd5f9c SHA256 97c63ef56234a5031223b9a69582910ff692a3d0929e18481ff39203b13aeb7d
 DIST dokuwiki-2007-06-26.tgz 1214248 RMD160 3d0b9f9badd376a8ec9d2c46625f40acb368a326 SHA1 97bb63b9bd76ab24f71ae598adcfe7b467ab8aae SHA256 7fed6372b710d0e0a033d3a950b1833f72c871bd36dc980cd0469a6d12076e49
+DIST dokuwiki-2007-06-26b.tgz 1214743 RMD160 1d68b261267c3e9cf06df9d8c74813c5c09e39c9 SHA1 5ecfd9678605047b2ce7d8fc781c510bcb7f2b64 SHA256 b24f5596e253cea6670bc4a57e42769301cc6cd82427b975eaa6c7ea56231afd
 DIST dokuwiki-rc2007-05-24.tgz 1180038 RMD160 ae41dac459b72e48dc038292341171acc1bcf1be SHA1 3028cf183872d770a371d5de8d03df4ab3569b3d SHA256 f9d5a18dc56945d119f35093d91194c702e0fb92df0df49e92ecfa532805100d
 EBUILD dokuwiki-20061106.ebuild 2113 RMD160 b6ddd7538cc24ca1889a61e696e3417e282ebb1b SHA1 8972306727c6b53d202b002bcb14c174b5c75cf3 SHA256 5c2632ab983c1065836575e78324e777bd5b2981a1cb1fe84594b7d829b2ef6a
 MD5 93e014d2c7a96ac0bf1c7922f3d34540 dokuwiki-20061106.ebuild 2113
@@ -20,10 +21,14 @@ EBUILD dokuwiki-20070626.ebuild 2114 RMD160 1675c841b6da59863b26d31fe0a44f96b7af
 MD5 f28f3a93d551713835d1e8a735fc208b dokuwiki-20070626.ebuild 2114
 RMD160 1675c841b6da59863b26d31fe0a44f96b7afaaff dokuwiki-20070626.ebuild 2114
 SHA256 9bc73b041059cc20204e2a0cd620e10af46fe414d998c3a459c90df9bbd9fc51 dokuwiki-20070626.ebuild 2114
-MISC ChangeLog 4085 RMD160 60a40b06494bb3acfc3ccfc3cc130f7923a13bc7 SHA1 5ac110c1a615e6a50de636920736ac35f88c9e0b SHA256 82cb3a7db243243dbd7b60cbc6b398fa54575777ddfda108a5ebaeea83e6c0ec
-MD5 694daa7e0c572dd633305ed615a4e5fa ChangeLog 4085
-RMD160 60a40b06494bb3acfc3ccfc3cc130f7923a13bc7 ChangeLog 4085
-SHA256 82cb3a7db243243dbd7b60cbc6b398fa54575777ddfda108a5ebaeea83e6c0ec ChangeLog 4085
+EBUILD dokuwiki-20070626b.ebuild 2232 RMD160 bdded7f6d2e0e16c219696a20e431afeaf593c94 SHA1 f54ac692cb6e8cb10716a413e7c89aad76a80506 SHA256 3055190d829b98b063ac10b02b97fcf8c10bbe292c0498e029be14eb9143e52b
+MD5 ac1cee2f3efd6af0d27094893e722be4 dokuwiki-20070626b.ebuild 2232
+RMD160 bdded7f6d2e0e16c219696a20e431afeaf593c94 dokuwiki-20070626b.ebuild 2232
+SHA256 3055190d829b98b063ac10b02b97fcf8c10bbe292c0498e029be14eb9143e52b dokuwiki-20070626b.ebuild 2232
+MISC ChangeLog 4359 RMD160 b9200ee8eaca51e8488c8bc9fce3c00acfa3143f SHA1 168bc3551719bebc52ba4df4c6fe28da76850d0d SHA256 32ee1c262a5952032aa2e7f2f5f08ec19175c2f2b7765320462b4692ac011e3b
+MD5 dc608c444e661968c403df8386d29fff ChangeLog 4359
+RMD160 b9200ee8eaca51e8488c8bc9fce3c00acfa3143f ChangeLog 4359
+SHA256 32ee1c262a5952032aa2e7f2f5f08ec19175c2f2b7765320462b4692ac011e3b ChangeLog 4359
 MISC metadata.xml 843 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f SHA1 022976ebf107c25d6db434e4765adbaa9645ae5b SHA256 2d1d093fc0a1eb15ba44bebe61142c3c3e17bb87ec7adee4aadb1d8f6a90c693
 MD5 faff62ef368ab735f9a3cd36ccfbeac6 metadata.xml 843
 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f metadata.xml 843
@@ -37,10 +42,13 @@ SHA256 28536b56711d5fcd221cc0d9267fdbe89f0c33e07ee865dce80404b065776886 files/di
 MD5 a0955eb314386f1d62465e5c758e74a6 files/digest-dokuwiki-20070626 253
 RMD160 6399f407b6dbbd7edc4868aadca5d1ccdc601e56 files/digest-dokuwiki-20070626 253
 SHA256 a4d65d2f3b07e5eda08aeba04b3c5e23c7421d6eec07464a30ffbe5f7a34f2b2 files/digest-dokuwiki-20070626 253
+MD5 e95d1844b7fc9224255687118cc35b7c files/digest-dokuwiki-20070626b 256
+RMD160 4652f9edccb91afe7471da4e5ed595a89218c237 files/digest-dokuwiki-20070626b 256
+SHA256 1b31bff8989851f690d6a2f8ee267b06b98c2ebc5d5a6388bba78fdd46f05cd3 files/digest-dokuwiki-20070626b 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGgwhXQlM6RnzZP+IRAk48AKDAz8VkRYdSAv3LG+Et+TpTMQ0c3wCfWC8D
-lkmItEBmEoQF/EcFo9epUUA=
-=lfzW
+iD8DBQFGo763QlM6RnzZP+IRAr7ZAKCVtBp+ChQLqzbuZ7pY83w28rPtEQCcC84x
+qlOEhtcnMoxmtvu7UC4PmMA=
+=gZhI
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20070626b.ebuild b/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
new file mode 100644
index 000000000000..9ec74f5b71e8
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
@@ -0,0 +1,90 @@
+# 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-20070626b.ebuild,v 1.1 2007/07/22 20:31:53 ticho Exp $
+
+inherit webapp depend.php
+
+# 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}"
+
+pkg_setup() {
+	# let the eclass pick right php version...
+	require_php_cli
+
+	# ...and we check if correct USE flag for XML support is enabled
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+
+	webapp_pkg_setup
+}
+
+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
+
+	# Mark all conf/* files as config files, except msg, which should be
+	# updated unconditionally.
+	for x in $( ls -1 ${D}/${MY_HTDOCSDIR}/conf | grep -v ^msg$ ) ; do
+		webapp_configfile ${MY_HTDOCSDIR}/conf/$x
+	done
+
+	webapp_src_install
+}
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20070626b b/www-apps/dokuwiki/files/digest-dokuwiki-20070626b
new file mode 100644
index 000000000000..d2004dee0f54
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20070626b
@@ -0,0 +1,3 @@
+MD5 84e9b5e8e617658bb0264aa3836f23b3 dokuwiki-2007-06-26b.tgz 1214743
+RMD160 1d68b261267c3e9cf06df9d8c74813c5c09e39c9 dokuwiki-2007-06-26b.tgz 1214743
+SHA256 b24f5596e253cea6670bc4a57e42769301cc6cd82427b975eaa6c7ea56231afd dokuwiki-2007-06-26b.tgz 1214743