Security bump.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 102 insertions, 9 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 3c2855394d74..4d698354897e 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.191 2012/06/15 01:57:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.192 2012/06/17 07:39:33 radhermit Exp $
+
+*mediawiki-1.18.4 (17 Jun 2012)
+
+  17 Jun 2012; Tim Harder <radhermit@gentoo.org> +mediawiki-1.18.4.ebuild:
+  Security bump.
 
   15 Jun 2012; Tim Harder <radhermit@gentoo.org> -mediawiki-1.18.1.ebuild,
   -mediawiki-1.19.0.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 6d160588bac2..763173a460dc 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -5,20 +5,22 @@ AUX postinstall-1.18-en.txt 2611 RMD160 4cb0e176f3ef6ccb4943ddb1cb5e1b60b4c6a04c
 AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877
 DIST mediawiki-1.18.2.tar.gz 17320421 RMD160 2ad278236d0b636489ddd0ee0774d346135f5009 SHA1 edaf86104f7542a08d6ce39473cdef6a5b01fca4 SHA256 82228bb85f4ae0cfaa5e2b1b5be57601d86e5bfe2f3d397a6bd0c2d3021cccef
 DIST mediawiki-1.18.3.tar.gz 17376442 RMD160 71a22e4f016459a0a1f215b1699e3ded1df3ccb3 SHA1 e524e08e24a0129e59dc41ef482df5705481c5f9 SHA256 4319f37282ad64ddfca53ecae76da787630f1cd0e5ad438d028551fb1742eb39
+DIST mediawiki-1.18.4.tar.gz 17376708 RMD160 b5ed80f9b14b561537a8e1a14b9aaf49b89e2853 SHA1 ffb0de051bd7786b1783a75bf7243df8c1e1d7d2 SHA256 0067ee3b200316791a8059dba9a164744facf216c26c6867a82643d4c72f54b6
 DIST mediawiki-1.19.1.tar.gz 17929538 RMD160 c54d8ae8534146237766b392dac4578ecf883b0c SHA1 7e827714aab2110719bb13ae0f10919ed01c08d7 SHA256 3f4e254b5a7fd74f9f623736d56e6ae40acad3d69c10d80cd7bc9b8b588d461a
 EBUILD mediawiki-1.18.2.ebuild 2535 RMD160 995646f4eafd274444125b7463af1652bbe6f191 SHA1 c1dba41ac39a69eb0f1ec46c89d864d7bcb8effd SHA256 bb5093013cdb63260628b9ccfb1e917f2a32c22f0a4ac831aa0005a80f63276d
 EBUILD mediawiki-1.18.3.ebuild 2534 RMD160 ea2450e4b0d7fc984eb4ffa48a08f83dee018a7d SHA1 58f2f47d8ef5e854c2086c61035c91eca5399c9f SHA256 c19d6b75fed5a71c895c2ca8a004fdb56362539f1a7ff8f4942e3bce0bc9043e
+EBUILD mediawiki-1.18.4.ebuild 2539 RMD160 d09e62a42693571ead70068407738ea1fe5db7c0 SHA1 2381fe947f65aec03f74de5fb7d929eb194227f5 SHA256 17e51ca29f12978103e48f22c292f80e347c0f65f83087f28b71d4d0c3e3e99d
 EBUILD mediawiki-1.19.1.ebuild 2577 RMD160 cd4d197be8d88022b11a40e098db102857a310c3 SHA1 ed59b9a2e7eaf685b9644aedd066a3327e3eb658 SHA256 f98a88575bc797a3161fea792aee7fabd0b5d732e83331ffea53a4a2e476f075
-MISC ChangeLog 31620 RMD160 5021ed78213457929a3b0bfeb1ebd855288a3ddf SHA1 6ac0548bb18724b7d96219d8f55dfa1a944b5a11 SHA256 7e5f69869153e69762f4ee2e8320be52870482f1cc6970f9ad6ca900718c3740
+MISC ChangeLog 31746 RMD160 2b739c543ee07ef26bc4955b9b9e294a39033cbb SHA1 b0e292e0a597a43acf132b3ee8555c10c719739a SHA256 f0f9ebc78ac4c76cef16ae0ad9d5e076651481c7ab2c52c1758055188d302b7c
 MISC metadata.xml 226 RMD160 80af5ae79d45bccff97425edf6ac2c3eb33d2dfc SHA1 bf1f9ae55677b0df0cf5d5548d00994c7161237e SHA256 facc70bcd9db210eaf1ac62a49df1927509d68b2cbbafb34c08e3bd689a27955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP2panAAoJEEqz6FtPBkyjduUH/jqMLvW0n3aCaMEJFR8eUHl7
-MYgTikcdBC23ZnJ3kGfTtw5WV3Byj0FHxzwLvmaCQWEYggDo2GXX/4y4LX0ihoqq
-gG2KGkRd89Sw1madDHd409rvQp3ncSFvHSGAXDPiygYAcNPHALse5me3MCPLbaMT
-YQcU2yF6hleLRD22txconkYQNwiBGF6E7mXhfCENNycxOJG8uMyYV0WfC9kulDJp
-Z6sB6XBLYzSIF2ZWHe1IUnoOXd/sFNxixAWwCzANEjGNicqgm4bpW7bqNj27YPQ4
-/2n6FJnajx0dVn2FqL7GValCfxF0lQ+GJ6QfsxVVeC2qvqfQB7f9LJTSXXK8Xpo=
-=vGft
+iQEcBAEBCgAGBQJP3Ym7AAoJEEqz6FtPBkyjWnEIAIEl4ib9YK+1HeBYIBfDzHp7
+2ULfi4k+ftRuKeEpKY7Wj4ODNQi2CG25dwgXmkMO4qurKIVQJOaOLcj8xLWaONLj
+UN1KERU9Are3oA5PyLxrPJRIM7N+vr/wPBITX42LeHUrz7yTca4z1cqexb14A4uV
+ZeKlN+GEoHnA3NgPSrnYtTXJvVQByGs37Gjv1jazxz97LyDqWWxZ5czi094tFZAu
+wVPPX1vNwLm7pz8oFbyudCl8Yc6paHmMQHV5gu7y9DUKMh2hnybDihhgS2d4JwBQ
+c0BJlu0gJMFn8iLEy6Yys8hrz4f9rciQleOQlG5XIWBlFybvZC0AjOIAqwOsSkM=
+=1I3u
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.18.4.ebuild b/www-apps/mediawiki/mediawiki-1.18.4.ebuild
new file mode 100644
index 000000000000..daf0b0857687
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.18.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.4.ebuild,v 1.1 2012/06/17 07:39:33 radhermit Exp $
+
+EAPI="4"
+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[sqlite3,pdo]
+	)
+	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.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
+}