Security bump - fixes bug 544224.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

5 files changed, 20 insertions, 81 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/Manifest b/www-apps/dokuwiki/Manifest
index 4ded1bad69c6..99fcb86e87d5 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX postinstall-en.txt 1791 SHA256 405a54af08d9d08f903bbd33398e7d716ab37228b2ff0e4af81dc2368d64f2bf SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5 WHIRLPOOL 1389c2f1b7e550fa36b979664872de257c7177b4cc5976e90dcd86e4888ffaf439688a8d842490a806a58af9c689c2c40160e2969b7fc023886411a3a8893d0a
-DIST dokuwiki-2014-05-05c.tgz 3175216 SHA256 3a8066216825008f8bed9efc552ac11d9372aa0a603d96416fb2cac64cd9dabd SHA512 4a0eebb1c49408aad8e16701bf30adb387c3b68f3af40d75a849ce962198430af9a1df1a029b872195176f108eb7a655ee75c6625decfd445acd5cdbe715f764 WHIRLPOOL f1340931a153530e48f8c16d96f57b64afd5a6352e64e905bcb8ed9291b8b238555f33dbb55ae166dbfaef0337e19e1057095f46ed826c5edd801ab505f95c34
-DIST dokuwiki-2014-05-05d.tgz 3218335 SHA256 734573e8319ac50bc521dc7b9b0f8afa43a8a9a77bb151c39fc709b03dd030ae SHA512 507a5a4271ca57a05ad7dcf0d0d5222189f5855119c8392b074403f03df1d1ead9ecf7d5b2998e736d88092a3c7ee15999947e99e423a8586a30a4a4f1e469bd WHIRLPOOL fb67895fb758a4da1966eac0e814280999542cbf10e3a1e7c38f3de3f27a6ac54aeec5d0a88fca8abb92996310b6333481ff216a45bc0c2bda3fa88da2c07064
+DIST dokuwiki-2014-05-05e.tgz 3218289 SHA256 015b5e76427b97e584f195bab6652beaa80796f12f4a547ba9b6bc4e50387282 SHA512 b306be2378aed7119c9005fc9d0c8af4d89317eac19d633a992c6e37d9fb23e22493f25854e1803c892951ec995adf2a7689e04001666318614dd78813d0ffa4 WHIRLPOOL cb4823e7110fe83eea7d61fbf2937455b44a27805b849bc475ae5c9f74a4de353be283ebd8f2cf95a94df8ea395a2a34b9f2442e763a64c730401aee67347aa9
 DIST dokuwiki-2014-09-29b.tgz 3241815 SHA256 7f7c705997278cb6769a91a1a7c38053a3edb0663e7ac8285f613c9d849a5487 SHA512 e37cf758d708c8c97668accfe98cbed247acff6c77892160a7f6e9fe8c4b06ea0ab5c542feea85394e35cb4703b348be47f9e25a90750d4b2b3bdc0ba75269f7 WHIRLPOOL 9e8d861b744c5f06612a9f29474007b835e46bd4b1b6139f5a7bffd07e1b9a7ee1f1263f2752757c5c504b3ae04326e938d7aad04914e8a4cf392f368a1564a4
-DIST dokuwiki-2014-09-29c.tgz 3283291 SHA256 5ff1f8699d7aa8f455f8211f10656505037bee19293f90c5ed79a963d5623f09 SHA512 322b58c0b1929a34e79470609644331c4bd7d547212515460627a1ce919819c031f60a8d29a56e3c729c631d1b756316cc226719483ca3cc78a600dd9aaf8739 WHIRLPOOL 385c7a5c7e9a9a40ad0fd5b098ac4cc74237798020a580b128a89b39c7883ba0b1c267660bc0baf2357036e342317b7a20bfd35d4596553fb255f070e84788cf
-EBUILD dokuwiki-20140505c.ebuild 1436 SHA256 bea71ddaba7a25d732e18ee29902c3e245251391075e90d8de9308b95e75d3d5 SHA512 e2f915a5bb50651cd33dcfa700c5916d629dd8fcfe53a5f8abdad4d02dc2493e63bc79e29be4ae71b54c1f4d786b6d40d4a971429340bcdc5fe72baa9c87ff0a WHIRLPOOL 56deafd18fd8b5aa87afc8da3d8604fe323a7a952b2df4db810dfcf4fb42ed45e0e362e0570cdfaf02c950888adb280742fc0b1d07ff244457b4f72dd83e184e
-EBUILD dokuwiki-20140505d.ebuild 1436 SHA256 2c37aa68ad71bbf2cd5551e4104cc370ffe66d720c437bec93d001170e5fd70b SHA512 aae5bd2286eb2759d80eb982c490e8c8d065266db0579fca9d48e1dc08aad49deb20bef7e3b2708d66667599e767249ab4b924f9a7daa9ae7db0853652b24433 WHIRLPOOL e3c731282a531978d7c62a7474e471994cf786de8161d1ddfc5d849465c0fb594475aac9b5200bc3330f2ea7e1372e6aabc66ecc6326688bb2346079d00ae983
+DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a167486a676e9822fa17aab0a45b094794 SHA512 426c41c5d7c6484cc6d5757dbe8e0ac50bf1088406c5c58d975f19fde5f6cb0a0dafb5a27c9901335b1d65a34578f46ffabbd44eed4f5bbd59d6c3fed1c769e3 WHIRLPOOL 59ea72ab973dfc5119056bfccbd5adae9a2ac45b13dbe5971325ca6e1bc4db2e8213aac1d5aab8d699b43b0602dd4b635841e7279e9535c63ed3d80cc85b1007
+EBUILD dokuwiki-20140505e.ebuild 1436 SHA256 812f2543ace215a48e083a62480e9b818ee8c365ec8eddc195c4f7081be4e570 SHA512 65abeefde96987876e6a325c0ec1c4dc7666adfddbb43cdd50838f01c49fb840037469ecb284f1126a64a66fce75e53f8671bd90a7d2c84b48fcbe6acccd473e WHIRLPOOL f613910aab65a20c6834c5c1451c975064232b2ddaa02ee6ad977b723160816858722cbdcb833bb59b9a40a6538e2ae00119c2572068b52a768034b9d5e32296
 EBUILD dokuwiki-20140929b.ebuild 1427 SHA256 ec01a3ec36dfc71f6f629cdd89eb42116707bcfbb8b7e4c24d03883dfa17236c SHA512 1f2808030566169ad4a4ac447b857572bd84ba1f85ef259e39345d0f2db5cb46a67ddf82ec1dc6619aab229bc2a57e4c522ad64bdac460b05b6d7b806cc1a112 WHIRLPOOL f7f1b1f7ec9b2371cfcf0dd00da1a5304a5d7999371d8fa4164a914712079ea512fb7dea562091edbac003fa1f0493e3cdc01e0761573ba26c25ea04dc6411e4
-EBUILD dokuwiki-20140929c.ebuild 1437 SHA256 7192e54c904112a8286c14d5947c58b3019a39008fc6e803c7b888a2dd65e898 SHA512 74be0f1c6eba9e8277978794c306a764c626d74473d126fb84fab3a668523bfeca4dc860cf8b368e3b332e004d9bc2e3b5fac5726028c78fb52a622bd2a5bbb2 WHIRLPOOL 9b50d5a6368d1653f513f49ab95106b6ed5cf590ddae2fdbd68fc6841852e7f56c83c6f2de72f07744d28d1b6becea79177fced75ffbe6304e03fab15255bd9f
-MISC ChangeLog 13070 SHA256 5f31bf58590de40c19ff9d6f4e41909f49bc69c4c8a2cdc03190b96900f3242f SHA512 d99f7e1746246abe6cf96ce90a0ee721fbd22d89b364ab86229e2f24b0d90be08b8dc13f50c70de60c87dd97069f91075c22967ceb03df9e840205a26154bd92 WHIRLPOOL f2a6619ea539c92d03449ef6136dcfbc91d81b107dfcfa057a501d4df25ff83add07449d3df08fd698125aac07c020bcbf6ca9afc68c3df5bc43d208ac9adeca
+EBUILD dokuwiki-20140929d.ebuild 1437 SHA256 9f742614ad0759cb5c81b284846f6116c96598630a6e75dfbb936eece6acbe2d SHA512 b990c05bfd4b8b5d1582ba1221a59a082aa8ca49ce97e112439279d607778c69b8d522aed62082be4fb46f48969d9e433e9feff169a84ac7b4fcb4288b3d5082 WHIRLPOOL 780e9aa99ec10531864ba0d40d64f30a333eb42ab5f896fb285a109be5c10a465b8ad73c43df0abdf7ff031a1adad3bfd3504103bbad8662186ac93ce0cfdf84
+MISC ChangeLog 13389 SHA256 25bf28e91b273b8452504fb43e78e2ce23c5238115a6ad99111823a228d2b4c9 SHA512 7e2faa85ec63859ef2a46577225991ed319d3cbdd925fe1fe01ac8a019b75cba1b2ddc3553aa69cf7a994bf9d26baab693a37e4b1f6ed55deec41adf003409fb WHIRLPOOL 7051b97c5bdba8b3aa9f1b431417f83a4f76c31cdfdf82669e9b352f8c1e2229e50be8aa87962105db280e5902c4e1ab53b61f62607d981c140577b6b771fd50
 MISC metadata.xml 718 SHA256 f09401b27714eef1fa1d93931a6d79202861515bff4fc65696051ce3b02934dc SHA512 d7f28ddf829f1a652bb1595b739df5b3645ab67e0b4e625e5265e2e4cf91d9eec482ce17ae3d64446f6175b5620b4fda7522978bd196fc0f2681ab7cb9eac9d3 WHIRLPOOL af259deda9fe17c5fdd7c26d545ad983aaab3b95acb8e7f50e383d82d9dad59744c33d58bf79f69ae84ef9ffe22269c5caaedd89102b399874504bc7d036c2fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT2IXMACgkQaezjy7sObph0LAEAk4usTFbn76gg+RFn/Nu+3P3x
-S10eamV1BmBy70nc/1cBAJbbsdgP/+gcnQ6jAMGosCjLmcRHogDrWmLSDd+IZRYE
-=LmWY
+iF4EAREIAAYFAlUmudUACgkQaezjy7sObph0PgEAvSstBsmgQPLX63tM4QjhW1AT
+Sp7HqrmZksaIq1aodMUA/1e5HYqT9UOVgkbIJrU3OBqx7RA8rA1pDezaCD3shGZ5
+=6Vj5
 -----END PGP SIGNATURE-----
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