Security update to version 4.6.1.

WordPress versions 4.6 and earlier are affected by two security issues:
a cross-site scripting vulnerability via image filename, reported by SumOfPwn
researcher Cengiz Han Sahin; and a path traversal vulnerability in the upgrade
package uploader, reported by Dominik Schilling from the WordPress security
team.

WordPress 4.6.1 also fixes 15 bugs from Version 4.6, including:

Bootstrap/Load

#37680 – PHP Warning: ini_get_all() has been disabled for security reasons

- Database
#37683 – $collate and $charset can be undefined in wpdb::init_charset()
#37689 – Issues with utf8mb4 collation and the 4.6 update

- Editor
#37690 – Backspace causes jumping

- Email
#37736 – Emails fail on certain server setups

- External Libraries
#37700 – Warning: curl_exec() has been disabled for security reasons (Requests library)
#37720 – The minified version of the Masonry shim was not updated in #37666 (Masonry library)

- HTTP API
#37733 – cURL error 3: malformed for remote requests
#37768 – HTTP API no longer accepts integer and float values for the cookies argument

- Post Thumbnails
#37697 – Strange behavior with thumbnails on preview in 4.6

- Script Loader
#37800 – Close “link rel” dns-prefetch tag

- Taxonomy
#37721 – Improve error handling of is_object_in_term in taxonomy.php

- Themes
#37755 – Visual Editor: Weird unicode (Vietnamese) characters display on WordPress 4.6

- TinyMCE
#37760 – Problem with RTL

- Upgrade/Install
#37731 – Infinite loop in _wp_json_sanity_check() during plugin install

3 files changed, 9 insertions, 9 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 92d9809d304..ee814da2534 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2016/08/22 18:12:25 morr Exp $
+# $NetBSD: Makefile,v 1.60 2016/09/29 18:02:09 morr Exp $
 
 DISTNAME=		wordpress-${VERSION}
-VERSION=		4.6
-PKGREVISION=		1
+VERSION=		4.6.1
 CATEGORIES=		www
 MASTER_SITES=		http://wordpress.org/
 
diff --git a/www/wordpress/PLIST b/www/wordpress/PLIST
index 9a5c1a97381..36bf8ca3758 100644
--- a/www/wordpress/PLIST
+++ b/www/wordpress/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/08/22 18:11:04 morr Exp $
+@comment $NetBSD: PLIST,v 1.31 2016/09/29 18:02:09 morr Exp $
 share/doc/wordpress/license.txt
 share/doc/wordpress/readme.html
 share/examples/wordpress/wordpress.conf
@@ -521,6 +521,7 @@ share/wordpress/wp-content/plugins/akismet/_inc/form.js
 share/wordpress/wp-content/plugins/akismet/_inc/img/logo-full-2x.png
 share/wordpress/wp-content/plugins/akismet/akismet.php
 share/wordpress/wp-content/plugins/akismet/class.akismet-admin.php
+share/wordpress/wp-content/plugins/akismet/class.akismet-cli.php
 share/wordpress/wp-content/plugins/akismet/class.akismet-widget.php
 share/wordpress/wp-content/plugins/akismet/class.akismet.php
 share/wordpress/wp-content/plugins/akismet/index.php
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index 5737e31aa35..d4b8f131252 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.49 2016/08/21 20:04:57 jklos Exp $
+$NetBSD: distinfo,v 1.50 2016/09/29 18:02:09 morr Exp $
 
-SHA1 (wordpress-4.6.tar.gz) = 830962689f350e43cd1a069f3a4f68a44c0339c8
-RMD160 (wordpress-4.6.tar.gz) = 8b8c2ea20d1683294c99d5765072a9c94f17eac5
-SHA512 (wordpress-4.6.tar.gz) = b07a3ee677b68337342ef9e42aa03a4602acd6b1c53df5f6d517db740ea62344eed03a2a8d1931953de2a99e405b688d2e49bbb654e6ccb3568ff8d8caf30038
-Size (wordpress-4.6.tar.gz) = 7961192 bytes
+SHA1 (wordpress-4.6.1.tar.gz) = 027e065d30a64720624a7404a1820e6c6fff1202
+RMD160 (wordpress-4.6.1.tar.gz) = fb28f4e3a357ce346fe6cbeecf2b56a227716699
+SHA512 (wordpress-4.6.1.tar.gz) = 303c8fe8ec877baf7380677dc22505062613dfc33c03f8858f7c6b9ce7a5825ba00a13395730fa554da9d2b3ccab8c3441e40fbc29fee45f7da44f46aa400981
+Size (wordpress-4.6.1.tar.gz) = 7961036 bytes