Pullup ticket #4234 - requested by morr

www/wordpress: security update

Revisions pulled up:
- www/wordpress/Makefile                                        1.34-1.35
- www/wordpress/PLIST                                           1.16-1.17
- www/wordpress/distinfo                                        1.26-1.27

---
   Module Name:    pkgsrc
   Committed By:   morr
   Date:           Thu Aug  8 07:50:58 UTC 2013

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

   Log Message:
   Update to newest version of Wordpress 3.6.

   ChangeLog:

   New Default Theme - Twenty Thirteen
   * Focus on blogging
   * Single column layout with Sidebar / Widgets in the footer
   * Latest Theme Features support, particularly Post Formats and Semantic Markup
   * Font-based icons (Genericons)

   Admin Enhancements
   * UI improvements on Navigation Menus Screen
   * Revisions revised to be more dynamic and scalable
   * Autosave and Post Locking
   * Preview Audio and Video on Media Edit Screen
   * In-line login following expired sessions

   For Developers
   * External Libraries have been updated.
   * New audio/video APIs give developers access to powerful media metadata, like
   ID3 tags.
   * Filters for revisions, allowing you to set the number of revisions ad hoc
   instead of only via a define.
   * Semantic Markup allows themes to choose improved HTML5 markup for search
   forms, comment forms, and comment lists.
   * Search content for shortcodes with has_shortcode() and adjust shortcode
   attributes with a new filter.

   More info on http://codex.wordpress.org/Version_3.6

---
   Module Name:    pkgsrc
   Committed By:   morr
   Date:           Thu Sep 12 17:19:59 UTC 2013

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

   Log Message:
   This maintenance release addresses 13 bugs with version 3.6.

   Additionally: Version 3.6.1 fixes three security issues:

   * Remote Code Execution: Block unsafe PHP de-serialization that could occur in
   limited situations and setups, which can lead to remote code execution.
   Reported by Tom Van Goethem. CVE-2013-4338.
   * Link Injection / Open Redirect: Fix insufficient input validation that could
   result in redirecting or leading a user to another website.
   Reported by Dave Cummo, a Northrup Grumman subcontractor for the U.S. Centers
   for Disease Control and Prevention. CVE-2013-4339.
   * Privilege Escalation: Prevent a user with an Author role, using a specially
   crafted request, from being able to create a post "written by" another user.
   Reported by Anakorn Kyavatanakij. CVE-2013-4340.

   Additional security hardening:

   * Updated security restrictions around file uploads to mitigate the potential
   for cross-site scripting. The extensions .swf and .exe are no longer allowed
   by default, and .htm and .html are only allowed if the user has the ability
   to use unfiltered HTML.

   More on http://codex.wordpress.org/Version_3.6.1

3 files changed, 126 insertions, 98 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 8ee22250e0a..87e2a7f74bf 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/06/24 16:16:42 morr Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2013/09/13 13:07:27 tron Exp $
 
 DISTNAME=		wordpress-${VERSION}
-VERSION=		3.5.2
+VERSION=		3.6.1
 CATEGORIES=		www
 MASTER_SITES=		http://wordpress.org/
 
diff --git a/www/wordpress/PLIST b/www/wordpress/PLIST
index a73ab6cf1bb..dd8756cb4a1 100644
--- a/www/wordpress/PLIST
+++ b/www/wordpress/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2013/06/27 08:04:57 morr Exp $
+@comment $NetBSD: PLIST,v 1.15.2.1 2013/09/13 13:07:27 tron Exp $
 share/doc/wordpress/license.txt
 share/doc/wordpress/readme.html
 share/examples/wordpress/wordpress.conf
@@ -67,6 +67,8 @@ share/wordpress/wp-admin/images/arrows-dark-2x.png
 share/wordpress/wp-admin/images/arrows-dark-vs-2x.png
 share/wordpress/wp-admin/images/arrows-dark-vs.png
 share/wordpress/wp-admin/images/arrows-dark.png
+share/wordpress/wp-admin/images/arrows-pr-2x.png
+share/wordpress/wp-admin/images/arrows-pr.png
 share/wordpress/wp-admin/images/arrows-vs-2x.png
 share/wordpress/wp-admin/images/arrows-vs.png
 share/wordpress/wp-admin/images/arrows.png
@@ -88,6 +90,8 @@ share/wordpress/wp-admin/images/imgedit-icons.png
 share/wordpress/wp-admin/images/list-2x.png
 share/wordpress/wp-admin/images/list.png
 share/wordpress/wp-admin/images/loading.gif
+share/wordpress/wp-admin/images/lock-2x.png
+share/wordpress/wp-admin/images/lock.png
 share/wordpress/wp-admin/images/marker.png
 share/wordpress/wp-admin/images/mask.png
 share/wordpress/wp-admin/images/media-button-2x.png
@@ -103,16 +107,16 @@ share/wordpress/wp-admin/images/menu-vs-2x.png
 share/wordpress/wp-admin/images/menu-vs.png
 share/wordpress/wp-admin/images/menu.png
 share/wordpress/wp-admin/images/no.png
+share/wordpress/wp-admin/images/post-formats-vs.png
+share/wordpress/wp-admin/images/post-formats.png
+share/wordpress/wp-admin/images/post-formats32-vs.png
+share/wordpress/wp-admin/images/post-formats32.png
 share/wordpress/wp-admin/images/press-this-2x.png
 share/wordpress/wp-admin/images/press-this.png
 share/wordpress/wp-admin/images/resize-2x.gif
 share/wordpress/wp-admin/images/resize-rtl-2x.gif
 share/wordpress/wp-admin/images/resize-rtl.gif
 share/wordpress/wp-admin/images/resize.gif
-share/wordpress/wp-admin/images/screenshots/about-color-picker.png
-share/wordpress/wp-admin/images/screenshots/about-media.png
-share/wordpress/wp-admin/images/screenshots/about-retina.png
-share/wordpress/wp-admin/images/screenshots/about-twenty-twelve.png
 share/wordpress/wp-admin/images/se.png
 share/wordpress/wp-admin/images/sort-2x.gif
 share/wordpress/wp-admin/images/sort.gif
@@ -185,6 +189,7 @@ share/wordpress/wp-admin/includes/nav-menu.php
 share/wordpress/wp-admin/includes/plugin-install.php
 share/wordpress/wp-admin/includes/plugin.php
 share/wordpress/wp-admin/includes/post.php
+share/wordpress/wp-admin/includes/revision.php
 share/wordpress/wp-admin/includes/schema.php
 share/wordpress/wp-admin/includes/screen.php
 share/wordpress/wp-admin/includes/taxonomy.php
@@ -199,10 +204,10 @@ share/wordpress/wp-admin/includes/widgets.php
 share/wordpress/wp-admin/index.php
 share/wordpress/wp-admin/install-helper.php
 share/wordpress/wp-admin/install.php
+share/wordpress/wp-admin/js/accordion.js
+share/wordpress/wp-admin/js/accordion.min.js
 share/wordpress/wp-admin/js/cat.js
 share/wordpress/wp-admin/js/cat.min.js
-share/wordpress/wp-admin/js/categories.js
-share/wordpress/wp-admin/js/categories.min.js
 share/wordpress/wp-admin/js/color-picker.js
 share/wordpress/wp-admin/js/color-picker.min.js
 share/wordpress/wp-admin/js/comment.js
@@ -211,8 +216,6 @@ share/wordpress/wp-admin/js/common.js
 share/wordpress/wp-admin/js/common.min.js
 share/wordpress/wp-admin/js/custom-background.js
 share/wordpress/wp-admin/js/custom-background.min.js
-share/wordpress/wp-admin/js/custom-fields.js
-share/wordpress/wp-admin/js/custom-fields.min.js
 share/wordpress/wp-admin/js/custom-header.js
 share/wordpress/wp-admin/js/customize-controls.js
 share/wordpress/wp-admin/js/customize-controls.min.js
@@ -250,7 +253,8 @@ share/wordpress/wp-admin/js/post.js
 share/wordpress/wp-admin/js/post.min.js
 share/wordpress/wp-admin/js/postbox.js
 share/wordpress/wp-admin/js/postbox.min.js
-share/wordpress/wp-admin/js/revisions-js.php
+share/wordpress/wp-admin/js/revisions.js
+share/wordpress/wp-admin/js/revisions.min.js
 share/wordpress/wp-admin/js/set-post-thumbnail.js
 share/wordpress/wp-admin/js/set-post-thumbnail.min.js
 share/wordpress/wp-admin/js/tags.js
@@ -364,12 +368,13 @@ share/wordpress/wp-admin/widgets.php
 share/wordpress/wp-blog-header.php
 share/wordpress/wp-comments-post.php
 share/wordpress/wp-content/index.php
-share/wordpress/wp-content/plugins/akismet/.htaccess
 share/wordpress/wp-content/plugins/akismet/admin.php
 share/wordpress/wp-content/plugins/akismet/akismet.css
 share/wordpress/wp-content/plugins/akismet/akismet.gif
 share/wordpress/wp-content/plugins/akismet/akismet.js
 share/wordpress/wp-content/plugins/akismet/akismet.php
+share/wordpress/wp-content/plugins/akismet/img/logo.png
+share/wordpress/wp-content/plugins/akismet/img/logo@2x.png
 share/wordpress/wp-content/plugins/akismet/index.php
 share/wordpress/wp-content/plugins/akismet/legacy.php
 share/wordpress/wp-content/plugins/akismet/readme.txt
@@ -378,87 +383,65 @@ share/wordpress/wp-content/plugins/hello.php
 share/wordpress/wp-content/plugins/index.html
 share/wordpress/wp-content/plugins/index.php
 share/wordpress/wp-content/themes/index.php
-share/wordpress/wp-content/themes/twentyeleven/404.php
-share/wordpress/wp-content/themes/twentyeleven/archive.php
-share/wordpress/wp-content/themes/twentyeleven/author.php
-share/wordpress/wp-content/themes/twentyeleven/category.php
-share/wordpress/wp-content/themes/twentyeleven/colors/dark.css
-share/wordpress/wp-content/themes/twentyeleven/comments.php
-share/wordpress/wp-content/themes/twentyeleven/content-aside.php
-share/wordpress/wp-content/themes/twentyeleven/content-featured.php
-share/wordpress/wp-content/themes/twentyeleven/content-gallery.php
-share/wordpress/wp-content/themes/twentyeleven/content-image.php
-share/wordpress/wp-content/themes/twentyeleven/content-intro.php
-share/wordpress/wp-content/themes/twentyeleven/content-link.php
-share/wordpress/wp-content/themes/twentyeleven/content-page.php
-share/wordpress/wp-content/themes/twentyeleven/content-quote.php
-share/wordpress/wp-content/themes/twentyeleven/content-single.php
-share/wordpress/wp-content/themes/twentyeleven/content-status.php
-share/wordpress/wp-content/themes/twentyeleven/content.php
-share/wordpress/wp-content/themes/twentyeleven/editor-style-rtl.css
-share/wordpress/wp-content/themes/twentyeleven/editor-style.css
-share/wordpress/wp-content/themes/twentyeleven/footer.php
-share/wordpress/wp-content/themes/twentyeleven/functions.php
-share/wordpress/wp-content/themes/twentyeleven/header.php
-share/wordpress/wp-content/themes/twentyeleven/image.php
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-bypostauthor-dark-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-bypostauthor-dark.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-bypostauthor-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-bypostauthor.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-dark-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-dark.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-arrow.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-bubble-dark-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-bubble-dark.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-bubble-rtl.png
-share/wordpress/wp-content/themes/twentyeleven/images/comment-bubble.png
-share/wordpress/wp-content/themes/twentyeleven/images/headers/chessboard-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/chessboard.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/hanoi-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/hanoi.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/lanterns-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/lanterns.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/pine-cone-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/pine-cone.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/shore-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/shore.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/trolley-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/trolley.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/wheel-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/wheel.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/willow-thumbnail.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/headers/willow.jpg
-share/wordpress/wp-content/themes/twentyeleven/images/search.png
-share/wordpress/wp-content/themes/twentyeleven/images/wordpress.png
-share/wordpress/wp-content/themes/twentyeleven/inc/images/content-sidebar.png
-share/wordpress/wp-content/themes/twentyeleven/inc/images/content.png
-share/wordpress/wp-content/themes/twentyeleven/inc/images/dark.png
-share/wordpress/wp-content/themes/twentyeleven/inc/images/light.png
-share/wordpress/wp-content/themes/twentyeleven/inc/images/sidebar-content.png
-share/wordpress/wp-content/themes/twentyeleven/inc/theme-customizer.js
-share/wordpress/wp-content/themes/twentyeleven/inc/theme-options.css
-share/wordpress/wp-content/themes/twentyeleven/inc/theme-options.js
-share/wordpress/wp-content/themes/twentyeleven/inc/theme-options.php
-share/wordpress/wp-content/themes/twentyeleven/inc/widgets.php
-share/wordpress/wp-content/themes/twentyeleven/index.php
-share/wordpress/wp-content/themes/twentyeleven/js/html5.js
-share/wordpress/wp-content/themes/twentyeleven/js/showcase.js
-share/wordpress/wp-content/themes/twentyeleven/languages/twentyeleven.pot
-share/wordpress/wp-content/themes/twentyeleven/license.txt
-share/wordpress/wp-content/themes/twentyeleven/page.php
-share/wordpress/wp-content/themes/twentyeleven/readme.txt
-share/wordpress/wp-content/themes/twentyeleven/rtl.css
-share/wordpress/wp-content/themes/twentyeleven/screenshot.png
-share/wordpress/wp-content/themes/twentyeleven/search.php
-share/wordpress/wp-content/themes/twentyeleven/searchform.php
-share/wordpress/wp-content/themes/twentyeleven/showcase.php
-share/wordpress/wp-content/themes/twentyeleven/sidebar-footer.php
-share/wordpress/wp-content/themes/twentyeleven/sidebar-page.php
-share/wordpress/wp-content/themes/twentyeleven/sidebar.php
-share/wordpress/wp-content/themes/twentyeleven/single.php
-share/wordpress/wp-content/themes/twentyeleven/style.css
-share/wordpress/wp-content/themes/twentyeleven/tag.php
+share/wordpress/wp-content/themes/twentythirteen/404.php
+share/wordpress/wp-content/themes/twentythirteen/archive.php
+share/wordpress/wp-content/themes/twentythirteen/author-bio.php
+share/wordpress/wp-content/themes/twentythirteen/author.php
+share/wordpress/wp-content/themes/twentythirteen/category.php
+share/wordpress/wp-content/themes/twentythirteen/comments.php
+share/wordpress/wp-content/themes/twentythirteen/content-aside.php
+share/wordpress/wp-content/themes/twentythirteen/content-audio.php
+share/wordpress/wp-content/themes/twentythirteen/content-chat.php
+share/wordpress/wp-content/themes/twentythirteen/content-gallery.php
+share/wordpress/wp-content/themes/twentythirteen/content-image.php
+share/wordpress/wp-content/themes/twentythirteen/content-link.php
+share/wordpress/wp-content/themes/twentythirteen/content-none.php
+share/wordpress/wp-content/themes/twentythirteen/content-quote.php
+share/wordpress/wp-content/themes/twentythirteen/content-status.php
+share/wordpress/wp-content/themes/twentythirteen/content-video.php
+share/wordpress/wp-content/themes/twentythirteen/content.php
+share/wordpress/wp-content/themes/twentythirteen/css/editor-style.css
+share/wordpress/wp-content/themes/twentythirteen/css/ie.css
+share/wordpress/wp-content/themes/twentythirteen/fonts/COPYING.txt
+share/wordpress/wp-content/themes/twentythirteen/fonts/LICENSE.txt
+share/wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.eot
+share/wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.svg
+share/wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.ttf
+share/wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.woff
+share/wordpress/wp-content/themes/twentythirteen/fonts/genericons.css
+share/wordpress/wp-content/themes/twentythirteen/footer.php
+share/wordpress/wp-content/themes/twentythirteen/functions.php
+share/wordpress/wp-content/themes/twentythirteen/header.php
+share/wordpress/wp-content/themes/twentythirteen/image.php
+share/wordpress/wp-content/themes/twentythirteen/images/dotted-line-2x.png
+share/wordpress/wp-content/themes/twentythirteen/images/dotted-line-light-2x.png
+share/wordpress/wp-content/themes/twentythirteen/images/dotted-line-light.png
+share/wordpress/wp-content/themes/twentythirteen/images/dotted-line.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/circle-thumbnail.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/circle.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/diamond-thumbnail.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/diamond.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/star-thumbnail.png
+share/wordpress/wp-content/themes/twentythirteen/images/headers/star.png
+share/wordpress/wp-content/themes/twentythirteen/images/search-icon-2x.png
+share/wordpress/wp-content/themes/twentythirteen/images/search-icon.png
+share/wordpress/wp-content/themes/twentythirteen/inc/back-compat.php
+share/wordpress/wp-content/themes/twentythirteen/inc/custom-header.php
+share/wordpress/wp-content/themes/twentythirteen/index.php
+share/wordpress/wp-content/themes/twentythirteen/js/functions.js
+share/wordpress/wp-content/themes/twentythirteen/js/html5.js
+share/wordpress/wp-content/themes/twentythirteen/js/theme-customizer.js
+share/wordpress/wp-content/themes/twentythirteen/languages/twentythirteen.pot
+share/wordpress/wp-content/themes/twentythirteen/page.php
+share/wordpress/wp-content/themes/twentythirteen/rtl.css
+share/wordpress/wp-content/themes/twentythirteen/screenshot.png
+share/wordpress/wp-content/themes/twentythirteen/search.php
+share/wordpress/wp-content/themes/twentythirteen/sidebar-main.php
+share/wordpress/wp-content/themes/twentythirteen/sidebar.php
+share/wordpress/wp-content/themes/twentythirteen/single.php
+share/wordpress/wp-content/themes/twentythirteen/style.css
+share/wordpress/wp-content/themes/twentythirteen/tag.php
+share/wordpress/wp-content/themes/twentythirteen/taxonomy-post_format.php
 share/wordpress/wp-content/themes/twentytwelve/404.php
 share/wordpress/wp-content/themes/twentytwelve/archive.php
 share/wordpress/wp-content/themes/twentytwelve/author.php
@@ -497,6 +480,25 @@ share/wordpress/wp-content/themes/twentytwelve/single.php
 share/wordpress/wp-content/themes/twentytwelve/style.css
 share/wordpress/wp-content/themes/twentytwelve/tag.php
 share/wordpress/wp-cron.php
+share/wordpress/wp-includes/ID3/getid3.lib.php
+share/wordpress/wp-includes/ID3/getid3.php
+share/wordpress/wp-includes/ID3/license.commercial.txt
+share/wordpress/wp-includes/ID3/license.txt
+share/wordpress/wp-includes/ID3/module.audio-video.asf.php
+share/wordpress/wp-includes/ID3/module.audio-video.flv.php
+share/wordpress/wp-includes/ID3/module.audio-video.matroska.php
+share/wordpress/wp-includes/ID3/module.audio-video.quicktime.php
+share/wordpress/wp-includes/ID3/module.audio-video.riff.php
+share/wordpress/wp-includes/ID3/module.audio.ac3.php
+share/wordpress/wp-includes/ID3/module.audio.dts.php
+share/wordpress/wp-includes/ID3/module.audio.flac.php
+share/wordpress/wp-includes/ID3/module.audio.mp3.php
+share/wordpress/wp-includes/ID3/module.audio.ogg.php
+share/wordpress/wp-includes/ID3/module.tag.apetag.php
+share/wordpress/wp-includes/ID3/module.tag.id3v1.php
+share/wordpress/wp-includes/ID3/module.tag.id3v2.php
+share/wordpress/wp-includes/ID3/module.tag.lyrics3.php
+share/wordpress/wp-includes/ID3/readme.txt
 share/wordpress/wp-includes/SimplePie/Author.php
 share/wordpress/wp-includes/SimplePie/Cache.php
 share/wordpress/wp-includes/SimplePie/Cache/Base.php
@@ -595,6 +597,8 @@ share/wordpress/wp-includes/css/media-views-rtl.css
 share/wordpress/wp-includes/css/media-views-rtl.min.css
 share/wordpress/wp-includes/css/media-views.css
 share/wordpress/wp-includes/css/media-views.min.css
+share/wordpress/wp-includes/css/wp-auth-check.css
+share/wordpress/wp-includes/css/wp-auth-check.min.css
 share/wordpress/wp-includes/css/wp-pointer.css
 share/wordpress/wp-includes/css/wp-pointer.min.css
 share/wordpress/wp-includes/default-constants.php
@@ -691,6 +695,8 @@ share/wordpress/wp-includes/js/customize-loader.js
 share/wordpress/wp-includes/js/customize-loader.min.js
 share/wordpress/wp-includes/js/customize-preview.js
 share/wordpress/wp-includes/js/customize-preview.min.js
+share/wordpress/wp-includes/js/heartbeat.js
+share/wordpress/wp-includes/js/heartbeat.min.js
 share/wordpress/wp-includes/js/hoverIntent.js
 share/wordpress/wp-includes/js/hoverIntent.min.js
 share/wordpress/wp-includes/js/imgareaselect/border-anim-h.gif
@@ -701,6 +707,8 @@ share/wordpress/wp-includes/js/imgareaselect/jquery.imgareaselect.min.js
 share/wordpress/wp-includes/js/jcrop/Jcrop.gif
 share/wordpress/wp-includes/js/jcrop/jquery.Jcrop.min.css
 share/wordpress/wp-includes/js/jcrop/jquery.Jcrop.min.js
+share/wordpress/wp-includes/js/jquery/jquery-migrate.js
+share/wordpress/wp-includes/js/jquery/jquery-migrate.min.js
 share/wordpress/wp-includes/js/jquery/jquery.color.min.js
 share/wordpress/wp-includes/js/jquery/jquery.form.js
 share/wordpress/wp-includes/js/jquery/jquery.form.min.js
@@ -760,6 +768,18 @@ share/wordpress/wp-includes/js/media-models.js
 share/wordpress/wp-includes/js/media-models.min.js
 share/wordpress/wp-includes/js/media-views.js
 share/wordpress/wp-includes/js/media-views.min.js
+share/wordpress/wp-includes/js/mediaelement/background.png
+share/wordpress/wp-includes/js/mediaelement/bigplay.png
+share/wordpress/wp-includes/js/mediaelement/bigplay.svg
+share/wordpress/wp-includes/js/mediaelement/controls.png
+share/wordpress/wp-includes/js/mediaelement/controls.svg
+share/wordpress/wp-includes/js/mediaelement/flashmediaelement.swf
+share/wordpress/wp-includes/js/mediaelement/loading.gif
+share/wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js
+share/wordpress/wp-includes/js/mediaelement/mediaelementplayer.min.css
+share/wordpress/wp-includes/js/mediaelement/silverlightmediaelement.xap
+share/wordpress/wp-includes/js/mediaelement/wp-mediaelement.css
+share/wordpress/wp-includes/js/mediaelement/wp-mediaelement.js
 share/wordpress/wp-includes/js/plupload/changelog.txt
 share/wordpress/wp-includes/js/plupload/handlers.js
 share/wordpress/wp-includes/js/plupload/handlers.min.js
@@ -955,12 +975,18 @@ share/wordpress/wp-includes/js/utils.js
 share/wordpress/wp-includes/js/utils.min.js
 share/wordpress/wp-includes/js/wp-ajax-response.js
 share/wordpress/wp-includes/js/wp-ajax-response.min.js
+share/wordpress/wp-includes/js/wp-auth-check.js
+share/wordpress/wp-includes/js/wp-auth-check.min.js
+share/wordpress/wp-includes/js/wp-backbone.js
+share/wordpress/wp-includes/js/wp-backbone.min.js
 share/wordpress/wp-includes/js/wp-list-revisions.js
 share/wordpress/wp-includes/js/wp-list-revisions.min.js
 share/wordpress/wp-includes/js/wp-lists.js
 share/wordpress/wp-includes/js/wp-lists.min.js
 share/wordpress/wp-includes/js/wp-pointer.js
 share/wordpress/wp-includes/js/wp-pointer.min.js
+share/wordpress/wp-includes/js/wp-util.js
+share/wordpress/wp-includes/js/wp-util.min.js
 share/wordpress/wp-includes/js/wplink.js
 share/wordpress/wp-includes/js/wplink.min.js
 share/wordpress/wp-includes/kses.php
@@ -990,12 +1016,14 @@ share/wordpress/wp-includes/pomo/mo.php
 share/wordpress/wp-includes/pomo/po.php
 share/wordpress/wp-includes/pomo/streams.php
 share/wordpress/wp-includes/pomo/translations.php
+share/wordpress/wp-includes/post-formats.php
 share/wordpress/wp-includes/post-template.php
 share/wordpress/wp-includes/post-thumbnail-template.php
 share/wordpress/wp-includes/post.php
 share/wordpress/wp-includes/query.php
 share/wordpress/wp-includes/registration-functions.php
 share/wordpress/wp-includes/registration.php
+share/wordpress/wp-includes/revision.php
 share/wordpress/wp-includes/rewrite.php
 share/wordpress/wp-includes/rss-functions.php
 share/wordpress/wp-includes/rss.php
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index d63189f94e2..a9335b63b44 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.25 2013/06/24 16:13:21 morr Exp $
+$NetBSD: distinfo,v 1.25.2.1 2013/09/13 13:07:27 tron Exp $
 
-SHA1 (wordpress-3.5.2.tar.gz) = f75e9aadb1c2f754e89aacdfb5ab72bbfb10678d
-RMD160 (wordpress-3.5.2.tar.gz) = 3fac241bb418350719c0cb4e5e8dfc433bb5ef11
-Size (wordpress-3.5.2.tar.gz) = 4988077 bytes
+SHA1 (wordpress-3.6.1.tar.gz) = a1ad687776a9348e85b9f9603b4d227e433ef697
+RMD160 (wordpress-3.6.1.tar.gz) = 6fdc4f6fb115905b14ff9bb4902839984c395f11
+Size (wordpress-3.6.1.tar.gz) = 4029511 bytes