Update to 1.25.2

Upstream changes:
== Security fixes ==

* Internal review discovered that Special:DeletedContributions did not
properly
protect the IP of autoblocked users. This fix makes the functionality of
Special:DeletedContributions consistent with Special:Contributions and
Special:BlockList.
<https://phabricator.wikimedia.org/T106893>

* Internal review discovered that watchlist anti-csrf tokens were not being
compared in constant time, which could allow various timing attacks. This
could
allow an attacker to modify a user's watchlist via csrf.
<https://phabricator.wikimedia.org/T94116>

* John Menerick reported that MediaWiki's thumb.php failed to sanitize
various
error messages, resulting in xss.
<https://phabricator.wikimedia.org/T97391>

Additionally, the following extensions have been updated to fix security
issues:

* Extension:SemanticForms - MediaWiki user Grunny discovered multiple
reflected
xss vectors in SemanticForms. Further internal review discovered and fixed
other reflected and stored xss vectors.
<https://phabricator.wikimedia.org/T103391>
<https://phabricator.wikimedia.org/T103765>
<https://phabricator.wikimedia.org/T103761>

* Extension:SyntaxHighlight_GeSHi - xss and potential DoS vectors. Internal
review discovered that the contib directory for GeSHi was re-included in
MediaWiki 1.25. Some scripts could be potentially be used for DoS, and
DAU Huy Ngoc discovered an xss vector. All contrib scripts have been
removed.
<https://phabricator.wikimedia.org/T108198>

* Extension:TimedMediaHandler - User:McZusatz reported that resetting
transcodes deleted the transcode without creating a new one, which could be
used for vandalism or potentially DoS.
<https://phabricator.wikimedia.org/T100211>

* Extension:Quiz - Internal review discovered that Quiz did not properly
escape
regex metacharacters in a user controlled regular expression, enabling a DoS
vector.
<https://phabricator.wikimedia.org/T97083>

* Extension:Widgets - MediaWiki developer Majr reported a potential HTML
injection (xss) vector.
<https://phabricator.wikimedia.org/T88964>


== Bug Fixes in 1.25.2 ==
* (T102562) Fix InstantCommons parameters to handle the new HTTPS-only
  policy of Wikimedia Commons.
* (T100767) Setting a configuration setting for skin or extension to
  false in LocalSettings.php was not working.
* (T100635) API action=opensearch json output no longer breaks when
  $wgDebugToolbar is enabled.
* (T102522) Using an extension.json or skin.json file which has
  a "manifest_version" property for 1.26 compatability will no longer
  trigger warnings.
* (T86156) Running updateSearchIndex.php will not throw an error as
  page_restrictions has been added to the locked table list.
* Special:Version would throw notices if using SVN due to an incorrectly
  named variable. Add an additional check that an index is defined.

3 files changed, 504 insertions, 26 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index e7d923344f0..a6257a11580 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2015/06/12 10:51:50 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2015/08/12 13:49:40 wen Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${VER}/
 
@@ -23,7 +22,7 @@ INSTALLATION_DIRS=	${EGDIR} share/mediawiki
 .include "options.mk"
 
 VER=			1.25
-PVER=			1
+PVER=			2
 
 APACHE_USER?=		www
 APACHE_GROUP?=		www
diff --git a/www/mediawiki/PLIST b/www/mediawiki/PLIST
index d60a5d4f329..c6e40651045 100644
--- a/www/mediawiki/PLIST
+++ b/www/mediawiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2015/05/28 00:42:56 wen Exp $
+@comment $NetBSD: PLIST,v 1.25 2015/08/12 13:49:40 wen Exp $
 share/examples/mediawiki/mediawiki.conf
 share/mediawiki/COPYING
 share/mediawiki/CREDITS
@@ -17,7 +17,6 @@ share/mediawiki/api.php5
 share/mediawiki/autoload.php
 share/mediawiki/cache/.htaccess
 share/mediawiki/composer.json
-share/mediawiki/composer.lock
 share/mediawiki/docs/README
 share/mediawiki/docs/code-coverage/README
 share/mediawiki/docs/contenthandler.txt
@@ -467,11 +466,11 @@ share/mediawiki/extensions/CiteThisPage/i18n/yue.json
 share/mediawiki/extensions/CiteThisPage/i18n/zh-hans.json
 share/mediawiki/extensions/CiteThisPage/i18n/zh-hant.json
 share/mediawiki/extensions/CiteThisPage/modules/ext.citeThisPage.css
-share/mediawiki/extensions/ConfirmEdit/ApiFancyCaptchaReload.php
 share/mediawiki/extensions/ConfirmEdit/COPYING
 share/mediawiki/extensions/ConfirmEdit/ConfirmEdit.alias.php
 share/mediawiki/extensions/ConfirmEdit/ConfirmEdit.php
 share/mediawiki/extensions/ConfirmEdit/FancyCaptcha.php
+share/mediawiki/extensions/ConfirmEdit/FancyCaptcha/ApiFancyCaptchaReload.php
 share/mediawiki/extensions/ConfirmEdit/FancyCaptcha/FancyCaptcha.class.php
 share/mediawiki/extensions/ConfirmEdit/FancyCaptcha/FancyCaptcha.php
 share/mediawiki/extensions/ConfirmEdit/FancyCaptcha/extension.json
@@ -2584,12 +2583,6 @@ share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.langs.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/extension.json
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/aliased.php
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/cssgen.php
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/cssgen2.php
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/example.php
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/langcheck.php
-share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/contrib/langwiz.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/docs/BUGS
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/geshi/docs/COPYING
@@ -5924,6 +5917,7 @@ share/mediawiki/resources/assets/file-type-icons/fileicon-c.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-cpp.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-deb.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-djvu.png
+share/mediawiki/resources/assets/file-type-icons/fileicon-djvu.xcf
 share/mediawiki/resources/assets/file-type-icons/fileicon-dvi.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-exe.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-h.png
@@ -5934,6 +5928,7 @@ share/mediawiki/resources/assets/file-type-icons/fileicon-mid.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-mov.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-o.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-ogg.png
+share/mediawiki/resources/assets/file-type-icons/fileicon-ogg.xcf
 share/mediawiki/resources/assets/file-type-icons/fileicon-pdf.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-ps.png
 share/mediawiki/resources/assets/file-type-icons/fileicon-psd.png
@@ -8353,6 +8348,9 @@ share/mediawiki/tests/phpunit/data/localisationcache/en.json
 share/mediawiki/tests/phpunit/data/localisationcache/ru.json
 share/mediawiki/tests/phpunit/data/localisationcache/uk.json
 share/mediawiki/tests/phpunit/data/media/1bit-png.png
+share/mediawiki/tests/phpunit/data/media/80x60-2layers.xcf
+share/mediawiki/tests/phpunit/data/media/80x60-Greyscale.xcf
+share/mediawiki/tests/phpunit/data/media/80x60-RGB.xcf
 share/mediawiki/tests/phpunit/data/media/Animated_PNG_example_bouncing_beach_ball.png
 share/mediawiki/tests/phpunit/data/media/Bishzilla_blink.gif
 share/mediawiki/tests/phpunit/data/media/Gtk-media-play-ltr.svg
@@ -8905,7 +8903,10 @@ share/mediawiki/thumb.php
 share/mediawiki/thumb.php5
 share/mediawiki/thumb_handler.php
 share/mediawiki/thumb_handler.php5
+share/mediawiki/vendor/README.md
 share/mediawiki/vendor/autoload.php
+share/mediawiki/vendor/composer.json
+share/mediawiki/vendor/composer.lock
 share/mediawiki/vendor/composer/ClassLoader.php
 share/mediawiki/vendor/composer/autoload_classmap.php
 share/mediawiki/vendor/composer/autoload_namespaces.php
@@ -9032,9 +9033,163 @@ share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/Read
 share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/StatsdClientTest.php
 share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/StatsdDataFactoryTest.php
 share/mediawiki/vendor/liuggio/statsd-php-client/tests/bootstrap.php
+share/mediawiki/vendor/monolog/monolog/CHANGELOG.mdown
+share/mediawiki/vendor/monolog/monolog/LICENSE
+share/mediawiki/vendor/monolog/monolog/README.mdown
+share/mediawiki/vendor/monolog/monolog/composer.json
+share/mediawiki/vendor/monolog/monolog/doc/extending.md
+share/mediawiki/vendor/monolog/monolog/doc/sockets.md
+share/mediawiki/vendor/monolog/monolog/doc/usage.md
+share/mediawiki/vendor/monolog/monolog/phpunit.xml.dist
+share/mediawiki/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Logger.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
+share/mediawiki/vendor/monolog/monolog/src/Monolog/Registry.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/LoggerTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
+share/mediawiki/vendor/monolog/monolog/tests/Monolog/TestCase.php
+share/mediawiki/vendor/monolog/monolog/tests/bootstrap.php
 share/mediawiki/vendor/oojs/oojs-ui/.csscomb.json
 share/mediawiki/vendor/oojs/oojs-ui/.csslintrc
-share/mediawiki/vendor/oojs/oojs-ui/.mailmap
 share/mediawiki/vendor/oojs/oojs-ui/.npmignore
 share/mediawiki/vendor/oojs/oojs-ui/AUTHORS.txt
 share/mediawiki/vendor/oojs/oojs-ui/Doxyfile
@@ -9898,13 +10053,344 @@ share/mediawiki/vendor/psr/log/Psr/Log/AbstractLogger.php
 share/mediawiki/vendor/psr/log/Psr/Log/InvalidArgumentException.php
 share/mediawiki/vendor/psr/log/Psr/Log/LogLevel.php
 share/mediawiki/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
-share/mediawiki/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
 share/mediawiki/vendor/psr/log/Psr/Log/LoggerInterface.php
-share/mediawiki/vendor/psr/log/Psr/Log/LoggerTrait.php
 share/mediawiki/vendor/psr/log/Psr/Log/NullLogger.php
 share/mediawiki/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
 share/mediawiki/vendor/psr/log/README.md
 share/mediawiki/vendor/psr/log/composer.json
+share/mediawiki/vendor/ruflin/elastica/LICENSE.txt
+share/mediawiki/vendor/ruflin/elastica/README.markdown
+share/mediawiki/vendor/ruflin/elastica/Vagrantfile
+share/mediawiki/vendor/ruflin/elastica/build.xml
+share/mediawiki/vendor/ruflin/elastica/changes.txt
+share/mediawiki/vendor/ruflin/elastica/composer.json
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/AbstractUpdateAction.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/AbstractAggregation.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Avg.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Cardinality.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/DateHistogram.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/DateRange.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/ExtendedStats.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Filter.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/GeoDistance.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/GeohashGrid.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/GlobalAggregation.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Histogram.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/IpRange.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Max.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Min.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Missing.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Nested.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Range.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/ReverseNested.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Stats.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Sum.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/Terms.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Aggregation/ValueCount.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action/AbstractDocument.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action/CreateDocument.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action/DeleteDocument.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action/IndexDocument.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Action/UpdateDocument.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/Response.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Bulk/ResponseSet.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Client.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Cluster.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Cluster/Health.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Cluster/Health/Index.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Cluster/Health/Shard.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Cluster/Settings.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Connection.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Document.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/BulkException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/ClientException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/InvalidException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/JSONParseException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/NotFoundException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/ResponseException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/AbstractFacet.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/DateHistogram.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Filter.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/GeoCluster.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/GeoDistance.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Histogram.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Query.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Range.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Statistical.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/Terms.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Facet/TermsStats.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractFilter.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoShape.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractMulti.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Bool.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/BoolAnd.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/BoolNot.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/BoolOr.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Exists.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoBoundingBox.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoDistance.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoDistanceRange.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoPolygon.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoShapePreIndexed.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeoShapeProvided.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/GeohashCell.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/HasChild.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/HasParent.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Ids.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Indices.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Limit.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/MatchAll.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Missing.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Nested.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/NumericRange.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Prefix.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Query.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Range.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Regexp.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Script.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Term.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Terms.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Filter/Type.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Index.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Index/Settings.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Index/Stats.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Index/Status.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/JSON.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Log.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Multi/ResultSet.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Multi/Search.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Node.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Node/Info.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Node/Stats.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Param.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Percolator.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/AbstractQuery.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Bool.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Boosting.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Builder.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Common.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/ConstantScore.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/DisMax.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Filtered.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/FunctionScore.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Fuzzy.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/FuzzyLikeThis.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/HasChild.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/HasParent.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Ids.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Match.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/MatchAll.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/MoreLikeThis.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/MultiMatch.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Nested.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Prefix.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/QueryString.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Range.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Simple.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/SimpleQueryString.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Term.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Terms.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/TopChildren.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Query/Wildcard.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Request.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Rescore/AbstractRescore.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Rescore/Query.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Response.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Result.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/ResultSet.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/ScanAndScroll.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Script.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/ScriptFields.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Search.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/SearchableInterface.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Snapshot.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Status.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest/AbstractSuggest.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest/CandidateGenerator/DirectGenerator.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest/Phrase.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Suggest/Term.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/AbstractTransport.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Guzzle.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Http.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Https.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Memcache.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Null.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Transport/Thrift.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Type.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Type/AbstractType.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Type/Mapping.php
+share/mediawiki/vendor/ruflin/elastica/lib/Elastica/Util.php
+share/mediawiki/vendor/ruflin/elastica/phpdoc.dist.xml
+share/mediawiki/vendor/ruflin/elastica/test/benchmark/BulkMemoryUsageTest.php
+share/mediawiki/vendor/ruflin/elastica/test/benchmark/ClientTest.php
+share/mediawiki/vendor/ruflin/elastica/test/benchmark/TransportTest.php
+share/mediawiki/vendor/ruflin/elastica/test/benchmark/phpunit.benchmark.xml
+share/mediawiki/vendor/ruflin/elastica/test/benchmark/phpunit.xhprof.xml
+share/mediawiki/vendor/ruflin/elastica/test/bin/install_php_memcache.sh
+share/mediawiki/vendor/ruflin/elastica/test/bin/run_elasticsearch.sh
+share/mediawiki/vendor/ruflin/elastica/test/bin/run_proxy.sh
+share/mediawiki/vendor/ruflin/elastica/test/bin/show_logs.sh
+share/mediawiki/vendor/ruflin/elastica/test/bootstrap.php
+share/mediawiki/vendor/ruflin/elastica/test/data/test.doc
+share/mediawiki/vendor/ruflin/elastica/test/data/test.docx
+share/mediawiki/vendor/ruflin/elastica/test/data/test.pdf
+share/mediawiki/vendor/ruflin/elastica/test/data/test.txt
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/AvgTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/BaseAggregationTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/CardinalityTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/DateHistogramTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/DateRangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/ExtendedStatsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/FilterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeoDistanceTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeohashGridTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GlobalAggregationTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/HistogramTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/IpRangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MaxTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MinTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MissingTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/NestedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/RangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/ReverseNestedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/StatsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/SumTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/TermsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/ValueCountTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Base.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Bulk/ActionTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Bulk/ResponseSetTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/BulkTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ClientTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Cluster/Health/IndexTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Cluster/Health/ShardTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Cluster/HealthTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Cluster/SettingsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ClusterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ConnectionTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/DocumentTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ExampleTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Exception/NotImplementedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Exception/PartialShardFailureExceptionTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Exception/ResponseExceptionTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/DateHistogramTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/FilterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/GeoClusterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/QueryTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/StatisticalTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/TermsStatsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Facet/TermsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/AbstractTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/BoolAndTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/BoolNotTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/BoolOrTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/BoolTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/ExistsTests.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeoDistanceRangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeoDistanceTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeoPolygonTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeoShapePreIndexedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeoShapeProvidedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/GeohashCellTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/HasChildTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/HasParentTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/IdsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/IndicesTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/MatchAllTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/MultiTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/NestedFilterWithSetFilterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/NestedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/NumericRangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/PrefixTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/QueryTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/RangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/RegexpTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/ScriptTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/TermTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/TermsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Filter/TypeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Index/SettingsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Index/StatsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Index/StatusTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/IndexTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/LogTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Multi/SearchTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Node/InfoTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/NodeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ParamTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/PercolatorTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoolTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoostingTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BuilderTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/CommonTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/ConstantScoreTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/DisMaxTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/FilteredTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/FunctionScoreTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/FuzzyLikeThisTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/FuzzyTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasChildTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasParentTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HighlightTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/IdsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/MatchAllTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/MatchTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/MoreLikeThisTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/MultiMatchTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/NestedTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/PostFilterTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/PrefixTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/QueryStringTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/RangeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/RescoreTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/SimpleQueryStringTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/SimpleTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/TermTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/TermsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/WildcardTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/QueryTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/RequestTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ResponseTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ResultSetTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ResultTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ScanAndScrollTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ScriptFieldsTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/ScriptTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/SearchTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/SnapshotTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/StatusTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Suggest/PhraseTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Suggest/TermTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/AbstractTransportTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/GuzzleTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/HttpTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/MemcacheTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/NullTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Transport/ThriftTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/Type/MappingTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/TypeTest.php
+share/mediawiki/vendor/ruflin/elastica/test/lib/Elastica/Test/UtilTest.php
+share/mediawiki/vendor/ruflin/elastica/test/nginx/nginx.conf
+share/mediawiki/vendor/ruflin/elastica/test/phpunit.xml.dist
 share/mediawiki/vendor/wikimedia/cdb/COPYING
 share/mediawiki/vendor/wikimedia/cdb/Doxyfile
 share/mediawiki/vendor/wikimedia/cdb/README.md
@@ -9943,11 +10429,6 @@ share/mediawiki/vendor/zordius/lightncandy/HISTORY.md
 share/mediawiki/vendor/zordius/lightncandy/LICENSE.txt
 share/mediawiki/vendor/zordius/lightncandy/README.md
 share/mediawiki/vendor/zordius/lightncandy/UPGRADE.md
-share/mediawiki/vendor/zordius/lightncandy/build/gen_doc
-share/mediawiki/vendor/zordius/lightncandy/build/gen_test.php
-share/mediawiki/vendor/zordius/lightncandy/build/push_ghpage
-share/mediawiki/vendor/zordius/lightncandy/build/runphp
-share/mediawiki/vendor/zordius/lightncandy/build/travis_push
 share/mediawiki/vendor/zordius/lightncandy/composer.json
 share/mediawiki/vendor/zordius/lightncandy/example_debug.png
 share/mediawiki/vendor/zordius/lightncandy/phpunit.xml
@@ -9966,5 +10447,3 @@ share/mediawiki/vendor/zordius/lightncandy/tests/test1.tmpl
 share/mediawiki/vendor/zordius/lightncandy/tests/test2.tmpl
 share/mediawiki/vendor/zordius/lightncandy/tests/test3.tmpl
 share/mediawiki/wiki.phtml
-@pkgdir share/mediawiki/vendor/zordius/lightncandy/specs/mustache
-@pkgdir share/mediawiki/vendor/zordius/lightncandy/specs/handlebars
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 734ab8bca04..b94db0f08c0 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.39 2015/05/28 00:42:56 wen Exp $
+$NetBSD: distinfo,v 1.40 2015/08/12 13:49:40 wen Exp $
 
-SHA1 (mediawiki-1.25.1.tar.gz) = 16e6186c224a54efef5c165222ee94949efe4655
-RMD160 (mediawiki-1.25.1.tar.gz) = 6ed49a04e32c81d1b05787dccc6f21d1b1702d1a
-Size (mediawiki-1.25.1.tar.gz) = 23661450 bytes
+SHA1 (mediawiki-1.25.2.tar.gz) = 0b58692f4300cccf47b64bb94ebaf388346a9dc9
+RMD160 (mediawiki-1.25.2.tar.gz) = ea9826022a93770115ea4759d9926c3e361ab2e5
+Size (mediawiki-1.25.2.tar.gz) = 24018158 bytes