Security bump - fixes bug 544224.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

4 files changed, 12 insertions, 71 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 24a1b76f0730..665b21cd478b 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.76 2015/03/03 21:03:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.77 2015/04/09 17:42:18 jmbsvicetto Exp $
+
+*dokuwiki-20140929d (09 Apr 2015)
+*dokuwiki-20140505e (09 Apr 2015)
+
+  09 Apr 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +dokuwiki-20140505e.ebuild, +dokuwiki-20140929d.ebuild,
+  -dokuwiki-20140505c.ebuild, -dokuwiki-20140505d.ebuild,
+  -dokuwiki-20140929c.ebuild:
+  Security bump - fixes bug 544224.
 
 *dokuwiki-20140505d (03 Mar 2015)
 
diff --git a/www-apps/dokuwiki/dokuwiki-20140505c.ebuild b/www-apps/dokuwiki/dokuwiki-20140505c.ebuild
deleted file mode 100644
index f3c6e2be95fd..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20140505c.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505c.ebuild,v 1.1 2014/12/12 13:47:14 jmbsvicetto Exp $
-
-EAPI=5
-
-inherit webapp depend.php
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.3[xml]
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# create initial changes file
-	touch data/changes.log
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20140505d.ebuild b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
index 3db0a28b8f6f..19650acfdb81 100644
--- a/www-apps/dokuwiki/dokuwiki-20140505d.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505d.ebuild,v 1.1 2015/03/03 21:03:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild,v 1.1 2015/04/09 17:42:18 jmbsvicetto Exp $
 
 EAPI=5
 
diff --git a/www-apps/dokuwiki/dokuwiki-20140929c.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
index 51526b6ebb93..6e8d7c1f9c69 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929c.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929c.ebuild,v 1.1 2015/03/01 17:39:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d.ebuild,v 1.1 2015/04/09 17:42:18 jmbsvicetto Exp $
 
 EAPI=5