Pullup ticket #4233 - requested by wen

www/mediawiki: security update

Revisions pulled up:
- www/mediawiki/Makefile                                        1.34
- www/mediawiki/PLIST                                           1.17
- www/mediawiki/distinfo                                        1.23

---
   Module Name:    pkgsrc
   Committed By:   wen
   Date:           Sat Sep  7 14:49:42 UTC 2013

   Modified Files:
           pkgsrc/www/mediawiki: Makefile PLIST distinfo

   Log Message:
   Update to 1.21.2

   Upstream changes:
   Changes since 1.21.1
   SECURITY: Fix extension detection with 2 .'s
   SECURITY: Support for the 'gettoken' parameter to action=block and
   action=unblock, deprecated since 1.20, has been removed.
   SECURITY: Sanitize ResourceLoader exception messages
   Purge upstream caches when deleting file assets.
   Unit test suite now runs the AutoLoader tests. Also fixed the autoloading
   entry for the PageORMTableForTesting class though it had no impact.

3 files changed, 478 insertions, 14 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 898d4a56f1f..e09603e7977 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/06/08 07:26:53 wen Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2013/09/13 12:37:37 tron Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
 CATEGORIES=	www
@@ -22,7 +22,7 @@ INSTALLATION_DIRS=	${EGDIR} share/mediawiki
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 VER=			1.21
-PVER=			1
+PVER=			2
 
 APACHE_USER?=		www
 APACHE_GROUP?=		www
@@ -82,6 +82,8 @@ SUBST_CLASSES+=		php
 SUBST_MESSAGE.php=	Fixing the path of php.
 SUBST_STAGE.php=	post-patch
 SUBST_FILES.php+=	includes/normal/UtfNormalTest2.php
+SUBST_FILES.php+=	tests/RunSeleniumTests.php
+SUBST_FILES.php+=	tests/phpunit/phpunit.php
 SUBST_SED.php=          -e "s,/usr/bin/env php,${PREFIX}/bin/php,g"
 
 post-extract:
diff --git a/www/mediawiki/PLIST b/www/mediawiki/PLIST
index 1c95e8b1ed6..c9200394078 100644
--- a/www/mediawiki/PLIST
+++ b/www/mediawiki/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.16 2013/06/08 07:26:53 wen Exp $
+@comment $NetBSD: PLIST,v 1.16.2.1 2013/09/13 12:37:37 tron Exp $
 share/examples/mediawiki/mediawiki.conf
+share/mediawiki/.jshintignore
+share/mediawiki/.jshintrc
 share/mediawiki/COPYING
 share/mediawiki/CREDITS
 share/mediawiki/FAQ
@@ -108,6 +110,7 @@ share/mediawiki/extensions/Gadgets/Gadgets_body.php
 share/mediawiki/extensions/Gadgets/README
 share/mediawiki/extensions/Gadgets/SpecialGadgets.php
 share/mediawiki/extensions/Gadgets/install.settings
+share/mediawiki/extensions/Gadgets/tests/GadgetTest.php
 share/mediawiki/extensions/ImageMap/ImageMap.i18n.php
 share/mediawiki/extensions/ImageMap/ImageMap.php
 share/mediawiki/extensions/ImageMap/ImageMap_body.php
@@ -128,6 +131,7 @@ share/mediawiki/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php
 share/mediawiki/extensions/LocalisationUpdate/LocalisationUpdate.php
 share/mediawiki/extensions/LocalisationUpdate/QuickArrayReader.php
 share/mediawiki/extensions/LocalisationUpdate/README_FIRST.txt
+share/mediawiki/extensions/LocalisationUpdate/tests/tokenTest.php
 share/mediawiki/extensions/LocalisationUpdate/update.php
 share/mediawiki/extensions/Nuke/COPYING
 share/mediawiki/extensions/Nuke/INSTALL
@@ -148,6 +152,7 @@ share/mediawiki/extensions/ParserFunctions/ParserFunctions_body.php
 share/mediawiki/extensions/ParserFunctions/README
 share/mediawiki/extensions/ParserFunctions/funcsParserTests.txt
 share/mediawiki/extensions/ParserFunctions/stringFunctionTests.txt
+share/mediawiki/extensions/ParserFunctions/tests/ExpressionTest.php
 share/mediawiki/extensions/PdfHandler/CreatePdfThumbnailsJob.class.php
 share/mediawiki/extensions/PdfHandler/PdfHandler.i18n.php
 share/mediawiki/extensions/PdfHandler/PdfHandler.image.php
@@ -186,12 +191,6 @@ share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.local.php
 share/mediawiki/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
-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
@@ -493,6 +492,8 @@ share/mediawiki/extensions/TitleBlacklist/TitleBlacklist.list.php
 share/mediawiki/extensions/TitleBlacklist/TitleBlacklist.php
 share/mediawiki/extensions/TitleBlacklist/api/ApiQueryTitleBlacklist.php
 share/mediawiki/extensions/TitleBlacklist/modules/mediawiki.api.titleblacklist.js
+share/mediawiki/extensions/TitleBlacklist/tests/ApiQueryTitleBlacklistTest.php
+share/mediawiki/extensions/TitleBlacklist/tests/testSource
 share/mediawiki/extensions/Vector/README
 share/mediawiki/extensions/Vector/Vector.hooks.php
 share/mediawiki/extensions/Vector/Vector.i18n.php
@@ -515,6 +516,8 @@ share/mediawiki/extensions/Vector/modules/images/portal-break.png
 share/mediawiki/extensions/Vector/modules/jquery.collapsibleTabs.js
 share/mediawiki/extensions/Vector/modules/jquery.footerCollapsibleList.js
 share/mediawiki/extensions/Vector/switchExperimentPrefs.php
+share/mediawiki/extensions/WikiEditor/.jshintignore
+share/mediawiki/extensions/WikiEditor/.jshintrc
 share/mediawiki/extensions/WikiEditor/README
 share/mediawiki/extensions/WikiEditor/WikiEditor.hooks.php
 share/mediawiki/extensions/WikiEditor/WikiEditor.i18n.php
@@ -626,6 +629,11 @@ share/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js
 share/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
 share/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css
 share/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js
+share/mediawiki/extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php
+share/mediawiki/extensions/WikiEditor/tests/selenium/WikiDialogs_Links_Setup.php
+share/mediawiki/extensions/WikiEditor/tests/selenium/WikiEditorConstants.php
+share/mediawiki/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
+share/mediawiki/extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php
 share/mediawiki/images/.htaccess
 share/mediawiki/images/README
 share/mediawiki/img_auth.php
@@ -2632,6 +2640,7 @@ share/mediawiki/skins/common/images/icons/fileicon-c.png
 share/mediawiki/skins/common/images/icons/fileicon-cpp.png
 share/mediawiki/skins/common/images/icons/fileicon-deb.png
 share/mediawiki/skins/common/images/icons/fileicon-djvu.png
+share/mediawiki/skins/common/images/icons/fileicon-djvu.xcf
 share/mediawiki/skins/common/images/icons/fileicon-dvi.png
 share/mediawiki/skins/common/images/icons/fileicon-exe.png
 share/mediawiki/skins/common/images/icons/fileicon-h.png
@@ -2642,6 +2651,7 @@ share/mediawiki/skins/common/images/icons/fileicon-mid.png
 share/mediawiki/skins/common/images/icons/fileicon-mov.png
 share/mediawiki/skins/common/images/icons/fileicon-o.png
 share/mediawiki/skins/common/images/icons/fileicon-ogg.png
+share/mediawiki/skins/common/images/icons/fileicon-ogg.xcf
 share/mediawiki/skins/common/images/icons/fileicon-pdf.png
 share/mediawiki/skins/common/images/icons/fileicon-ps.png
 share/mediawiki/skins/common/images/icons/fileicon-psd.png
@@ -2763,9 +2773,461 @@ share/mediawiki/skins/vector/images/watch-icons.png
 share/mediawiki/skins/vector/screen-hd.css
 share/mediawiki/skins/vector/screen.css
 share/mediawiki/skins/vector/vector.js
+share/mediawiki/tests/.htaccess
+share/mediawiki/tests/RunSeleniumTests.php
+share/mediawiki/tests/TestsAutoLoader.php
+share/mediawiki/tests/parser/README
+share/mediawiki/tests/parser/extraParserTests.txt
+share/mediawiki/tests/parser/parserTest.inc
+share/mediawiki/tests/parser/parserTests.txt
+share/mediawiki/tests/parser/parserTestsParserHook.php
+share/mediawiki/tests/parser/preprocess/All_system_messages.expected
+share/mediawiki/tests/parser/preprocess/All_system_messages.txt
+share/mediawiki/tests/parser/preprocess/Factorial.expected
+share/mediawiki/tests/parser/preprocess/Factorial.txt
+share/mediawiki/tests/parser/preprocess/Fundraising.expected
+share/mediawiki/tests/parser/preprocess/Fundraising.txt
+share/mediawiki/tests/parser/preprocess/NestedTemplates.expected
+share/mediawiki/tests/parser/preprocess/NestedTemplates.txt
+share/mediawiki/tests/parser/preprocess/QuoteQuran.expected
+share/mediawiki/tests/parser/preprocess/QuoteQuran.txt
+share/mediawiki/tests/parserTests.php
+share/mediawiki/tests/phpunit/AutoLoaderTest.php
+share/mediawiki/tests/phpunit/Makefile
+share/mediawiki/tests/phpunit/MediaWikiLangTestCase.php
+share/mediawiki/tests/phpunit/MediaWikiPHPUnitCommand.php
+share/mediawiki/tests/phpunit/MediaWikiTestCase.php
+share/mediawiki/tests/phpunit/README
+share/mediawiki/tests/phpunit/StructureTest.php
+share/mediawiki/tests/phpunit/TODO
+share/mediawiki/tests/phpunit/bootstrap.php
+share/mediawiki/tests/phpunit/data/db/mysql/functions.sql
+share/mediawiki/tests/phpunit/data/db/postgres/functions.sql
+share/mediawiki/tests/phpunit/data/db/sqlite/tables-1.13.sql
+share/mediawiki/tests/phpunit/data/db/sqlite/tables-1.15.sql
+share/mediawiki/tests/phpunit/data/db/sqlite/tables-1.16.sql
+share/mediawiki/tests/phpunit/data/db/sqlite/tables-1.17.sql
+share/mediawiki/tests/phpunit/data/db/sqlite/tables-1.18.sql
+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/Gtk-media-play-ltr.svg
+share/mediawiki/tests/phpunit/data/media/Png-native-test.png
+share/mediawiki/tests/phpunit/data/media/QA_icon.svg
+share/mediawiki/tests/phpunit/data/media/README
+share/mediawiki/tests/phpunit/data/media/Toll_Texas_1.svg
+share/mediawiki/tests/phpunit/data/media/US_states_by_total_state_tax_revenue.svg
+share/mediawiki/tests/phpunit/data/media/Wikimedia-logo.svg
+share/mediawiki/tests/phpunit/data/media/Xmp-exif-multilingual_test.jpg
+share/mediawiki/tests/phpunit/data/media/animated-xmp.gif
+share/mediawiki/tests/phpunit/data/media/animated.gif
+share/mediawiki/tests/phpunit/data/media/broken_exif_date.jpg
+share/mediawiki/tests/phpunit/data/media/exif-gps.jpg
+share/mediawiki/tests/phpunit/data/media/exif-user-comment.jpg
+share/mediawiki/tests/phpunit/data/media/greyscale-na-png.png
+share/mediawiki/tests/phpunit/data/media/greyscale-png.png
+share/mediawiki/tests/phpunit/data/media/iptc-invalid-psir.jpg
+share/mediawiki/tests/phpunit/data/media/iptc-timetest-invalid.jpg
+share/mediawiki/tests/phpunit/data/media/iptc-timetest.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-comment-binary.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-comment-iso8859-1.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-comment-multiple.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-comment-utf.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-iptc-bad-hash.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-iptc-good-hash.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-padding-even.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-padding-odd.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-xmp-alt.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-xmp-psir.jpg
+share/mediawiki/tests/phpunit/data/media/jpeg-xmp-psir.xmp
+share/mediawiki/tests/phpunit/data/media/landscape-plain.jpg
+share/mediawiki/tests/phpunit/data/media/nonanimated.gif
+share/mediawiki/tests/phpunit/data/media/portrait-rotated.jpg
+share/mediawiki/tests/phpunit/data/media/rgb-na-png.png
+share/mediawiki/tests/phpunit/data/media/rgb-png.png
+share/mediawiki/tests/phpunit/data/media/test.jpg
+share/mediawiki/tests/phpunit/data/media/test.tiff
+share/mediawiki/tests/phpunit/data/media/xmp.png
+share/mediawiki/tests/phpunit/data/xmp/1.result.php
+share/mediawiki/tests/phpunit/data/xmp/1.xmp
+share/mediawiki/tests/phpunit/data/xmp/2.result.php
+share/mediawiki/tests/phpunit/data/xmp/2.xmp
+share/mediawiki/tests/phpunit/data/xmp/3-invalid.result.php
+share/mediawiki/tests/phpunit/data/xmp/3-invalid.xmp
+share/mediawiki/tests/phpunit/data/xmp/3.result.php
+share/mediawiki/tests/phpunit/data/xmp/3.xmp
+share/mediawiki/tests/phpunit/data/xmp/4.result.php
+share/mediawiki/tests/phpunit/data/xmp/4.xmp
+share/mediawiki/tests/phpunit/data/xmp/5.result.php
+share/mediawiki/tests/phpunit/data/xmp/5.xmp
+share/mediawiki/tests/phpunit/data/xmp/6.result.php
+share/mediawiki/tests/phpunit/data/xmp/6.xmp
+share/mediawiki/tests/phpunit/data/xmp/7.result.php
+share/mediawiki/tests/phpunit/data/xmp/7.xmp
+share/mediawiki/tests/phpunit/data/xmp/README
+share/mediawiki/tests/phpunit/data/xmp/bag-for-seq.result.php
+share/mediawiki/tests/phpunit/data/xmp/bag-for-seq.xmp
+share/mediawiki/tests/phpunit/data/xmp/flash.result.php
+share/mediawiki/tests/phpunit/data/xmp/flash.xmp
+share/mediawiki/tests/phpunit/data/xmp/gps.result.php
+share/mediawiki/tests/phpunit/data/xmp/gps.xmp
+share/mediawiki/tests/phpunit/data/xmp/invalid-child-not-struct.result.php
+share/mediawiki/tests/phpunit/data/xmp/invalid-child-not-struct.xmp
+share/mediawiki/tests/phpunit/data/xmp/no-namespace.result.php
+share/mediawiki/tests/phpunit/data/xmp/no-namespace.xmp
+share/mediawiki/tests/phpunit/data/xmp/no-recognized-props.result.php
+share/mediawiki/tests/phpunit/data/xmp/no-recognized-props.xmp
+share/mediawiki/tests/phpunit/data/xmp/utf16BE.result.php
+share/mediawiki/tests/phpunit/data/xmp/utf16BE.xmp
+share/mediawiki/tests/phpunit/data/xmp/utf16LE.result.php
+share/mediawiki/tests/phpunit/data/xmp/utf16LE.xmp
+share/mediawiki/tests/phpunit/data/xmp/utf32BE.result.php
+share/mediawiki/tests/phpunit/data/xmp/utf32BE.xmp
+share/mediawiki/tests/phpunit/data/xmp/utf32LE.result.php
+share/mediawiki/tests/phpunit/data/xmp/utf32LE.xmp
+share/mediawiki/tests/phpunit/data/xmp/xmpExt.result.php
+share/mediawiki/tests/phpunit/data/xmp/xmpExt.xmp
+share/mediawiki/tests/phpunit/data/xmp/xmpExt2.xmp
+share/mediawiki/tests/phpunit/data/zip/cd-gap.zip
+share/mediawiki/tests/phpunit/data/zip/cd-truncated.zip
+share/mediawiki/tests/phpunit/data/zip/class-trailing-null.zip
+share/mediawiki/tests/phpunit/data/zip/class-trailing-slash.zip
+share/mediawiki/tests/phpunit/data/zip/class.zip
+share/mediawiki/tests/phpunit/data/zip/empty.zip
+share/mediawiki/tests/phpunit/data/zip/looks-like-zip64.zip
+share/mediawiki/tests/phpunit/data/zip/nosig.zip
+share/mediawiki/tests/phpunit/data/zip/split.zip
+share/mediawiki/tests/phpunit/data/zip/trail.zip
+share/mediawiki/tests/phpunit/data/zip/wrong-cd-start-disk.zip
+share/mediawiki/tests/phpunit/data/zip/wrong-central-entry-sig.zip
+share/mediawiki/tests/phpunit/docs/ExportDemoTest.php
+share/mediawiki/tests/phpunit/includes/ArticleTablesTest.php
+share/mediawiki/tests/phpunit/includes/ArticleTest.php
+share/mediawiki/tests/phpunit/includes/BlockTest.php
+share/mediawiki/tests/phpunit/includes/CdbTest.php
+share/mediawiki/tests/phpunit/includes/CollationTest.php
+share/mediawiki/tests/phpunit/includes/DiffHistoryBlobTest.php
+share/mediawiki/tests/phpunit/includes/EditPageTest.php
+share/mediawiki/tests/phpunit/includes/ExternalStoreTest.php
+share/mediawiki/tests/phpunit/includes/ExtraParserTest.php
+share/mediawiki/tests/phpunit/includes/FauxResponseTest.php
+share/mediawiki/tests/phpunit/includes/FormOptionsInitializationTest.php
+share/mediawiki/tests/phpunit/includes/FormOptionsTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/README
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfAssembleUrlTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfBaseConvertTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfBaseNameTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfGetCallerTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfParseUrlTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfRemoveDotSegmentsTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfShorthandToIntegerTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
+share/mediawiki/tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php
+share/mediawiki/tests/phpunit/includes/HooksTest.php
+share/mediawiki/tests/phpunit/includes/HtmlTest.php
+share/mediawiki/tests/phpunit/includes/HttpTest.php
+share/mediawiki/tests/phpunit/includes/IPTest.php
+share/mediawiki/tests/phpunit/includes/JsonTest.php
+share/mediawiki/tests/phpunit/includes/LanguageConverterTest.php
+share/mediawiki/tests/phpunit/includes/LicensesTest.php
+share/mediawiki/tests/phpunit/includes/LinkerTest.php
+share/mediawiki/tests/phpunit/includes/LinksUpdateTest.php
+share/mediawiki/tests/phpunit/includes/LocalFileTest.php
+share/mediawiki/tests/phpunit/includes/LocalisationCacheTest.php
+share/mediawiki/tests/phpunit/includes/MWFunctionTest.php
+share/mediawiki/tests/phpunit/includes/MWNamespaceTest.php
+share/mediawiki/tests/phpunit/includes/MessageTest.php
+share/mediawiki/tests/phpunit/includes/OutputPageTest.php
+share/mediawiki/tests/phpunit/includes/PathRouterTest.php
+share/mediawiki/tests/phpunit/includes/PreferencesTest.php
+share/mediawiki/tests/phpunit/includes/Providers.php
+share/mediawiki/tests/phpunit/includes/RecentChangeTest.php
+share/mediawiki/tests/phpunit/includes/RequestContextTest.php
+share/mediawiki/tests/phpunit/includes/ResourceLoaderTest.php
+share/mediawiki/tests/phpunit/includes/RevisionStorageTest.php
+share/mediawiki/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php
+share/mediawiki/tests/phpunit/includes/RevisionTest.php
+share/mediawiki/tests/phpunit/includes/SampleTest.php
+share/mediawiki/tests/phpunit/includes/SanitizerTest.php
+share/mediawiki/tests/phpunit/includes/SanitizerValidateEmailTest.php
+share/mediawiki/tests/phpunit/includes/SeleniumConfigurationTest.php
+share/mediawiki/tests/phpunit/includes/SiteConfigurationTest.php
+share/mediawiki/tests/phpunit/includes/StringUtilsTest.php
+share/mediawiki/tests/phpunit/includes/TemplateCategoriesTest.php
+share/mediawiki/tests/phpunit/includes/TestUser.php
+share/mediawiki/tests/phpunit/includes/TimeAdjustTest.php
+share/mediawiki/tests/phpunit/includes/TimestampTest.php
+share/mediawiki/tests/phpunit/includes/TitleMethodsTest.php
+share/mediawiki/tests/phpunit/includes/TitlePermissionTest.php
+share/mediawiki/tests/phpunit/includes/TitleTest.php
+share/mediawiki/tests/phpunit/includes/UIDGeneratorTest.php
+share/mediawiki/tests/phpunit/includes/UserTest.php
+share/mediawiki/tests/phpunit/includes/WebRequestTest.php
+share/mediawiki/tests/phpunit/includes/WikiPageTest.php
+share/mediawiki/tests/phpunit/includes/WikiPageTest_ContentHandlerUseDB.php
+share/mediawiki/tests/phpunit/includes/XmlJsTest.php
+share/mediawiki/tests/phpunit/includes/XmlSelectTest.php
+share/mediawiki/tests/phpunit/includes/XmlTest.php
+share/mediawiki/tests/phpunit/includes/ZipDirectoryReaderTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiAccountCreationTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiBlockTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiEditPageTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiOptionsTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiParseTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiPurgeTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiTestCase.php
+share/mediawiki/tests/phpunit/includes/api/ApiTestCaseUpload.php
+share/mediawiki/tests/phpunit/includes/api/ApiUploadTest.php
+share/mediawiki/tests/phpunit/includes/api/ApiWatchTest.php
+share/mediawiki/tests/phpunit/includes/api/PrefixUniquenessTest.php
+share/mediawiki/tests/phpunit/includes/api/RandomImageGenerator.php
+share/mediawiki/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+share/mediawiki/tests/phpunit/includes/api/format/ApiFormatTestBase.php
+share/mediawiki/tests/phpunit/includes/api/generateRandomImages.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryTest.php
+share/mediawiki/tests/phpunit/includes/api/query/ApiQueryTestBase.php
+share/mediawiki/tests/phpunit/includes/api/words.txt
+share/mediawiki/tests/phpunit/includes/cache/GenderCacheTest.php
+share/mediawiki/tests/phpunit/includes/cache/ProcessCacheLRUTest.php
+share/mediawiki/tests/phpunit/includes/content/ContentHandlerTest.php
+share/mediawiki/tests/phpunit/includes/content/CssContentTest.php
+share/mediawiki/tests/phpunit/includes/content/JavaScriptContentTest.php
+share/mediawiki/tests/phpunit/includes/content/TextContentTest.php
+share/mediawiki/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+share/mediawiki/tests/phpunit/includes/content/WikitextContentTest.php
+share/mediawiki/tests/phpunit/includes/db/DatabaseSQLTest.php
+share/mediawiki/tests/phpunit/includes/db/DatabaseSqliteTest.php
+share/mediawiki/tests/phpunit/includes/db/DatabaseTest.php
+share/mediawiki/tests/phpunit/includes/db/ORMRowTest.php
+share/mediawiki/tests/phpunit/includes/db/ORMTableTest.php
+share/mediawiki/tests/phpunit/includes/db/TestORMRowTest.php
+share/mediawiki/tests/phpunit/includes/debug/MWDebugTest.php
+share/mediawiki/tests/phpunit/includes/filebackend/FileBackendTest.php
+share/mediawiki/tests/phpunit/includes/filerepo/FileRepoTest.php
+share/mediawiki/tests/phpunit/includes/filerepo/StoreBatchTest.php
+share/mediawiki/tests/phpunit/includes/installer/InstallDocFormatterTest.php
+share/mediawiki/tests/phpunit/includes/jobqueue/JobQueueTest.php
+share/mediawiki/tests/phpunit/includes/json/ServicesJsonTest.php
+share/mediawiki/tests/phpunit/includes/libs/CSSJanusTest.php
+share/mediawiki/tests/phpunit/includes/libs/CSSMinTest.php
+share/mediawiki/tests/phpunit/includes/libs/GenericArrayObjectTest.php
+share/mediawiki/tests/phpunit/includes/libs/IEUrlExtensionTest.php
+share/mediawiki/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+share/mediawiki/tests/phpunit/includes/logging/LogFormatterTest.php
+share/mediawiki/tests/phpunit/includes/logging/LogTests.i18n.php
+share/mediawiki/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+share/mediawiki/tests/phpunit/includes/media/BitmapScalingTest.php
+share/mediawiki/tests/phpunit/includes/media/ExifBitmapTest.php
+share/mediawiki/tests/phpunit/includes/media/ExifRotationTest.php
+share/mediawiki/tests/phpunit/includes/media/ExifTest.php
+share/mediawiki/tests/phpunit/includes/media/FormatMetadataTest.php
+share/mediawiki/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+share/mediawiki/tests/phpunit/includes/media/GIFTest.php
+share/mediawiki/tests/phpunit/includes/media/IPTCTest.php
+share/mediawiki/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
+share/mediawiki/tests/phpunit/includes/media/JpegTest.php
+share/mediawiki/tests/phpunit/includes/media/MediaHandlerTest.php
+share/mediawiki/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
+share/mediawiki/tests/phpunit/includes/media/PNGTest.php
+share/mediawiki/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+share/mediawiki/tests/phpunit/includes/media/TiffTest.php
+share/mediawiki/tests/phpunit/includes/media/XMPTest.php
+share/mediawiki/tests/phpunit/includes/media/XMPValidateTest.php
+share/mediawiki/tests/phpunit/includes/normal/CleanUpTest.php
+share/mediawiki/tests/phpunit/includes/objectcache/BagOStuffTest.php
+share/mediawiki/tests/phpunit/includes/parser/MagicVariableTest.php
+share/mediawiki/tests/phpunit/includes/parser/MediaWikiParserTest.php
+share/mediawiki/tests/phpunit/includes/parser/NewParserTest.php
+share/mediawiki/tests/phpunit/includes/parser/ParserMethodsTest.php
+share/mediawiki/tests/phpunit/includes/parser/ParserOutputTest.php
+share/mediawiki/tests/phpunit/includes/parser/ParserPreloadTest.php
+share/mediawiki/tests/phpunit/includes/parser/PreprocessorTest.php
+share/mediawiki/tests/phpunit/includes/parser/TagHooksTest.php
+share/mediawiki/tests/phpunit/includes/search/SearchEngineTest.php
+share/mediawiki/tests/phpunit/includes/search/SearchUpdateTest.php
+share/mediawiki/tests/phpunit/includes/site/MediaWikiSiteTest.php
+share/mediawiki/tests/phpunit/includes/site/SiteListTest.php
+share/mediawiki/tests/phpunit/includes/site/SiteSQLStoreTest.php
+share/mediawiki/tests/phpunit/includes/site/SiteTest.php
+share/mediawiki/tests/phpunit/includes/site/TestSites.php
+share/mediawiki/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+share/mediawiki/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+share/mediawiki/tests/phpunit/includes/specials/SpecialSearchTest.php
+share/mediawiki/tests/phpunit/includes/upload/UploadFromUrlTest.php
+share/mediawiki/tests/phpunit/includes/upload/UploadStashTest.php
+share/mediawiki/tests/phpunit/includes/upload/UploadTest.php
+share/mediawiki/tests/phpunit/install-phpunit.sh
+share/mediawiki/tests/phpunit/languages/LanguageAmTest.php
+share/mediawiki/tests/phpunit/languages/LanguageArTest.php
+share/mediawiki/tests/phpunit/languages/LanguageBeTest.php
+share/mediawiki/tests/phpunit/languages/LanguageBe_taraskTest.php
+share/mediawiki/tests/phpunit/languages/LanguageBhoTest.php
+share/mediawiki/tests/phpunit/languages/LanguageBsTest.php
+share/mediawiki/tests/phpunit/languages/LanguageClassesTestCase.php
+share/mediawiki/tests/phpunit/languages/LanguageCsTest.php
+share/mediawiki/tests/phpunit/languages/LanguageCuTest.php
+share/mediawiki/tests/phpunit/languages/LanguageCyTest.php
+share/mediawiki/tests/phpunit/languages/LanguageDsbTest.php
+share/mediawiki/tests/phpunit/languages/LanguageFrTest.php
+share/mediawiki/tests/phpunit/languages/LanguageGaTest.php
+share/mediawiki/tests/phpunit/languages/LanguageGdTest.php
+share/mediawiki/tests/phpunit/languages/LanguageGvTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHeTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHiTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHrTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHsbTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHuTest.php
+share/mediawiki/tests/phpunit/languages/LanguageHyTest.php
+share/mediawiki/tests/phpunit/languages/LanguageKshTest.php
+share/mediawiki/tests/phpunit/languages/LanguageLnTest.php
+share/mediawiki/tests/phpunit/languages/LanguageLtTest.php
+share/mediawiki/tests/phpunit/languages/LanguageLvTest.php
+share/mediawiki/tests/phpunit/languages/LanguageMgTest.php
+share/mediawiki/tests/phpunit/languages/LanguageMkTest.php
+share/mediawiki/tests/phpunit/languages/LanguageMlTest.php
+share/mediawiki/tests/phpunit/languages/LanguageMoTest.php
+share/mediawiki/tests/phpunit/languages/LanguageMtTest.php
+share/mediawiki/tests/phpunit/languages/LanguageNlTest.php
+share/mediawiki/tests/phpunit/languages/LanguageNsoTest.php
+share/mediawiki/tests/phpunit/languages/LanguagePlTest.php
+share/mediawiki/tests/phpunit/languages/LanguageRoTest.php
+share/mediawiki/tests/phpunit/languages/LanguageRuTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSeTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSgsTest.php
+share/mediawiki/tests/phpunit/languages/LanguageShTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSkTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSlTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSmaTest.php
+share/mediawiki/tests/phpunit/languages/LanguageSrTest.php
+share/mediawiki/tests/phpunit/languages/LanguageTest.php
+share/mediawiki/tests/phpunit/languages/LanguageTiTest.php
+share/mediawiki/tests/phpunit/languages/LanguageTlTest.php
+share/mediawiki/tests/phpunit/languages/LanguageTrTest.php
+share/mediawiki/tests/phpunit/languages/LanguageUkTest.php
+share/mediawiki/tests/phpunit/languages/LanguageUzTest.php
+share/mediawiki/tests/phpunit/languages/LanguageWaTest.php
+share/mediawiki/tests/phpunit/languages/utils/CLDRPluralRuleEvaluatorTest.php
+share/mediawiki/tests/phpunit/maintenance/DumpTestCase.php
+share/mediawiki/tests/phpunit/maintenance/MaintenanceTest.php
+share/mediawiki/tests/phpunit/maintenance/backupPrefetchTest.php
+share/mediawiki/tests/phpunit/maintenance/backupTextPassTest.php
+share/mediawiki/tests/phpunit/maintenance/backup_LogTest.php
+share/mediawiki/tests/phpunit/maintenance/backup_PageTest.php
+share/mediawiki/tests/phpunit/maintenance/fetchTextTest.php
+share/mediawiki/tests/phpunit/maintenance/getSlaveServerTest.php
+share/mediawiki/tests/phpunit/phpunit.php
+share/mediawiki/tests/phpunit/resources/ResourcesTest.php
+share/mediawiki/tests/phpunit/run-tests.bat
+share/mediawiki/tests/phpunit/skins/SideBarTest.php
+share/mediawiki/tests/phpunit/suite.xml
+share/mediawiki/tests/phpunit/suites/ExtensionsTestSuite.php
+share/mediawiki/tests/phpunit/suites/UploadFromUrlTestSuite.php
+share/mediawiki/tests/qunit/.htaccess
+share/mediawiki/tests/qunit/QUnitTestResources.php
+share/mediawiki/tests/qunit/data/callMwLoaderTestCallback.js
+share/mediawiki/tests/qunit/data/generateJqueryMsgData.php
+share/mediawiki/tests/qunit/data/load.mock.php
+share/mediawiki/tests/qunit/data/mediawiki.jqueryMsg.data.js
+share/mediawiki/tests/qunit/data/qunitOkCall.js
+share/mediawiki/tests/qunit/data/styleTest.css.php
+share/mediawiki/tests/qunit/data/testrunner.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.client.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.localize.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+share/mediawiki/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+share/mediawiki/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+share/mediawiki/tests/selenium/Selenium.php
+share/mediawiki/tests/selenium/SeleniumConfig.php
+share/mediawiki/tests/selenium/SeleniumLoader.php
+share/mediawiki/tests/selenium/SeleniumServerManager.php
+share/mediawiki/tests/selenium/SeleniumTestCase.php
+share/mediawiki/tests/selenium/SeleniumTestConsoleLogger.php
+share/mediawiki/tests/selenium/SeleniumTestConstants.php
+share/mediawiki/tests/selenium/SeleniumTestHTMLLogger.php
+share/mediawiki/tests/selenium/SeleniumTestListener.php
+share/mediawiki/tests/selenium/SeleniumTestSuite.php
+share/mediawiki/tests/selenium/data/SimpleSeleniumTestDB.sql
+share/mediawiki/tests/selenium/data/SimpleSeleniumTestImages.zip
+share/mediawiki/tests/selenium/data/Wikipedia-logo-v2-de.png
+share/mediawiki/tests/selenium/data/mediawiki118_fresh_installation.sql
+share/mediawiki/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiInstallationCommonFunction.php
+share/mediawiki/tests/selenium/installer/MediaWikiInstallationConfig.php
+share/mediawiki/tests/selenium/installer/MediaWikiInstallationMessage.php
+share/mediawiki/tests/selenium/installer/MediaWikiInstallationVariables.php
+share/mediawiki/tests/selenium/installer/MediaWikiInstallerTestSuite.php
+share/mediawiki/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
+share/mediawiki/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
+share/mediawiki/tests/selenium/installer/README.txt
+share/mediawiki/tests/selenium/selenium_settings.ini.sample
+share/mediawiki/tests/selenium/selenium_settings_grid.ini.sample
+share/mediawiki/tests/selenium/suites/AddContentToNewPageTestCase.php
+share/mediawiki/tests/selenium/suites/AddNewPageTestCase.php
+share/mediawiki/tests/selenium/suites/CreateAccountTestCase.php
+share/mediawiki/tests/selenium/suites/DeletePageAdminTestCase.php
+share/mediawiki/tests/selenium/suites/EmailPasswordTestCase.php
+share/mediawiki/tests/selenium/suites/MediaWikiEditorConfig.php
+share/mediawiki/tests/selenium/suites/MediaWikiEditorTestSuite.php
+share/mediawiki/tests/selenium/suites/MediaWikiExtraTestSuite.php
+share/mediawiki/tests/selenium/suites/MediawikiCoreSmokeTestCase.php
+share/mediawiki/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php
+share/mediawiki/tests/selenium/suites/MovePageTestCase.php
+share/mediawiki/tests/selenium/suites/MyContributionsTestCase.php
+share/mediawiki/tests/selenium/suites/MyWatchListTestCase.php
+share/mediawiki/tests/selenium/suites/PageDeleteTestSuite.php
+share/mediawiki/tests/selenium/suites/PageSearchTestCase.php
+share/mediawiki/tests/selenium/suites/PreviewPageTestCase.php
+share/mediawiki/tests/selenium/suites/SavePageTestCase.php
+share/mediawiki/tests/selenium/suites/SimpleSeleniumConfig.php
+share/mediawiki/tests/selenium/suites/SimpleSeleniumTestCase.php
+share/mediawiki/tests/selenium/suites/SimpleSeleniumTestSuite.php
+share/mediawiki/tests/selenium/suites/UserPreferencesTestCase.php
+share/mediawiki/tests/testHelpers.inc
 share/mediawiki/thumb.php
 share/mediawiki/thumb.php5
 share/mediawiki/thumb_handler.php
 share/mediawiki/thumb_handler.php5
-share/mediawiki/tmp.sh
 share/mediawiki/wiki.phtml
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index b274d430294..840e48c1ea4 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2013/06/08 07:26:53 wen Exp $
+$NetBSD: distinfo,v 1.22.2.1 2013/09/13 12:37:37 tron Exp $
 
-SHA1 (mediawiki-1.21.1.tar.gz) = 28d628f03d64f662b4ef66b6c205629ce421971a
-RMD160 (mediawiki-1.21.1.tar.gz) = 93ec3d32ed77cf33cd21580d3c33a652b08c1737
-Size (mediawiki-1.21.1.tar.gz) = 19601292 bytes
+SHA1 (mediawiki-1.21.2.tar.gz) = 145ba6cdeb860e2b399c19613a20515d0ed2ae09
+RMD160 (mediawiki-1.21.2.tar.gz) = 6e0c753598fa50ed55dea6d24d4f0b36e10a4dfb
+Size (mediawiki-1.21.2.tar.gz) = 20426538 bytes