From: Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
Date: Fri, 10 Apr 2015 10:53:45 +0000 (+0000)
Subject: Security clean-up.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdcf8936de69f2299cd2b7158516e6a124a429c2;p=gentoo.git

Security clean-up.

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

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 6dbff32e548e..f8110858b064 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,10 @@
 # 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.79 2015/04/10 09:45:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.80 2015/04/10 10:53:32 jmbsvicetto Exp $
+
+  10 Apr 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -dokuwiki-20140929b.ebuild:
+  Security clean-up.
 
   10 Apr 2015; Agostino Sarubbo <ago@gentoo.org> dokuwiki-20140929d.ebuild:
   Stable for x86, wrt bug #544224
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index d8e49944c693..f24d715f7887 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -3,27 +3,15 @@ Hash: SHA256
 
 AUX postinstall-en.txt 1791 SHA256 405a54af08d9d08f903bbd33398e7d716ab37228b2ff0e4af81dc2368d64f2bf SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5 WHIRLPOOL 1389c2f1b7e550fa36b979664872de257c7177b4cc5976e90dcd86e4888ffaf439688a8d842490a806a58af9c689c2c40160e2969b7fc023886411a3a8893d0a
 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-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-20140929d.ebuild 1427 SHA256 48b965f78834a894c25bee35f4755c7ae92850447fdbb9ca60de2bb53d397b55 SHA512 9b189ed890bfd553d880f76a48cf10fdd65cc9e5fefe0fe0b5d506d24f631d0d971af466a08752c7a4fbd36b95514cc647b16fa40a1fabe433ce57c4e23e91f4 WHIRLPOOL c22c17588329795660cc3a1c02d5625f2c25e02e2c3c41d39c9018d50ebdb9f7ea8601b5079b9a762b31bfc24664bc2443a58de5566c40b0dac475a498caf82a
-MISC ChangeLog 13605 SHA256 b4698a2a2f8e0e239aa7049044ca70d00744d0d2455be03e01c3ccfa19948d30 SHA512 f9637c370d7d0c51906761fe52a6aed196c8c0e3590ae58ce297c1d853b4a44066f479af7bafec04f90ebd2bc9db7ba16b429d6831d139e2eb92a22cf521dea5 WHIRLPOOL 92204df1b5516b95a7c043a99644210035f8c241f63550f4cdf3f049146e050fb0c1fa678326bf9fb83b9ebdc139f8da95f558cc9fb18f02412292c8f8f87dc5
+MISC ChangeLog 13732 SHA256 206ba606d170e926819bc4e422ca9059ac5cf101d9b69f1a5b4193e15438aa3e SHA512 4e3114244ba234a4c1a6e1a223a2186cdc4d44914f6f46e7ad3163e0423f50c29a4918265e6980efeb28600f4adb0556cabdbf0956456a2fdb78c9987e96ac86 WHIRLPOOL e7ec236e3abed105896d23ec85ecedad71a052d15675694fe399290490f0d1b6266ac95b50a7e1d9e9b58baac0ef8d40e956e5c9224aa9a2117ca009f5dff48e
 MISC metadata.xml 718 SHA256 f09401b27714eef1fa1d93931a6d79202861515bff4fc65696051ce3b02934dc SHA512 d7f28ddf829f1a652bb1595b739df5b3645ab67e0b4e625e5265e2e4cf91d9eec482ce17ae3d64446f6175b5620b4fda7522978bd196fc0f2681ab7cb9eac9d3 WHIRLPOOL af259deda9fe17c5fdd7c26d545ad983aaab3b95acb8e7f50e383d82d9dad59744c33d58bf79f69ae84ef9ffe22269c5caaedd89102b399874504bc7d036c2fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJ5vVAAoJELp701BxlEWfqQkQAK44U1pdrCKsTxw6CHckmlB+
-i6vsVSUP4OeuCB52qt7TbomXrs2Ui0enhcsX0rAB3RNNffoHqoxeN5f5Vg+uZqHl
-tWa4PHJ1Icx2FLs3SxEGAPP13D1C4p5jkXCWgahQiqedcqQpPE7210PmXxL59zV7
-XuGVIpB2nAvL9jOTzm1Xqdh+BHWMDVC9zuh8Hlduy8YkZs0rUzaawdQcKVLyxmCO
-0KRAOrvYsBeeuHJFJVzkFQowV6Bh4D9pZ68ELdDOqSTYX7/gA0un/oMNPZVu8KN+
-nYj54nmoXG7YqLjDkkvNWCeYd+L4F21AkmUK+FFIxKuUaEStGvAqY/GdoqmooJc2
-xsEpU6nmnf2sU2Ac4/aKQwrBX92vkd7Yzf1EqRQ8YCzpJEbIrhmA/X/oB6c8os1n
-5uawK09fH3wwU4ft1db7c2lTAd2U2wFSH+f4qmX++3fTmRUrcH0k77S27RnhETk5
-Sqc3SkdrZLzZ2MVNZSHwnGq2SpVf2vHT0JZAN//IOwznD8oNMOYxtDVNHLX3suAj
-zgDzI+zjUfcvom6CAN3FWajVSUjWumRLYt49Lm7XyyKnYVJJsBXom9HEbpR4segz
-3pjWLNYpMtd7Z/OnrjaswProMNa/wUsyJjUoHcTcw0Ynl/alldonAlBQiHxdCzqy
-K30GVowUadSGmoZgLWH8
-=c6OQ
+iF4EAREIAAYFAlUnq4cACgkQaezjy7sObpiOkgD8DFr6ZS9+vlj6oI3EodAco9rB
+CyOAI91ONEiZWVvWoogA/0yrgxxAz5S7mHT0Cm+Npjdk7tcbaYfIDmw4423z8rTZ
+=FTSd
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20140929b.ebuild b/www-apps/dokuwiki/dokuwiki-20140929b.ebuild
deleted file mode 100644
index 6eea7fb3ac72..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20140929b.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-20140929b.ebuild,v 1.3 2014/12/21 11:41:17 ago 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
-}