version bump wrt security #212170

Package-Manager: portage-2.1.4.4

3 files changed, 177 insertions, 6 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 42ef0e174403..b394e4777cb8 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.98 2008/02/26 07:11:16 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.99 2008/03/03 13:27:49 hollow Exp $
+
+*mediawiki-1.11.2 (03 Mar 2008)
+
+  03 Mar 2008; Benedikt Böhm <hollow@gentoo.org> +mediawiki-1.11.2.ebuild:
+  version bump wrt security #212170
 
   26 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
   -files/postinstall-1.5-en.txt, -mediawiki-1.8.5.ebuild,
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 9077e8d23bb4..9287b88c09e9 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -5,13 +5,15 @@ AUX access_restrict.patch 1240 RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 S
 AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
 AUX postinstall-1.11-en.txt 2502 RMD160 a72826f3b8e4b6461c50227d4db5ec5da79e710d SHA1 1dc394d76537ce7b24601bb63ec1ef7f2e49ad7f SHA256 d88c989eac3d99fec4c057eb89ec04a05aabfc57b6503b8da7843bfbc730daf4
 DIST mediawiki-1.11.1.tar.gz 4885712 RMD160 c4ccc87acbbea4868094c83f58cf2142217d2267 SHA1 d452e0013969b064a2166eeae8d03227a8ff1fa3 SHA256 05173b49b73a289ff532baf4088215756804075394268b733ba2ae4265be9476
+DIST mediawiki-1.11.2.tar.gz 4880707 RMD160 e12cda810df8863c7adc84c9c44965335d0e85e0 SHA1 c5d5e99d73e646cff421b3bb92dd638fb93cd575 SHA256 3516fd7f0069e30b1ed6b6fea3794047ac08baf3cf71085c6943605efafd806f
 EBUILD mediawiki-1.11.1.ebuild 4266 RMD160 2cc576b19f1f7dc73ff275c217c2318a8e69d3ff SHA1 ec29455306e82a3e18c62874ebfd682e21a83f55 SHA256 88d7027ab14e7ef021bb6aa00e0c33271b68d863f93d5a42d712cdd1ee685a2e
-MISC ChangeLog 17726 RMD160 a9fba1feebd95a3768358fda2437edaf5f52b875 SHA1 d7179e6d5fcf94415853a4c8a48711ddab46257d SHA256 f47f89c7ab9fe9543879567a8a385e5a54d5ffab9491849e90fc3738b415c0b8
+EBUILD mediawiki-1.11.2.ebuild 4270 RMD160 579caa61f750f3311d704ed6aaa7a90eb3a90938 SHA1 8cb46574c3dccf9b8269dec6d6396eabcce4f82e SHA256 97a037d4f02c5bd1452301efdbb0d3b694830a1a355e932f594b8c32ed74c818
+MISC ChangeLog 17872 RMD160 efa2d730788500fceb6eb9eac08cc88e7ebe2df3 SHA1 f3d2bdb951c1aad3d00fa3176e651422b16e0fcc SHA256 d34dd1055c8d3bca49cb14aedf70a54b7c604347213ddc2266a37984efb301f9
 MISC metadata.xml 366 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 SHA1 4c3b825388a712b4452ba16912b38b9aba76b78e SHA256 dddc4891c17811953d2cae412c4b1a713dc00b3629cd38a5b530c15a0acebcc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHw7uaEEcxCpcDQ74RAjgTAJ9BwPCb25aLxZNC+IGjYljssomV3QCeJZOw
-9mLZHuldWsKvM1hOFEmSsTA=
-=Yxv9
+iEYEARECAAYFAkfL/N8ACgkQmPFBzbX68WG4rgCfZd/FwI2G9KwtxetJ5/OwpUmo
+5ikAn23DRyVWLAXfLUs4eLTnX/DCtuG4
+=dVsy
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.11.2.ebuild b/www-apps/mediawiki/mediawiki-1.11.2.ebuild
new file mode 100644
index 000000000000..8353d24955d4
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.11.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.2.ebuild,v 1.1 2008/03/03 13:27:49 hollow Exp $
+
+EAPI="1"
+inherit webapp depend.php versionator eutils
+
+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="~amd64 ~ppc ~sparc ~x86"
+IUSE="imagemagick math mysql postgres restrict +ocamlopt"
+
+DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
+RDEPEND="${DEPEND}
+	math? ( virtual/tetex
+		virtual/ghostscript
+		media-gfx/imagemagick )
+	imagemagick? ( media-gfx/imagemagick )"
+
+RESTRICT="test"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	local flags="pcre session xml"
+	use mysql && flags="${flags} mysql"
+	use postgres && flags="${flags} postgres"
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
+	fi
+
+	# see Bug 204812
+	if use ocamlopt && use math && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
+#	epatch ${FILESDIR}/jobindexlength-mysql.patch
+
+	if use restrict ; then
+		epatch "${FILESDIR}/access_restrict.patch"
+	fi
+}
+
+src_compile() {
+	if use math; then
+		einfo "Compiling math support"
+		cd math || die
+		if ! use ocamlopt; then
+			sed -i -e "s/ocamlopt/ocamlc/" Makefile
+			sed -i -e "s/cmxa/cma/" Makefile
+			sed -i -e "s/cmx/cmo/g" Makefile
+		fi
+		emake || die
+	else
+		einfo "No math support enabled. Skipping."
+	fi
+
+	# TODO: think about includes/zhtable/ support
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# copy the app's main files excluding math support, docs, and tests
+	local DIRS=(
+		"bin"
+		"config"
+		"extensions"
+		"images"
+		"includes"
+		"includes/api"
+		"includes/cbt"
+		"includes/filerepo"
+		"includes/media"
+		"includes/normal"
+		"includes/templates"
+		"includes/zhtable"
+		"languages"
+		"languages/classes"
+		"languages/messages"
+		"locale"
+		"maintenance"
+		"maintenance/archives"
+		"maintenance/dtrace"
+		"maintenance/language"
+		"maintenance/ora"
+		"maintenance/postgres"
+		"maintenance/postgres/archives"
+		"maintenance/storage"
+		"serialized"
+		"skins"
+		"skins/chick"
+		"skins/common"
+		"skins/common/images"
+		"skins/common/images/icons"
+		"skins/disabled"
+		"skins/htmldump"
+		"skins/monobook"
+		"skins/myskin"
+		"skins/simple"
+	)
+
+	insinto ${MY_HTDOCSDIR}
+	doins *.php *.inc *.phtml
+	for DIR in ${DIRS[*]}; do
+		insinto ${MY_HTDOCSDIR}/${DIR}
+		doins ${DIR}/*
+		[[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
+	done
+
+	# installing some docs
+	local DOCS="AdminSettings.sample FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	rm -f ${DOCS} COPYING docs/*.txt
+
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	if use imagemagick; then
+		webapp_serverowned ${MY_HTDOCSDIR}/images
+	fi
+
+	# If we've enabled math USE-flag, install math support.
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	if use math; then
+		einfo "Installing math support"
+		exeinto ${MY_HTDOCSDIR}/math
+		doexe math/texvc
+
+		# Docs
+		docinto math
+		dodoc math/{README,TODO}
+
+		# Working directories.  Server writeable.
+		dodir ${MY_HTDOCSDIR}/images/math
+		webapp_serverowned ${MY_HTDOCSDIR}/images/math
+		dodir ${MY_HTDOCSDIR}/images/tmp
+		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.11-en.txt"
+	webapp_src_install
+}