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.

(Portage version: 2.1.3_rc8)

3 files changed, 101 insertions, 1 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/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