Security bumps (bug #460352).

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

4 files changed, 201 insertions, 2 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index cbb4247428bf..7c380d016971 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.213 2013/01/22 17:24:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.214 2013/03/05 09:43:50 radhermit Exp $
+
+*mediawiki-1.20.3 (05 Mar 2013)
+*mediawiki-1.19.4 (05 Mar 2013)
+
+  05 Mar 2013; Tim Harder <radhermit@gentoo.org> +mediawiki-1.19.4.ebuild,
+  +mediawiki-1.20.3.ebuild:
+  Security bumps (bug #460352).
 
   22 Jan 2013; Agostino Sarubbo <ago@gentoo.org> mediawiki-1.20.2.ebuild:
   Stable for x86, wrt bug #451616
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 6074975db5e5..b6aafcd3d527 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,12 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.18.6.tar.gz 17683490 SHA256 6af73915093b791fbb53cece3ebc89530a11f02eeba9762d630805fbb2624e20 SHA512 0effb0f24198090fecc0ed99ea449fa4c9b53599d9804dd7424f5bc010c4e79fbe0aa38ad0382894b35911d00d4bfdd39158d736cc31b0cf5a158bb12f2d53c0 WHIRLPOOL 3d399ef9a9f3697988680a558303a406cdce07b56a79ccb1bf86f2861bf44c8527b00913fdb55714f4467aa91945d89ce9405658a49aa833ef663b199739d98b
 DIST mediawiki-1.19.3.tar.gz 18447791 SHA256 d7049f230efd12789017867c65abdf1470567a81b5f9a5bccdfe9532f67ad63d SHA512 559ee1bd13a4b5c1f670c4bf572f8a23656d0a6b230f5a48e19457d2aea680be7b4d98cec366afde0527e89a4a8435daffe38fe7a76f0a5f3857c36837d77f47 WHIRLPOOL 7884bff2ddd025e95def429346be678cf72ef81f071eaa0506856a53fccc154ba151559da0ad8138f67b840732a5d7eda7192789f62fcf489c2d76c86fc5f713
+DIST mediawiki-1.19.4.tar.gz 18536768 SHA256 8dab7fe082aeb1d363e69db7e0ad1e234b01955f92606540a4132596ea47e776 SHA512 10263278d917bfb4de06cdc71edfa6c71a9f976596a50a0ab1d6b68a09dd6f5ecb3ecd1ce10c269ac0929bb0d3345d976ce41d8d9bec0496cfbf3e051b0e5cfd WHIRLPOOL 75f7dfbe080af47d3fe8544dd8fecfc88f7aed40b34e1bae2142be4b8046785325f8531136a14c70fb590179266ce95ddc559322a90308fb92b202c7d6e2a859
 DIST mediawiki-1.20.1.tar.gz 18301714 SHA256 2f526f4e9100dcbdd89d7b1259810f272277f020520124315287e61bb8783b91 SHA512 72bcf6813e534245f23192229d21e0fcfdcc20d12fe81ec0f6da8d2d3cb85fc540fff3ed77d6b6a84fae3b92734a8956d2e747d804c9418469de3e0dad8c9900 WHIRLPOOL 5e9beca854688d413402670134079fef0765bcb50a82607a874501cd5669639eab8f92999d675e79209739c6d7b98b593ed560f3300e61f24a526d34b9a1bdf3
 DIST mediawiki-1.20.2.tar.gz 18301262 SHA256 ac29b11a297f556765210e65d5d5ad6b0f55055e345d2f3deba0f29853507a31 SHA512 afbb08ea967fe3f62d94155e189f3198d8e4974c66c67b2a2e2e479feec1dde8e2a935540f3d88ccee83f16a8e2e97f20ac441c7dd06a9f8468643045ef55532 WHIRLPOOL 40d9e8eb4786cba1aa9691c9869a5929c669eb7001511ff7fa63a8f42f3fbb24813aa70c6712be19bd9118642d6bb3548a0d408c0e451501acd30fe35931e5db
+DIST mediawiki-1.20.3.tar.gz 18411865 SHA256 8a5c4e4922c6c654741af9203b24a6e4489e4ce0c05ed0354844d14e0a66d210 SHA512 da379e0daaef90d87b2615ccc302ecba25f78a402c504c23d5fb67bc69e108f418b105a3a14622ea8c88ccc08fd3d5065bcd8b20e8676441abe60b089c5aadac WHIRLPOOL 23a3c7e945a7cd60ff9177d3c1236177a6cddb937c544ff5708f4952b0e24eb4d95061ff0397bfd2a09303f1c10e1d7467a0074e1a79705989f6fcd5a0c2aa16
 EBUILD mediawiki-1.18.6.ebuild 2593 SHA256 96c450943930d411c448a7c1119f78fe3947c9371bba7fc89562dc5b1e98232d SHA512 98b47943d86cc1a1e8ee388da5f63d7521a32d54d926e1114bb3f8cba1486dc971de0c6805f3355f6c29141bd2b082d40a5f0faddeafe9e5f28f9c1957b68968 WHIRLPOOL 56cad393fae07b94cb00c62b2d6c7c9ba5a7991720137d709df6c5323493c85dbf1a02160437a1f35a599488fbaaf4670dc4f1919e8bc3942897f56f8b28a138
 EBUILD mediawiki-1.19.3.ebuild 2590 SHA256 46efbb85bfcf7eb0d589702b91386697b86010a374850c7b9aba4b30b7a412dd SHA512 03e797ef1479ed4e41ad7c3050d20d4f96a55cd59d6c380dceb72fb09d3627bda53d26f238a97d08dcd1623314179bff39854e5d50ba411798bbb37fdc12e5f7 WHIRLPOOL ee46245bc0b9c80b82335202673935e94d0ecc425a2e3494362ec60501391fb2309ec2d9bd353fca12727fdc22eabc853026658c7d331be852419ccde14ac013
+EBUILD mediawiki-1.19.4.ebuild 2591 SHA256 1c4beee15dda06150a0e0fcfd94df70b82566113e47e30de1824be02b9d6dd48 SHA512 1ce4fd2fb641e53d2214695b3126b576ff096d03235513421af297e549ded9dd8839ddf7b77cc9d5a32ea9f2de1eb8694b79a8270aa0ab3618b877b6cbf3d8d0 WHIRLPOOL c3b7e9680144047646b7534f4a46e7bc84b27dcd0916cb1c600936f52e25b0e5c9715f0b7bc49719593dc5294bcedae1cce94d457da220cf5388c14b72dfbf4c
 EBUILD mediawiki-1.20.1.ebuild 2597 SHA256 f11decf5fe13a2bf9331c79c4b956a3ce8171b86075c8940bfc10463a44c8c6d SHA512 01ab03443fecb76e1c514b7fef9c95cc2acc0d995066b9be23f0a484879a9f69a2a087e8baf2662c5c8fdd05eeec29c178fa11278a7d0b50aad0237b72f4feaa WHIRLPOOL 79792b7ad3febad3d57d89afef6b7d1348b8e95668d372501f64e4aff88e128776ea7e280ebd4adc05e39b563507a6f8bb7b7b060966b40c489f69568fc1cfaf
 EBUILD mediawiki-1.20.2.ebuild 2588 SHA256 defe9dd23329c07ba1fe1cdc4338dbcf41155c0c39da07927caaf795ba8976cd SHA512 f30232affa2dc7ba40bc4792de305865cdfabb59e5b1a54df6ad17b184c6fc16c4eb134f7d0ee6df90adade00da5da9a8836afc43c4078826c1562ae81f2448d WHIRLPOOL 06846c5af3fa51d9b9f8e72e92dca6e163749697bd327b87c8b4e4e13d92b3de7ae842cd864fd77a1e30767b958d5f2f18d376b5f68bff41cb43f98401a87e31
-MISC ChangeLog 34780 SHA256 a004ec88ea106f105419340302d8dd0c1f6caf8040e090cce360e10863ae33c9 SHA512 1190508a38ad18916e8b4ec859c895d963c9d03ce8d1cc288c6bd19868fc495a0d503a25ac6eb39f4ec35dde0774a4202baa6f46dd2d466062f94d9278a25f70 WHIRLPOOL b8d9d2efa5989b34129a7f6a8abf7f533a498c79be38a3b034f5fa524d1c405d03ace1c2b821ca36b1032acdf342816e88ab1652f10c71cdbfb3763c14d5275a
+EBUILD mediawiki-1.20.3.ebuild 2595 SHA256 26503d4bd17ae226612a2a9f0c6ac56521316a4ed5a92cd05ea0090673aca0dc SHA512 e556530de81bd6562e707b162e98d8eb454a566d4bdd8f3f5737f9c2a6cd128b82971ed79d99967f04cab5e21adcd603b4b47b73d671a0400b1cd3991abe50e8 WHIRLPOOL 42c12135c0572826885ad7136900017fc8f498e31ca0b07338558f6106b391e02b78c75b4faa8519ad58eb3ee78166f4604775c357da5bcaeb66617a32b66ba7
+MISC ChangeLog 34987 SHA256 48b2dba240ef1a5f3490708a2ad535541bf75782091895e1eb6405bcd459955c SHA512 1d01311a62dc18884a46fe090d94b5a79665ccfc466dec7ad833fb965d27d8ce8d8287d587ed505125e199cda51242a9d56da3adfd7017d1835e43e259a662a2 WHIRLPOOL d62b68bda3e17eefe16940152f2084d90e64c66ef2fbebb8b454dbaf806071ab43450cdd6c3cce5a8f3f9a2fd6a3e6abaee3413e6eb8fdac334559ad6372bd2f
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRNb5XAAoJEEqz6FtPBkyjhvMH/R1e0zxK2loigZk29J69KYV8
+WMUc9fk0TgqQr9WKvhUbeJTw+qPN2IzeDt2qWa2iT8CmklFJa2UHzxLd8Gbs1rTH
+TYAnWErK8rW4e1dRbm7N8Hwwm+ldolD+TFND0FfcVQsx5Kw44uiiiYuRGOww0c1J
+ZKP3imr8/eL1WzvGjYaHZVaFdn7olGpssw/MssvBRkemW/2/9LohcEpZ8EKEaSR7
+kGQKYKbGX8I65mBYUo+HdqZuQfcgR9r1vRAVpbrHRxae848rQzOkUVQ+4lbtLQly
+muMdSrEdJ9zSyZqPIBS1mAHlmX1QVuFHxqgtykLm8PI/mk33XReDmXxkl8HsIes=
+=v3OX
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.19.4.ebuild b/www-apps/mediawiki/mediawiki-1.19.4.ebuild
new file mode 100644
index 000000000000..e6279d6630aa
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.19.4.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.4.ebuild,v 1.1 2013/03/05 09:43:50 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.3.ebuild b/www-apps/mediawiki/mediawiki-1.20.3.ebuild
new file mode 100644
index 000000000000..4417fcedf860
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.20.3.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.3.ebuild,v 1.1 2013/03/05 09:43:50 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
+}