Bump dokuwiki versions to address an XSS with SWF uploads - announcement https://www.freelists.org/post/dokuwiki/XSS-via-SWF-uploads-hotfix,3

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

4 files changed, 107 insertions, 24 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 6a6de5eccddf..acfa7ff1ca13 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.70 2014/10/27 14:23:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.71 2014/12/12 13:47:14 jmbsvicetto Exp $
+
+*dokuwiki-20140929b (12 Dec 2014)
+*dokuwiki-20140505c (12 Dec 2014)
+
+  12 Dec 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +dokuwiki-20140505c.ebuild, +dokuwiki-20140929b.ebuild,
+  -dokuwiki-20121013.ebuild:
+  Bump dokuwiki versions to address an XSS with SWF uploads - announcement
+  https://www.freelists.org/post/dokuwiki/XSS-via-SWF-uploads-hotfix,3
 
   27 Oct 2014; Agostino Sarubbo <ago@gentoo.org> dokuwiki-20140505b.ebuild,
   dokuwiki-20140929a.ebuild:
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 4377f7cb15f8..4f54461b37e4 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA256
 
 AUX postinstall-en.txt 1791 SHA256 405a54af08d9d08f903bbd33398e7d716ab37228b2ff0e4af81dc2368d64f2bf SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5 WHIRLPOOL 1389c2f1b7e550fa36b979664872de257c7177b4cc5976e90dcd86e4888ffaf439688a8d842490a806a58af9c689c2c40160e2969b7fc023886411a3a8893d0a
-DIST dokuwiki-2012-10-13.tgz 2810228 SHA256 27119ad9b62514dccf3afa4545370d5a775eb71ab794365a498e966f8b6c3834 SHA512 be3b14db2835576fa6df784608b078d36f9df1d126aa094b5ccc5df5b841807a3732301f191d5977815cd6eedcda12a8da9f0a8a209091706c4fc27126cecdd6 WHIRLPOOL d0bd2ed27c9828eba7200d5888ba44b95dcca848540043ee47679bf8d8f01e4b8a83242476ccb24ecb573eb6af9586c44fd8b1e5bc766b32eb50c58751f3ceef
 DIST dokuwiki-2014-05-05b.tgz 3174582 SHA256 2cfe1c2697ba3994244bff2b64406bf10c3c699c8a7b299ea27116c79487a143 SHA512 eda3b2d6e73e32db2a9931e8ea79fdc962ace6b20ea8371123bd63dbf15ab50a2610ca0666798114ec640e8cb9a94020601873fe3641008dd014c5535a17cd06 WHIRLPOOL 95ea657c3e5a63ca2bd0511eda97c4a19501cf05a922efa6d2777d1780904513ee462a5e7b450e51f1dfb3cae6816aea1a524ee8b3149143c4284a4a5660eb7e
+DIST dokuwiki-2014-05-05c.tgz 3175216 SHA256 3a8066216825008f8bed9efc552ac11d9372aa0a603d96416fb2cac64cd9dabd SHA512 4a0eebb1c49408aad8e16701bf30adb387c3b68f3af40d75a849ce962198430af9a1df1a029b872195176f108eb7a655ee75c6625decfd445acd5cdbe715f764 WHIRLPOOL f1340931a153530e48f8c16d96f57b64afd5a6352e64e905bcb8ed9291b8b238555f33dbb55ae166dbfaef0337e19e1057095f46ed826c5edd801ab505f95c34
 DIST dokuwiki-2014-09-29a.tgz 3241616 SHA256 6b5c7060d0c2735ab61e5f563479414b3741289f6d020babbaeaa97575d76d9f SHA512 fd0a15c4c0fb09e1e63489dc0565fdb294df0ae26a273337b455dc3abdf2923562a6b318c42ab19f665323dc58f96a14f845d4726988547c13775c149d77bf09 WHIRLPOOL 1e55b7994a829626a5a21a3b47df3530c7d3af65a27d13cb5a0784ba163cb312b0ef441021137786f946a8a245a80514b33805ecb91fec691b0bb2c5cd3ee897
-EBUILD dokuwiki-20121013.ebuild 1430 SHA256 1e080e143d71ab8d485ef7f7993c7294acac8b6a9085408880cf18af9d930efd SHA512 f21e05a2fa0326d005d4e10790ecae3d6e16f6328c32191b0c0d726debdde234497c6270720b0c2c975255113ce6c1d00daa3cd5638eecb0c84fd6b09778449c WHIRLPOOL 93f5ebad6637bc9d1ed470a8dae85d67d2b18652c52aff8f87869fa5dbbfb95b0dd654619aac9a80c0a1c5570f427bae9a1c5aaea5b2fcbc1b4bb31a02c3ca86
+DIST dokuwiki-2014-09-29b.tgz 3241815 SHA256 7f7c705997278cb6769a91a1a7c38053a3edb0663e7ac8285f613c9d849a5487 SHA512 e37cf758d708c8c97668accfe98cbed247acff6c77892160a7f6e9fe8c4b06ea0ab5c542feea85394e35cb4703b348be47f9e25a90750d4b2b3bdc0ba75269f7 WHIRLPOOL 9e8d861b744c5f06612a9f29474007b835e46bd4b1b6139f5a7bffd07e1b9a7ee1f1263f2752757c5c504b3ae04326e938d7aad04914e8a4cf392f368a1564a4
 EBUILD dokuwiki-20140505b.ebuild 1426 SHA256 09467574070f4546322c9ccba40baf45cb0db15ceb79b453e768621ee71e21a2 SHA512 d86dce49ca415ae595145b1778bddcbb7ef298622c287b4e0cfb99739211918df4567197784d134bd8fb81eb46978e2a4f234c998d51efa4031e38cf267303f7 WHIRLPOOL f225d558e0657508326348e255edb43bb1994f122a2d0981a8a82098e8fe978559339d92bad5849a60abdc4f00d8617f24fafa05177376ae33508d3052468b29
+EBUILD dokuwiki-20140505c.ebuild 1436 SHA256 bea71ddaba7a25d732e18ee29902c3e245251391075e90d8de9308b95e75d3d5 SHA512 e2f915a5bb50651cd33dcfa700c5916d629dd8fcfe53a5f8abdad4d02dc2493e63bc79e29be4ae71b54c1f4d786b6d40d4a971429340bcdc5fe72baa9c87ff0a WHIRLPOOL 56deafd18fd8b5aa87afc8da3d8604fe323a7a952b2df4db810dfcf4fb42ed45e0e362e0570cdfaf02c950888adb280742fc0b1d07ff244457b4f72dd83e184e
 EBUILD dokuwiki-20140929a.ebuild 1426 SHA256 b79c4fdb709f5fce7a7d4f6bca32d4d70284343aa4709e95dc86cd1095031377 SHA512 395361281430476382256c206dc0eb45dace0b79eac7bacd48cde7f28084b822ba28859742624d6911363f9400f5018321cefce5bc110e6d0ebf3d6047488649 WHIRLPOOL 3f4110af2fc5d91a21b8a00c76d2bb99bb3c81f1e1c610997ef2b88298870a68bf64d3c9d30a8d01d733a570ff147706edfffda131c27bb623c08967bd826e3c
-MISC ChangeLog 11944 SHA256 909caf2f07cef8e4b49f9e85549d3b60276b08ac7e4f78f64f4b6ed9409578e6 SHA512 cdbe1ed0b3f386a10a5d430c188e1485da1620e6c2111619e1d9664745f48f267b8b6ab118561894676569d3dce338d622e870dd26c3cff3bcca7fb43773b59b WHIRLPOOL a1f73fb7fc8fb9475b3875f95d3c0082c36fd9914721c749941afcb605f4fecb99f6f47bdb03f6c846458a3a7f5e112da81eb1b1f801b2bd6f92de9a852d3e83
+EBUILD dokuwiki-20140929b.ebuild 1437 SHA256 4d64e82830a93c4b3a0a05fa8b963f4b66cfe4a0ba685f4915f4c58a091c1600 SHA512 7f483b818afae4b0afd4985422b53973b9b1302e76c0b1ab4960cb33259f683cf301a05dd01d9a95a36e7bdc5994b7b99dc2caa92c01144cc56981f84deb1443 WHIRLPOOL 0dc513e0cdb10a7f0e0df4640c2d5169b0212ac151ffe32950ff14912b43d8f95cdf1e9640a896fcd0e3874e305c340e6a55346708d4d5b2eaecd865e644a15f
+MISC ChangeLog 12322 SHA256 54b8756a2d096d8e8d401fcbfef3816d5e3876d513400d25c9e5c2a08460fc78 SHA512 49944c549935a68c6a2cdb77365966ab510f2c526622ad852e425c5757f3fcd4043d62dfe35e0eb1d152d72e55ef4176526364ece041e4004074485e460b89f2 WHIRLPOOL 4a1a9eedb52a4cbe3c510637ad757fae7c73efff0cbd092a80dd5d8303c1505405c2bec100769c2f7e2439c9a87600186dc7d2296d56483c5bd85d6a24f4f323
 MISC metadata.xml 718 SHA256 f09401b27714eef1fa1d93931a6d79202861515bff4fc65696051ce3b02934dc SHA512 d7f28ddf829f1a652bb1595b739df5b3645ab67e0b4e625e5265e2e4cf91d9eec482ce17ae3d64446f6175b5620b4fda7522978bd196fc0f2681ab7cb9eac9d3 WHIRLPOOL af259deda9fe17c5fdd7c26d545ad983aaab3b95acb8e7f50e383d82d9dad59744c33d58bf79f69ae84ef9ffe22269c5caaedd89102b399874504bc7d036c2fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUTlVZAAoJELp701BxlEWfdLMP/1pyjuOkD46xbjzku6+vdQe9
-+44wefYraBx33KrFT7mBMFFYFFmHsSpkK5dJgdCJVZipdrd+fxqyAuBTdMn2vmuA
-Kz9vQEo9ykcbEo7K6KzFEWhq7MyC36iK/dNknPXnWyXwoQiFdGuDH7XVCZ7EmOvi
-OL2uhn35RZvxqNWwE60xoIgw34joYHbgWUq2dAmgAEelCQDiXDVRSxyQitPgmigW
-n5M4o4+hgD1rsnp+QCNpw0pJT3NXw2/Vp0MB+yw0R/AKy/74FjnmgWD5MfeZibeB
-Q+YgacovW008Xq+gWnfkwQ/wGdalRHVJJMYQZlRd5RjCXLBo6bl98UU85svUMDRg
-0i0vLzmI/kTnX8CB39b6S3f+nJWg8UcQ0EqUv57ULAua+yF/7uPwjoXwmWzMCBKw
-wVgYg2YGojdXRTSnpz0yA0QwoPmFL1xK7qbmm8LmymOaiI2gcyegXVbyUeLe5THv
-KgENiYcFZf+5Vg/68YvYdA3+uPMMFLle43hlIfBmXQ8hZHmLvfO/Hy5yMCilHDMu
-WbJmRKa5b4EGn5aGpsr6M2qvkPZsfzzy+WGv93fqMbfPlhbKmCqjFOUJJROp9GpN
-yfsPkhjVLv7H+ihzcBJwg5t1Mrd/10WsoSM/DQItqLd24lh7xED+bwloi4F1s8Az
-nUZoq0fzXtZ6Fv5e+umu
-=44kY
+iQIcBAEBCAAGBQJUivB7AAoJEC8ZTXQF1qEPt98P/A/uKKvKoXI3s4HANRqboUVB
+pXN6BntYhp/F7sfuBF+BASzfU3zFPU3sQVGmVim4Z5dFYKi4SMUkXh5TIrcEVOTC
+8s53OmyW78c1CrFTVArx040ID4/WpiCQHey+wOQ/iauZiLf7ME4zjbMcp2V/VWwC
+bAeyGeiSXCA44ddpUcdHYX08o5PmGixXcxU/cINN40w0WqZtBz2FULzgAbaDK+tV
+pwU9b0ZXtj171ewVudiCik3iaDKYi0SGbAlItIOTM+ooktay6Eg6UgAR7F1d+/+J
+37KYTxpEc1CG5pzDmbvE3mGlyShr5F8pO9Wou7BA1FSQxzg84JrBsW5FQyWWoVd2
+9WqMTei4ZxUB77AM6IqUgt1AkievoCG/TO2zP1CY/ILllEkdfF9Q5JkYpo5n/Iow
+MH89q+f74nmgdFc9YfNJgsD3HTHlrooXtPVr6yE7rte/x6j6+nqJ1hCnBu+IMRhc
+0X0yIJI1445HhsnhSykuwbQyM8MF3pJ5XedFcPt1NPlMcw4BpZ4RIv03bMSK4g0D
+TtzYf/kMnU8P+g4xgjXVyL6ZYVUl7mOfAXhb/dMYfhPHmZl5SP6Kl7YQPNrD+B39
+dQjxp46+JGOz8170Ml92z7e4zOt+NjxpszftmArnL28ulZu/fc1sTUzLXTw2tWae
+nyaIhc9tEoPdtT9bzqZd
+=cjkR
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20121013.ebuild b/www-apps/dokuwiki/dokuwiki-20140505c.ebuild
index 5dc4310134b7..f3c6e2be95fd 100644
--- a/www-apps/dokuwiki/dokuwiki-20121013.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140505c.ebuild
@@ -1,8 +1,8 @@
 # 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-20121013.ebuild,v 1.4 2014/08/10 20:13:04 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505c.ebuild,v 1.1 2014/12/12 13:47:14 jmbsvicetto Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit webapp depend.php
 
@@ -12,18 +12,22 @@ 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://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
+SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gd"
 
 DEPEND=""
 RDEPEND="
 	>=dev-lang/php-5.3[xml]
-	gd? ( || ( dev-lang/php[gd]
-		media-gfx/imagemagick )
-	)"
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
 
 need_httpd_cgi
 need_php_httpd
diff --git a/www-apps/dokuwiki/dokuwiki-20140929b.ebuild b/www-apps/dokuwiki/dokuwiki-20140929b.ebuild
new file mode 100644
index 000000000000..ad7a7f1b780d
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20140929b.ebuild
@@ -0,0 +1,68 @@
+# 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-20140929b.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
+}