Security bumps (bug #468110).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 195 insertions, 16 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index f429600f513d..7a79604d3f5d 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.224 2013/04/17 09:15:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.225 2013/05/01 16:38:46 radhermit Exp $
+
+*mediawiki-1.20.5 (01 May 2013)
+*mediawiki-1.19.6 (01 May 2013)
+
+  01 May 2013; Tim Harder <radhermit@gentoo.org> +mediawiki-1.19.6.ebuild,
+  +mediawiki-1.20.5.ebuild:
+  Security bumps (bug #468110).
 
   17 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -mediawiki-1.19.4.ebuild,
   -mediawiki-1.20.3.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c5d66c4b0f33..311dbd19936b 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX postinstall-1.18-en.txt 2611 SHA256 8388d74e84d63c40cbc697e25639be5f07108ecc13497346fccf9d89ab0484eb SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b WHIRLPOOL 254b014ac9a7cf431958ade7827afadbf7e48ec255e1ea39e7ac3fa091f7d321376b760dad39d0be3af3a6cb342aaeac9d4e2329816bf3c6b3e4e55e1ac05d4b
 AUX postupgrade-1.16-en.txt 1514 SHA256 5d7aedb456fbff83adf0335ca5e1c99062e694e178bc93d749615ff63dc883f4 SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5 WHIRLPOOL f17f927bfedfdc502c752276c0876bebe771918242be98de32d5fc51003a054132f4f6b4a16caeca293c1ebb44c12bc322eee5efcefda228ea97136b00c6e1ee
 DIST mediawiki-1.19.5.tar.gz 18535374 SHA256 f37788007d77553742b0ceada996cf71b2d4ae7d07b44cdd073f51a9c98cdffb SHA512 bbf10e798ca79c19224b9169b5930c717ef256ea97db6cdf80c717f6c8df2743c2a9cdf04a5d9947c7446a7665b11644bf3545917baf5376ee6c743995b41a45 WHIRLPOOL c3ae96a0d9d1b56eaec966e6dcf0737e1bc6e1e7eae14ef82c8e9847fbef76a4f089a0c146705eb10405940de368f3db6e4f058d2f2ba0f4b07ee0af0525640a
+DIST mediawiki-1.19.6.tar.gz 18700189 SHA256 5ac95e6c09469706d76fb0416e4923da8ae3691232797011e7f0467770bcc3da SHA512 48431aae2febc323f41526be1e84fe7493038712d0b5575424a37304ba4bac37c75babdb9f0d8bc2c0a220d3377a69c3ded2b45695461b115f02732d11a43ec4 WHIRLPOOL cb53ddc82a9faf8629081f558ab57dbd1e434e906693b8e49df48832cc5be701ae2368b12f6c17685b8268fd1f3306f4ee137d662b2968ff4d6c9004fba4da32
 DIST mediawiki-1.20.4.tar.gz 18411739 SHA256 0d695d3fc0905b94a81dbecb25210ee3ff7d3b43359d20f262541ec4a6849cba SHA512 563ebcc2e40ed55b3ccb3229bacd7b390417970b80888d8d49289fe29941aca8450b4b657d2e2aef4f817ca0c4c5d0a9f52a5ca6f2fbed0df00da66136d0fb38 WHIRLPOOL b265a865ee68631bf215ba475850dd27e3ac6bea13dfe62f2374b418d50ab33048b5c98908d0a7c97946548bab3940be9deb4b63c1615ed1852229347c4cfee2
+DIST mediawiki-1.20.5.tar.gz 18615470 SHA256 2335e7b1586472e3cfedd80be0f8326200fc35cc93af568a90bc6a8083f0bcb6 SHA512 f8a254f05a10f2f4a67ccb8862ab242baba2160c0090cd4e8b811e95c970340a85eccb0d51f83f2b92d1ba4d7fd43560a9bf7a3661eb3f9e495f5f63e114b58c WHIRLPOOL 5efba3bf1fd574f188173ccf36802ad5d1689a7983c44ba52f8aeb127dfab0d2a2f3faeb5eb56a7f0cf43a7a82af26e65a1673dde996d99cc528722524a600e3
 EBUILD mediawiki-1.19.5.ebuild 2585 SHA256 0a1e5fa0fad4b7258835aa085f4206edeff9f5036cebb510fd2bf8e61459163b SHA512 40a7b717367441130c7da3eb471c563bb3b23f3238c6938206ea635722ec7d3418da9d94ac6922707ea8fada6b3751df67eea1d4ed599ce72ed542503025b5db WHIRLPOOL 33c9f6fe435f5501e8d4d31a259cd5377a6b1633d9ffaf4bb88202600fd5bbf70ede7ee673d60b29aeabbd9c4d8366e8171af7d1581b7d751ecda5156580daf3
+EBUILD mediawiki-1.19.6.ebuild 2594 SHA256 dce33183f3df6adb0d070ca2ab9e50d0130c7fba97717bf20482dc871b69712b SHA512 00384d6962763ab05dcd0dd9626f3a66a7e8ebc09e48a134bcb88a7d99cc3a35927997ea665dc1513b9c43ee8adc6615ca0d55bf69a404a12ef3c536fdc92173 WHIRLPOOL 822ccafbbdf6414da4fe2f37fc559d5a28d96774eb0ebee2197db353ca29b32e9dd6cbf8f7e1a1a5c0f98c804a1702daab3c848b75fcb7c4b1d376ee8dd975fd
 EBUILD mediawiki-1.20.4.ebuild 2589 SHA256 086ee124747d4ae8d00c5ce2078730f94b829ce07961517ca2317e4fb057ab5f SHA512 00cf654f27c4e521c2008c8296465c7acb62e07b7c34845e779e31575d86c4d5451a61ab3f1a3c59ab02536cf0cdf03c91dad907de737c860ee08a0fb6e8fe82 WHIRLPOOL b41bfea269ad1b3073a5533a479e7dc14aac6abb940f33f5cc2a0675a00cc63d47a19ddc38fbb32d2cc8c47167cc93980cfbec67ebce8e6e1019b2c00cc76024
-MISC ChangeLog 36444 SHA256 9050eb7a4c78c4be7b2d029522154e801ecfef9bdd5203fb609b0699baecdf7f SHA512 a7d67282bf40dac30aad5efc9c63bb3a38dac58d774085381650149651a26f7461413983e4ada676b4c599d8063e7962612b58a29be39003349f7f7aca855ae9 WHIRLPOOL 0facf185f4d663bbb00b885f228a027d0a7962823340eb35356668e6a7ba7cdbba1ca6dca6d763f4e8a12d5e91c7e97df550032019f87b5e245aa2b2d93cf13b
+EBUILD mediawiki-1.20.5.ebuild 2598 SHA256 75b52e86d7151b2fea831df744eb31cb82e11199a14dcdc3ad32aea09581a7a3 SHA512 0287c8f8f6b2c044a3713720cfcacf8e67cfd8b4a7fd21dabc64c6d913c8f93de15b5c00abefc08b2eb82a64fc7f06603dbdd93303495ed27550fb445274dbdf WHIRLPOOL a282288f33670dd3c75efe2b7ccb7ad7501ac7d644b83df11e9c08b37686824c53eae8457af03a83ecf592fe3bc7793cb3153fa641a0d865fdc0450cb9722e9a
+MISC ChangeLog 36651 SHA256 50096686d8d4ad1d2063508908166057bba73ce029410851c0020a671814080e SHA512 6a28e349d36a16263e081da929fad4c6146aaa9a6523fa8168329df27158826dbc93bcfeed91835983c5ee3aec4f2d0b4cee4f7f009eae8744438b0771dc45a8 WHIRLPOOL 5cd941a499f3548d5faeb7925c074a981071265644ec4506ba4e678b7be23cce13ee8c8487cb0fc3f4276b3da6409fa35731c813a3665cd2ccf83546cfcb9246
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRbmguAAoJELp701BxlEWfksIQAJVY3WLRsmbE5Wem9wuJw+Oh
-IWph1HVZRv9wSs2YJil2dP+lLHcZVLiOvE/00q8qeWECSPJo49oMOAZBevk6op/w
-n7jfEfy53MRdw5qCdCItF79KQP4wXNbD2+RH3vdLbODO258fnycWcM5FqIpF59L0
-Bp37uls9QwVARKHMZJb/Rk/ZJ1GC0YgxF12WpvNA36fN5XwlVSXXUysDwI19TaJ4
-bvykKErYgMlKqn9nVfftQXVAh0XGDT+BnBXYp1ozMX2X+QMlz2xxvtm0+tyCIcAg
-bgB42Ov42tUwKCvridZxFh9HDn0hd0OzfvXl0nRkBAXP0Yvn1xXWEjdGjjQ2hkDc
-tP0HEahOVu5CRLIlpAQQpbMekeN/8UfsuB2Cdg8uz2rB/QTtv8m2Gm/0kChdO42j
-PA4h/z7Xa6/NXW8fkxHotEoTg1+WrIYoQ2adUYaIrkBfpxmbLdUORJJcsuCPSH2N
-oyLeuHDlZec6sqWjCw33+OWynIQ9exKLLaXIejrHpid8x+d4xsUR/cN6HOk1wGW4
-P5UvBzsEIZVLrunzRRQNDYrF1K0vF63QRH1QaA8xidzRGEq90i1RVQU/6KxotYDf
-pstUNZEXU6rZuErnDjxcipxMgbice19hdI3vh4vBlHZvn0gSq7MB1MRioG42LSOv
-Y8dNW7uJNSq/gTxsrK3R
-=qTuQ
+iQEcBAEBCAAGBQJRgUUcAAoJEEqz6FtPBkyjAuEIALiYZ5y8Jci2QOvVRbu/vOF7
+ZxhdF7gI06E1RW2LEMz15bX7HJfNyvZ7N8BIB013hhodBB1eL1nhh88BkM04ju4e
+ZrouQ6n1aJnkIxW6TkMnCLM/XYQbMi5GbeP2R180BwoWeMgm1pJe0/on3YMjOf3j
+eyYiHXABeDyOHqev/UOU7dXyynLWTpeGGKqrHeLMykB5SgUgZ5aiv3a4OJPNX73w
+znKsANWFVIS/ljGcJ2h7ZgKuaN63BIzCtlPj5PM5eh4071ddQdOip0m35PmQN2oc
+KvZQh0liw+UsCMxslT35VNluIEneuieD6n9UWDLOabx+jjsiIOboHGaQb5LfLr4=
+=obcF
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.19.6.ebuild b/www-apps/mediawiki/mediawiki-1.19.6.ebuild
new file mode 100644
index 000000000000..691d31d3c387
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.19.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.6.ebuild,v 1.1 2013/05/01 16:38:46 radhermit Exp $
+
+EAPI=5
+inherit webapp versionator
+
+MY_BRANCH=$(get_version_component_range 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader]
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite:3[fts3(+)]
+		>=dev-lang/php-5.3[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs
+	find . -name Makefile -delete
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_preinst() {
+	prev_install="false"
+	if has_version ${CATEGORY}/${PN} ; then
+		prev_install="true"
+	fi
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if ${prev_install} ; then
+		einfo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		elog
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		einfo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		einfo
+	fi
+}
diff --git a/www-apps/mediawiki/mediawiki-1.20.5.ebuild b/www-apps/mediawiki/mediawiki-1.20.5.ebuild
new file mode 100644
index 000000000000..19d9b4ac1a95
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.20.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.20.5.ebuild,v 1.1 2013/05/01 16:38:46 radhermit Exp $
+
+EAPI=5
+inherit webapp versionator
+
+MY_BRANCH=$(get_version_component_range 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-5.3.2[mysql?,postgres?,session,xml,xmlreader]
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite:3[fts3(+)]
+		>=dev-lang/php-5.3.2[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs
+	find . -name Makefile -delete
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_preinst() {
+	prev_install="false"
+	if has_version ${CATEGORY}/${PN} ; then
+		prev_install="true"
+	fi
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if ${prev_install} ; then
+		einfo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		elog
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		einfo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		einfo
+	fi
+}