commit: b438126bc0cedbf17e68e85ca38b43bc320797a8 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Fri Dec 12 13:03:39 2014 +0000 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> CommitDate: Fri Dec 12 13:03:39 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=b438126b
Bump dokuwiki versions to address an XSS with SWF uploads - announcement https://www.freelists.org/post/dokuwiki/XSS-via-SWF-uploads-hotfix,3 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> --- www-apps/dokuwiki/Manifest | 5 +- ...-20140505b.ebuild => dokuwiki-20140505c.ebuild} | 0 www-apps/dokuwiki/dokuwiki-20140929.ebuild | 68 ---------------------- ...-20140929a.ebuild => dokuwiki-20140929b.ebuild} | 0 4 files changed, 2 insertions(+), 71 deletions(-) diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest index b8f5a1c..27af572 100644 --- a/www-apps/dokuwiki/Manifest +++ b/www-apps/dokuwiki/Manifest @@ -1,3 +1,2 @@ -DIST dokuwiki-2014-05-05b.tgz 3174582 SHA256 2cfe1c2697ba3994244bff2b64406bf10c3c699c8a7b299ea27116c79487a143 SHA512 eda3b2d6e73e32db2a9931e8ea79fdc962ace6b20ea8371123bd63dbf15ab50a2610ca0666798114ec640e8cb9a94020601873fe3641008dd014c5535a17cd06 WHIRLPOOL 95ea657c3e5a63ca2bd0511eda97c4a19501cf05a922efa6d2777d1780904513ee462a5e7b450e51f1dfb3cae6816aea1a524ee8b3149143c4284a4a5660eb7e -DIST dokuwiki-2014-09-29.tgz 3241352 SHA256 941b6954d39de57530efbb27d0734b6bc9a49aaa3c781b39f6ecb305322534eb SHA512 28e0ac91ddc179413133af73840668f8007fc0e5b272ea3b1bd7d2c01a87fa68b96961f780c6910576267f28e9f2f6f7e1d4811c69512075e7465592bf741b35 WHIRLPOOL 081abb6c14713fbe68550d6861b6415c9faf9a49d5365eef399a6df28e2a35e8470f3547f87a4bd70c97f51727fbc25ade529d164c778a176d9d078186e98813 -DIST dokuwiki-2014-09-29a.tgz 3241616 SHA256 6b5c7060d0c2735ab61e5f563479414b3741289f6d020babbaeaa97575d76d9f SHA512 fd0a15c4c0fb09e1e63489dc0565fdb294df0ae26a273337b455dc3abdf2923562a6b318c42ab19f665323dc58f96a14f845d4726988547c13775c149d77bf09 WHIRLPOOL 1e55b7994a829626a5a21a3b47df3530c7d3af65a27d13cb5a0784ba163cb312b0ef441021137786f946a8a245a80514b33805ecb91fec691b0bb2c5cd3ee897 +DIST dokuwiki-2014-05-05c.tgz 3175216 SHA256 3a8066216825008f8bed9efc552ac11d9372aa0a603d96416fb2cac64cd9dabd SHA512 4a0eebb1c49408aad8e16701bf30adb387c3b68f3af40d75a849ce962198430af9a1df1a029b872195176f108eb7a655ee75c6625decfd445acd5cdbe715f764 WHIRLPOOL f1340931a153530e48f8c16d96f57b64afd5a6352e64e905bcb8ed9291b8b238555f33dbb55ae166dbfaef0337e19e1057095f46ed826c5edd801ab505f95c34 +DIST dokuwiki-2014-09-29b.tgz 3241815 SHA256 7f7c705997278cb6769a91a1a7c38053a3edb0663e7ac8285f613c9d849a5487 SHA512 e37cf758d708c8c97668accfe98cbed247acff6c77892160a7f6e9fe8c4b06ea0ab5c542feea85394e35cb4703b348be47f9e25a90750d4b2b3bdc0ba75269f7 WHIRLPOOL 9e8d861b744c5f06612a9f29474007b835e46bd4b1b6139f5a7bffd07e1b9a7ee1f1263f2752757c5c504b3ae04326e938d7aad04914e8a4cf392f368a1564a4 diff --git a/www-apps/dokuwiki/dokuwiki-20140505b.ebuild b/www-apps/dokuwiki/dokuwiki-20140505c.ebuild similarity index 100% rename from www-apps/dokuwiki/dokuwiki-20140505b.ebuild rename to www-apps/dokuwiki/dokuwiki-20140505c.ebuild diff --git a/www-apps/dokuwiki/dokuwiki-20140929.ebuild b/www-apps/dokuwiki/dokuwiki-20140929.ebuild deleted file mode 100644 index 4f2e4eb..0000000 --- a/www-apps/dokuwiki/dokuwiki-20140929.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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-20140929a.ebuild b/www-apps/dokuwiki/dokuwiki-20140929b.ebuild similarity index 100% rename from www-apps/dokuwiki/dokuwiki-20140929a.ebuild rename to www-apps/dokuwiki/dokuwiki-20140929b.ebuild
