Update to 1.18.1

Upstream changes:
MediaWiki 1.28.1
Changes since 1.28.0

    $wgRunJobsAsync is now false by default (T142751). This change only affects wikis with $wgJobRunRate > 0.
    Fix fatal from "WaitConditionLoop" not being found, experienced when a wiki has more than one database server setup.
    (T152717) Better escaping for PHP mail() command
    (T154670) A missing method causing the MySQL installer to fatal in rare circumstances was restored.
    (T154672) Un-deprecate ArticleAfterFetchContentObject hook.
    (T158766) Avoid SQL error on MSSQL when using selectRowCount()
    (T145635) Fix too long index error when installing with MSSQL
    (T156184) $wgRawHtml will no longer apply to internationalization messages.
    (T160519) CACHE_ANYTHING will not be CACHE_ACCEL if no accelerator is installed.
    (T154872) Fix incorrect ar_usertext_timestamp index names in new 1.28 installs.
    (T109140) (T122209) SECURITY: Special:UserLogin and Special:Search allow redirect to interwiki links.
    (T144845) SECURITY: XSS in SearchHighlighter::highlightText() when $wgAdvancedSearchHighlighting is true.
    (T125177) SECURITY: API parameters may now be marked as "sensitive" to keep their values out of the logs.
    (T150044) SECURITY: "Mark all pages visited" on the watchlist now requires a CSRF token.
    (T156184) SECURITY: Escape content model/format url parameter in message.
    (T151735) SECURITY: SVG filter evasion using default attribute values in DTD declaration.
    (T161453) SECURITY: LocalisationCache will no longer use the temporary directory in it's fallback chain when trying to work out where to write the cache.
    (T48143) SECURITY: Spam blacklist ineffective on encoded URLs inside file inclusion syntax's link parameter.

3 files changed, 14 insertions, 9 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index d47c743eb82..5321d9fa9e0 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2017/04/05 12:33:49 fhajny Exp $
+# $NetBSD: Makefile,v 1.64 2017/04/09 01:26:46 wen Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://releases.wikimedia.org/mediawiki/${VER}/
 
@@ -23,7 +22,7 @@ INSTALLATION_DIRS=	${EGDIR} share/mediawiki
 .include "options.mk"
 
 VER=			1.28
-PVER=			0
+PVER=			1
 
 APACHE_USER?=		www
 APACHE_GROUP?=		www
diff --git a/www/mediawiki/PLIST b/www/mediawiki/PLIST
index 45ff5b8c4e7..a7e2fd40a59 100644
--- a/www/mediawiki/PLIST
+++ b/www/mediawiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/12/03 03:06:50 wen Exp $
+@comment $NetBSD: PLIST,v 1.31 2017/04/09 01:26:46 wen Exp $
 share/examples/mediawiki/mediawiki.conf
 share/mediawiki/.stylelintrc
 share/mediawiki/COPYING
@@ -5242,6 +5242,7 @@ share/mediawiki/includes/specials/SpecialExport.php
 share/mediawiki/includes/specials/SpecialFewestrevisions.php
 share/mediawiki/includes/specials/SpecialFileDuplicateSearch.php
 share/mediawiki/includes/specials/SpecialFilepath.php
+share/mediawiki/includes/specials/SpecialGoToInterwiki.php
 share/mediawiki/includes/specials/SpecialImport.php
 share/mediawiki/includes/specials/SpecialJavaScriptTest.php
 share/mediawiki/includes/specials/SpecialLinkAccounts.php
@@ -5543,6 +5544,7 @@ share/mediawiki/languages/i18n/eml.json
 share/mediawiki/languages/i18n/en-ca.json
 share/mediawiki/languages/i18n/en-gb.json
 share/mediawiki/languages/i18n/en.json
+share/mediawiki/languages/i18n/en.json.rej
 share/mediawiki/languages/i18n/eo.json
 share/mediawiki/languages/i18n/es.json
 share/mediawiki/languages/i18n/et.json
@@ -5722,6 +5724,7 @@ share/mediawiki/languages/i18n/ps.json
 share/mediawiki/languages/i18n/pt-br.json
 share/mediawiki/languages/i18n/pt.json
 share/mediawiki/languages/i18n/qqq.json
+share/mediawiki/languages/i18n/qqq.json.rej
 share/mediawiki/languages/i18n/qu.json
 share/mediawiki/languages/i18n/qug.json
 share/mediawiki/languages/i18n/rgn.json
@@ -6313,6 +6316,7 @@ share/mediawiki/maintenance/archives/patch-rc_user_text-index.sql
 share/mediawiki/maintenance/archives/patch-rd_interwiki.sql
 share/mediawiki/maintenance/archives/patch-recentchanges-utindex.sql
 share/mediawiki/maintenance/archives/patch-redirect.sql
+share/mediawiki/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
 share/mediawiki/maintenance/archives/patch-rename-iwl_prefix.sql
 share/mediawiki/maintenance/archives/patch-rename-user_groups-and_rights.sql
 share/mediawiki/maintenance/archives/patch-rev_deleted.sql
@@ -6529,6 +6533,7 @@ share/mediawiki/maintenance/migrateUserGroup.php
 share/mediawiki/maintenance/minify.php
 share/mediawiki/maintenance/moveBatch.php
 share/mediawiki/maintenance/mssql/archives/patch-add-cl_collation_ext_index.sql
+share/mediawiki/maintenance/mssql/archives/patch-alter-table-oldimage.sql
 share/mediawiki/maintenance/mssql/archives/patch-archive-drop-fks.sql
 share/mediawiki/maintenance/mssql/archives/patch-bot_passwords.sql
 share/mediawiki/maintenance/mssql/archives/patch-categorylinks-constraints.sql
@@ -11378,6 +11383,7 @@ share/mediawiki/tests/phpunit/includes/media/TiffTest.php
 share/mediawiki/tests/phpunit/includes/media/WebPTest.php
 share/mediawiki/tests/phpunit/includes/media/XCFTest.php
 share/mediawiki/tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php
+share/mediawiki/tests/phpunit/includes/objectcache/ObjectCacheTest.php
 share/mediawiki/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
 share/mediawiki/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
 share/mediawiki/tests/phpunit/includes/page/ArticleTablesTest.php
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 5df7e500678..4d942cd37b1 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.48 2016/12/03 03:06:50 wen Exp $
+$NetBSD: distinfo,v 1.49 2017/04/09 01:26:46 wen Exp $
 
-SHA1 (mediawiki-1.28.0.tar.gz) = 72da503c40e1b9c6ad1a636902f0a2bb10830bc6
-RMD160 (mediawiki-1.28.0.tar.gz) = 9870fc5aa6e68c1659f4d191429f1d066bfd7d16
-SHA512 (mediawiki-1.28.0.tar.gz) = ff118b0a2229265be4b5d461d25d8df48faf5d1b1911aa76fa1ed2dffab0f41030df6b1ae61aad050916606fba81f90f5437b65631786c95ebfd273b331cbc27
-Size (mediawiki-1.28.0.tar.gz) = 32952240 bytes
+SHA1 (mediawiki-1.28.1.tar.gz) = ad9c013bff14fede90ebddf2b49bf7c1670710bf
+RMD160 (mediawiki-1.28.1.tar.gz) = e980993d8ec89a2aed2fedfd61d81bf3ed718bce
+SHA512 (mediawiki-1.28.1.tar.gz) = 5b422ed628643a9a575a53133e3626374ea81b0efaddb578c8ae9f90ac3bb4da4903bf983daca1db6c8dfa5da53c20163836edbb80b7476f20d18abe3946fb3d
+Size (mediawiki-1.28.1.tar.gz) = 32965341 bytes