Security bumps (bug #471140).

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

4 files changed, 181 insertions, 10 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index b91acb2cb19a..7466e56e6ab1 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.230 2013/05/16 21:15:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.231 2013/05/25 08:53:52 radhermit Exp $
+
+*mediawiki-1.20.6 (25 May 2013)
+*mediawiki-1.19.7 (25 May 2013)
+
+  25 May 2013; Tim Harder <radhermit@gentoo.org> +mediawiki-1.19.7.ebuild,
+  +mediawiki-1.20.6.ebuild:
+  Security bumps (bug #471140).
 
   16 May 2013; Tim Harder <radhermit@gentoo.org> mediawiki-1.19.6.ebuild,
   mediawiki-1.20.5.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c521cea62577..e35885346e69 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -4,19 +4,23 @@ 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.6.tar.gz 18700189 SHA256 5ac95e6c09469706d76fb0416e4923da8ae3691232797011e7f0467770bcc3da SHA512 48431aae2febc323f41526be1e84fe7493038712d0b5575424a37304ba4bac37c75babdb9f0d8bc2c0a220d3377a69c3ded2b45695461b115f02732d11a43ec4 WHIRLPOOL cb53ddc82a9faf8629081f558ab57dbd1e434e906693b8e49df48832cc5be701ae2368b12f6c17685b8268fd1f3306f4ee137d662b2968ff4d6c9004fba4da32
+DIST mediawiki-1.19.7.tar.gz 18553532 SHA256 8c9ae7465382d2dd8053dc39ff94343b483cb92d8efd8592eb75ec156eb68b0e SHA512 617c0569809f33fbf9b5eabced4c07dfdf31ce4d2914eb77fde351f3fb8065e74a4b798085fa5f02a3c65b5e40880f2201f2db122bace3482bae7a7158d9152c WHIRLPOOL fd3e866e58a717c9d9eec7a3cdb53603e6f473fa69ff6a6bcc04d794d9ab1f208d544bbc85684a2b44d7fd7663bfa6f7cda6489cf2682d20fd5796d0b51a594f
 DIST mediawiki-1.20.5.tar.gz 18615470 SHA256 2335e7b1586472e3cfedd80be0f8326200fc35cc93af568a90bc6a8083f0bcb6 SHA512 f8a254f05a10f2f4a67ccb8862ab242baba2160c0090cd4e8b811e95c970340a85eccb0d51f83f2b92d1ba4d7fd43560a9bf7a3661eb3f9e495f5f63e114b58c WHIRLPOOL 5efba3bf1fd574f188173ccf36802ad5d1689a7983c44ba52f8aeb127dfab0d2a2f3faeb5eb56a7f0cf43a7a82af26e65a1673dde996d99cc528722524a600e3
+DIST mediawiki-1.20.6.tar.gz 18469088 SHA256 0329eb283b2a3aa0f2136e1b371a6095ea57fcab3aba625510b3e2bbfcbeaf23 SHA512 a8c00c22916ccc20059821ce144c82e7636555620ab06a8103ac72ade05025712ccdd8d084999b2231341992bc05e07b33c3ef11527c2ca275f0e518f2683ecf WHIRLPOOL 28453740e8b0394c43560b9a7f721e5b3fddb1a46da0a52f77a016899fe6952681dfa3e6ce416b623da1c5a8aa95e6a3497399e415cab87e687093c3e0155228
 EBUILD mediawiki-1.19.6.ebuild 2497 SHA256 d2767559faaac69ce9270421a9c41a16fbe8ca1ee3abb02710679bb4a407bf4a SHA512 3bfa5472d21fe135fe03e2eebcbc5ef47062638d7a7ccd8737e134be542bc6641183782d3755c213abc4be437244dfce91a616c008c092dbf0e3239e4fe1957e WHIRLPOOL 0c5e17b7d248d26d1cc9842f6d3d4d5e5422d3e041fdad7261147c2e925d077a3b6af7495a2295a48c431e33a360fa314a04347a808614ef6f96b40993b7ba58
+EBUILD mediawiki-1.19.7.ebuild 2500 SHA256 e08fa8da1fb96175dab1b7a8fc0c27cd8e900b33159cc559ca568a066204b7ba SHA512 a99078a2ef194bd9b03230bae3416e8e5977b17c2ba9e7c66c01ce5d3e95b8eec81a84721c4cec2d01a021166dd6b8489c37af093313e26a54b76e1d1a01ae30 WHIRLPOOL 981fc8439d7a24aab3fae04fd6200094b6c85cc8d7444e48d6dea6c7cb990587f2dd57a39f8eb53cdfb7ebe7f07030e18d72b0b4dcde9bd15f9a7e0825e98ae3
 EBUILD mediawiki-1.20.5.ebuild 2501 SHA256 0a803185a400404dcbe8aa8c4484d69cd6c323d80bf037b576b11ad383e82300 SHA512 bb3c6973c4ca01240b27c097b4a14300fbb9077fe0a09e01b625c6124e629f00c8cd9646e150e55cf0bfa7743c5c0b3dec621df992e9fd7f601c619e7584eeaa WHIRLPOOL 54f485e9158c83e8d31765dc5453d24c65ae7de20b9f4f736ef74c06283521da88da3ab48d064e2bfbd87683669c8d7f64c14af14c91029cc6526eff9cd5575f
-MISC ChangeLog 37321 SHA256 4d6163a10e1d7b4fe48a30da033954326f1a6b456bdaae3b9cb14c5a4b446f34 SHA512 763cd11f9bcfb1ab2794bd35da3230aa0dc92b389354efd4af9a19a5fefaa2650e5844c40462dba939fa5a8c0c4a139c26df0ba698c8952643ff9170b5798cee WHIRLPOOL 7d0a4db5b0181cb8bebcfc3d4d9ae3c0d25b4e1d9389d6212f7821d29bcf6ddfd8897a9d978ad112194c853fc4ad4e6ef1535094e2a6c5676b3db7215725d110
+EBUILD mediawiki-1.20.6.ebuild 2504 SHA256 dcaf2f1b8a0bb1d0d32dd225ca1f4747b29b2a90e408649919933930a546120d SHA512 2842bcbd34617f41f89c615f614ed341dff1ed81d76cf8512d5a03d21aff291be27af1b8c6c847274fba641169be472198f04771f03721aac53b99ce5b608a5f WHIRLPOOL 7ca8eb6d275047df4192a06ec1e6a9de169c85aeecf9ca9974ea67b284375353814da758b17354c09ca75118ba2962c940dffbd1ee0c30517bf07cc6cf85d25b
+MISC ChangeLog 37522 SHA256 d61ab3555e938934867c5903d4eb8d1cf316ec52d447f081e6656618c11b3f8e SHA512 97339ac2be9380fe442530a0f3081e754bc4905e3f32d064d0f9a33e893bde51ae1690d4cb4dfe7a85488a928acf2eb979b6af516c03dfb097a03734c19c044b WHIRLPOOL 1288c0fcf8017fa3141ac9bea9d1bc3aa84242e0ea93cc83517d8144f553c2570491ab5acc10537a639ef07e98588e6e8c45fa6c42c1e2726f67de04cdf2e627
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlUxdAAoJEEqz6FtPBkyjzSsH/i+js8wKwpAjHfuW8K4rksB0
-fBR+Fc7TTpWzYPGIPTvHsqJnlJQnHqchnAB7+BnXqC+vYg0K7sdNAKanNyVXJF27
-XS0JQ2n0fijzKxZIJhaJ5Qjk37hfkIdbYeMwRHAH8Ot8v0v5+VBDxdVUsygROd04
-tMDHeVjyrsT26uOb7UkKweO4rrljqwE58sFEWVCFxg2/8LhRawetc11CSJN78YAk
-9ZAtc7MHxHxQQAg/kgpCdiMtezSXVk2fRmEDVM1yZKngQaK/yMsI9FPxsbpX8cPE
-Z8AG+zvBz5n6RJsZuf+NP9xA+IQUP4wCJZty7VaJ5Z1xO2CYySI9Mua8ALYK6s0=
-=2WS5
+iQEcBAEBCAAGBQJRoHwkAAoJEEqz6FtPBkyjniUH/RZ5pr8HnaAQohyngvEdmP0H
+uC/DU3PvjyauFAeAlmT+S0MhiRiDKYH+RpFDepooNvekYiaK+Ng87c05ANPvdTVh
+uMcd4F1SYRUv71ugMgEaekdhA+j6iIEtRfCFGyr6uESCGyeTz2OewJH9wLEwXQOG
+e5OzlNXOagcte84xMSTrd1cN14DTZ9X2n5TmoqpeaNNIOlaLSTSnV5zf9D+A/eUZ
+5HS/m4dMNMNF6B5sxDNLQeQkzzInzndAjYD4/J4w3vm8IbDYLE0dhB2GAS9ziXzD
+9LY0lAVYHv2Vb8+uqK3sVMgQTQTQzeW90LHIkIDiPlqMn/C0PXHwJ5aC6+wg3IU=
+=1tGL
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.19.7.ebuild b/www-apps/mediawiki/mediawiki-1.19.7.ebuild
new file mode 100644
index 000000000000..baceeac83758
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.19.7.ebuild
@@ -0,0 +1,80 @@
+# 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.7.ebuild,v 1.1 2013/05/25 08:53:52 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_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; 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.6.ebuild b/www-apps/mediawiki/mediawiki-1.20.6.ebuild
new file mode 100644
index 000000000000..c94f117c4ad1
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.20.6.ebuild
@@ -0,0 +1,80 @@
+# 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.6.ebuild,v 1.1 2013/05/25 08:53:52 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_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; 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
+}