Security update to version of Wordpress 3.4.1.

ChangeLog:

Wordpress 3.4.1:

* Fixes an issue where a theme’s page templates were sometimes not detected.
* Addresses problems with some category permalink structures.
* Better handling for plugins or themes loading JavaScript incorrectly.
* Adds early support for uploading images on iOS 6 devices.
* Allows for a technique commonly used by plugins to detect a network-wide activation.
* Better compatibility with servers running certain versions of PHP (5.2.4, 5.4)
or with uncommon setups (safe mode, open_basedir), which had caused warnings or
in some cases prevented emails from being sent.

Additionally: Version 3.4.1 fixes a few security issues and contains some security
hardening. These issues were discovered and fixed by the WordPress security team:

* Privilege Escalation/XSS. Critical. Administrators and editors in multisite
were accidentally allowed to use unfiltered_html for 3.4.0.
* CSRF. Additional CSRF protection in the customizer.
* Information Disclosure: Disclosure of post contents to authors and contributors
(such as private or draft posts).
* Hardening: Deprecate wp_explain_nonce(), which could reveal unnecessary information.
* Hardening: Require a child theme to be activated with its intended parent only.

Wordpress 3.4:

* Enhanced theme control
    * Customize theme options before activating a new theme using Theme Customizer
    * Use Theme Previewer to customize current theme without changing the front-end design

* Custom Headers
    * Improved Custom Headers with flexible sizes
    * Selecting Custom Header Images and Custom Background Images from Media Library Screen

* Media improvements
    * Support HTML in image captions

* Under the Hood improvements
    * Improvements in WordPress internationalization and localization (more info)
    * Different split in translation POT files for faster translations
    * Codex XML-RPC information update accessed via XML-RPC_WordPress_API
    * WP_Query improvements

3 files changed, 82 insertions, 37 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 972df7b5055..174ac1acdcf 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/04/25 13:00:37 morr Exp $
+# $NetBSD: Makefile,v 1.26 2012/06/29 10:40:13 morr Exp $
 
 DISTNAME=		wordpress-${VERSION}
-VERSION=		3.3.2
+VERSION=		3.4.1
 CATEGORIES=		www
 MASTER_SITES=		http://wordpress.org/
 
diff --git a/www/wordpress/PLIST b/www/wordpress/PLIST
index 6b30dc26379..84793a2cddb 100644
--- a/www/wordpress/PLIST
+++ b/www/wordpress/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2011/12/14 19:47:45 morr Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/29 10:40:13 morr Exp $
 share/doc/wordpress/license.txt
 share/doc/wordpress/readme.html
 share/examples/wordpress/wordpress.conf
@@ -19,6 +19,10 @@ share/wordpress/wp-admin/css/colors-classic.css
 share/wordpress/wp-admin/css/colors-classic.dev.css
 share/wordpress/wp-admin/css/colors-fresh.css
 share/wordpress/wp-admin/css/colors-fresh.dev.css
+share/wordpress/wp-admin/css/customize-controls-rtl.css
+share/wordpress/wp-admin/css/customize-controls-rtl.dev.css
+share/wordpress/wp-admin/css/customize-controls.css
+share/wordpress/wp-admin/css/customize-controls.dev.css
 share/wordpress/wp-admin/css/farbtastic.css
 share/wordpress/wp-admin/css/ie-rtl.css
 share/wordpress/wp-admin/css/ie-rtl.dev.css
@@ -36,6 +40,7 @@ share/wordpress/wp-admin/css/wp-admin.css
 share/wordpress/wp-admin/css/wp-admin.dev.css
 share/wordpress/wp-admin/custom-background.php
 share/wordpress/wp-admin/custom-header.php
+share/wordpress/wp-admin/customize.php
 share/wordpress/wp-admin/edit-comments.php
 share/wordpress/wp-admin/edit-form-advanced.php
 share/wordpress/wp-admin/edit-form-comment.php
@@ -71,7 +76,8 @@ share/wordpress/wp-admin/images/fav-vs.png
 share/wordpress/wp-admin/images/fav.png
 share/wordpress/wp-admin/images/generic.png
 share/wordpress/wp-admin/images/gray-grad.png
-share/wordpress/wp-admin/images/gray-star.png
+share/wordpress/wp-admin/images/icons32-2x.png
+share/wordpress/wp-admin/images/icons32-vs-2x.png
 share/wordpress/wp-admin/images/icons32-vs.png
 share/wordpress/wp-admin/images/icons32.png
 share/wordpress/wp-admin/images/imgedit-icons.png
@@ -79,7 +85,6 @@ share/wordpress/wp-admin/images/list.png
 share/wordpress/wp-admin/images/loading-publish.gif
 share/wordpress/wp-admin/images/loading.gif
 share/wordpress/wp-admin/images/logo-ghost.png
-share/wordpress/wp-admin/images/logo-login.png
 share/wordpress/wp-admin/images/logo.gif
 share/wordpress/wp-admin/images/marker.png
 share/wordpress/wp-admin/images/mask.png
@@ -88,6 +93,7 @@ share/wordpress/wp-admin/images/media-button-music.gif
 share/wordpress/wp-admin/images/media-button-other.gif
 share/wordpress/wp-admin/images/media-button-video.gif
 share/wordpress/wp-admin/images/media-button.png
+share/wordpress/wp-admin/images/menu-2x.png
 share/wordpress/wp-admin/images/menu-arrow-frame-rtl.png
 share/wordpress/wp-admin/images/menu-arrow-frame.png
 share/wordpress/wp-admin/images/menu-arrows.gif
@@ -110,16 +116,19 @@ share/wordpress/wp-admin/images/resize-rtl.gif
 share/wordpress/wp-admin/images/resize.gif
 share/wordpress/wp-admin/images/screen-options-toggle-vs.gif
 share/wordpress/wp-admin/images/screen-options-toggle.gif
-share/wordpress/wp-admin/images/screenshots/admin-flyouts.png
-share/wordpress/wp-admin/images/screenshots/coediting.png
-share/wordpress/wp-admin/images/screenshots/drag-and-drop.png
-share/wordpress/wp-admin/images/screenshots/help-screen.png
-share/wordpress/wp-admin/images/screenshots/media-icon.png
-share/wordpress/wp-admin/images/screenshots/new-feature-pointer.png
-share/wordpress/wp-admin/images/screenshots/welcome-screen.png
+share/wordpress/wp-admin/images/screenshots/captions-1.png
+share/wordpress/wp-admin/images/screenshots/captions-2.png
+share/wordpress/wp-admin/images/screenshots/flex-header-1.png
+share/wordpress/wp-admin/images/screenshots/flex-header-2.png
+share/wordpress/wp-admin/images/screenshots/flex-header-3.png
+share/wordpress/wp-admin/images/screenshots/flex-header-media-library.png
+share/wordpress/wp-admin/images/screenshots/theme-customizer.png
+share/wordpress/wp-admin/images/screenshots/twitter-embed-1.png
+share/wordpress/wp-admin/images/screenshots/twitter-embed-2.png
 share/wordpress/wp-admin/images/se.png
 share/wordpress/wp-admin/images/sort.gif
-share/wordpress/wp-admin/images/star.png
+share/wordpress/wp-admin/images/stars-rtl.png
+share/wordpress/wp-admin/images/stars.png
 share/wordpress/wp-admin/images/toggle-arrow-rtl.gif
 share/wordpress/wp-admin/images/toggle-arrow.gif
 share/wordpress/wp-admin/images/upload-classic.png
@@ -129,7 +138,9 @@ share/wordpress/wp-admin/images/white-grad-active.png
 share/wordpress/wp-admin/images/white-grad.png
 share/wordpress/wp-admin/images/widgets-arrow-vs.gif
 share/wordpress/wp-admin/images/widgets-arrow.gif
+share/wordpress/wp-admin/images/wordpress-logo-2x.png
 share/wordpress/wp-admin/images/wordpress-logo.png
+share/wordpress/wp-admin/images/wp-badge-2x.png
 share/wordpress/wp-admin/images/wp-badge.png
 share/wordpress/wp-admin/images/wp-logo-vs.png
 share/wordpress/wp-admin/images/wp-logo.png
@@ -139,6 +150,7 @@ share/wordpress/wp-admin/images/xit.gif
 share/wordpress/wp-admin/images/yes.png
 share/wordpress/wp-admin/import.php
 share/wordpress/wp-admin/includes/admin.php
+share/wordpress/wp-admin/includes/ajax-actions.php
 share/wordpress/wp-admin/includes/bookmark.php
 share/wordpress/wp-admin/includes/class-ftp-pure.php
 share/wordpress/wp-admin/includes/class-ftp-sockets.php
@@ -197,7 +209,6 @@ share/wordpress/wp-admin/includes/update.php
 share/wordpress/wp-admin/includes/upgrade.php
 share/wordpress/wp-admin/includes/user.php
 share/wordpress/wp-admin/includes/widgets.php
-share/wordpress/wp-admin/index-extra.php
 share/wordpress/wp-admin/index.php
 share/wordpress/wp-admin/install-helper.php
 share/wordpress/wp-admin/install.php
@@ -213,6 +224,8 @@ share/wordpress/wp-admin/js/custom-background.dev.js
 share/wordpress/wp-admin/js/custom-background.js
 share/wordpress/wp-admin/js/custom-fields.dev.js
 share/wordpress/wp-admin/js/custom-fields.js
+share/wordpress/wp-admin/js/customize-controls.dev.js
+share/wordpress/wp-admin/js/customize-controls.js
 share/wordpress/wp-admin/js/dashboard.dev.js
 share/wordpress/wp-admin/js/dashboard.js
 share/wordpress/wp-admin/js/edit-comments.dev.js
@@ -230,6 +243,8 @@ share/wordpress/wp-admin/js/inline-edit-tax.dev.js
 share/wordpress/wp-admin/js/inline-edit-tax.js
 share/wordpress/wp-admin/js/link.dev.js
 share/wordpress/wp-admin/js/link.js
+share/wordpress/wp-admin/js/media-gallery.dev.js
+share/wordpress/wp-admin/js/media-gallery.js
 share/wordpress/wp-admin/js/media-upload.dev.js
 share/wordpress/wp-admin/js/media-upload.js
 share/wordpress/wp-admin/js/media.dev.js
@@ -255,6 +270,8 @@ share/wordpress/wp-admin/js/theme.dev.js
 share/wordpress/wp-admin/js/theme.js
 share/wordpress/wp-admin/js/user-profile.dev.js
 share/wordpress/wp-admin/js/user-profile.js
+share/wordpress/wp-admin/js/user-suggest.dev.js
+share/wordpress/wp-admin/js/user-suggest.js
 share/wordpress/wp-admin/js/utils.dev.js
 share/wordpress/wp-admin/js/utils.js
 share/wordpress/wp-admin/js/widgets.dev.js
@@ -289,9 +306,11 @@ share/wordpress/wp-admin/ms-users.php
 share/wordpress/wp-admin/my-sites.php
 share/wordpress/wp-admin/nav-menus.php
 share/wordpress/wp-admin/network.php
+share/wordpress/wp-admin/network/about.php
 share/wordpress/wp-admin/network/admin.php
+share/wordpress/wp-admin/network/credits.php
 share/wordpress/wp-admin/network/edit.php
-share/wordpress/wp-admin/network/index-extra.php
+share/wordpress/wp-admin/network/freedoms.php
 share/wordpress/wp-admin/network/index.php
 share/wordpress/wp-admin/network/menu.php
 share/wordpress/wp-admin/network/plugin-editor.php
@@ -344,8 +363,10 @@ share/wordpress/wp-admin/upgrade.php
 share/wordpress/wp-admin/upload.php
 share/wordpress/wp-admin/user-edit.php
 share/wordpress/wp-admin/user-new.php
+share/wordpress/wp-admin/user/about.php
 share/wordpress/wp-admin/user/admin.php
-share/wordpress/wp-admin/user/index-extra.php
+share/wordpress/wp-admin/user/credits.php
+share/wordpress/wp-admin/user/freedoms.php
 share/wordpress/wp-admin/user/index.php
 share/wordpress/wp-admin/user/menu.php
 share/wordpress/wp-admin/user/profile.php
@@ -361,6 +382,7 @@ 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/index.php
 share/wordpress/wp-content/plugins/akismet/legacy.php
 share/wordpress/wp-content/plugins/akismet/readme.txt
 share/wordpress/wp-content/plugins/akismet/widget.php
@@ -426,6 +448,7 @@ 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
@@ -524,9 +547,15 @@ share/wordpress/wp-includes/class-smtp.php
 share/wordpress/wp-includes/class-snoopy.php
 share/wordpress/wp-includes/class-wp-admin-bar.php
 share/wordpress/wp-includes/class-wp-ajax-response.php
+share/wordpress/wp-includes/class-wp-atom-server.php
+share/wordpress/wp-includes/class-wp-customize-control.php
+share/wordpress/wp-includes/class-wp-customize-manager.php
+share/wordpress/wp-includes/class-wp-customize-section.php
+share/wordpress/wp-includes/class-wp-customize-setting.php
 share/wordpress/wp-includes/class-wp-editor.php
 share/wordpress/wp-includes/class-wp-error.php
 share/wordpress/wp-includes/class-wp-http-ixr-client.php
+share/wordpress/wp-includes/class-wp-theme.php
 share/wordpress/wp-includes/class-wp-walker.php
 share/wordpress/wp-includes/class-wp-xmlrpc-server.php
 share/wordpress/wp-includes/class-wp.php
@@ -541,8 +570,8 @@ share/wordpress/wp-includes/css/admin-bar-rtl.css
 share/wordpress/wp-includes/css/admin-bar-rtl.dev.css
 share/wordpress/wp-includes/css/admin-bar.css
 share/wordpress/wp-includes/css/admin-bar.dev.css
-share/wordpress/wp-includes/css/editor-buttons.css
-share/wordpress/wp-includes/css/editor-buttons.dev.css
+share/wordpress/wp-includes/css/editor.css
+share/wordpress/wp-includes/css/editor.dev.css
 share/wordpress/wp-includes/css/jquery-ui-dialog.css
 share/wordpress/wp-includes/css/jquery-ui-dialog.dev.css
 share/wordpress/wp-includes/css/wp-pointer.css
@@ -564,6 +593,7 @@ share/wordpress/wp-includes/functions.wp-scripts.php
 share/wordpress/wp-includes/functions.wp-styles.php
 share/wordpress/wp-includes/general-template.php
 share/wordpress/wp-includes/http.php
+share/wordpress/wp-includes/images/admin-bar-sprite-2x.png
 share/wordpress/wp-includes/images/admin-bar-sprite.png
 share/wordpress/wp-includes/images/arrow-pointer-blue.png
 share/wordpress/wp-includes/images/blank.gif
@@ -622,6 +652,12 @@ share/wordpress/wp-includes/js/crop/cropper.css
 share/wordpress/wp-includes/js/crop/cropper.js
 share/wordpress/wp-includes/js/crop/marqueeHoriz.gif
 share/wordpress/wp-includes/js/crop/marqueeVert.gif
+share/wordpress/wp-includes/js/customize-base.dev.js
+share/wordpress/wp-includes/js/customize-base.js
+share/wordpress/wp-includes/js/customize-loader.dev.js
+share/wordpress/wp-includes/js/customize-loader.js
+share/wordpress/wp-includes/js/customize-preview.dev.js
+share/wordpress/wp-includes/js/customize-preview.js
 share/wordpress/wp-includes/js/hoverIntent.dev.js
 share/wordpress/wp-includes/js/hoverIntent.js
 share/wordpress/wp-includes/js/imgareaselect/border-anim-h.gif
@@ -645,6 +681,7 @@ share/wordpress/wp-includes/js/jquery/jquery.schedule.js
 share/wordpress/wp-includes/js/jquery/jquery.serialize-object.js
 share/wordpress/wp-includes/js/jquery/jquery.table-hotkeys.dev.js
 share/wordpress/wp-includes/js/jquery/jquery.table-hotkeys.js
+share/wordpress/wp-includes/js/jquery/jquery.ui.touch-punch.js
 share/wordpress/wp-includes/js/jquery/suggest.dev.js
 share/wordpress/wp-includes/js/jquery/suggest.js
 share/wordpress/wp-includes/js/jquery/ui/jquery.effects.blind.min.js
@@ -691,6 +728,8 @@ share/wordpress/wp-includes/js/plupload/plupload.html5.js
 share/wordpress/wp-includes/js/plupload/plupload.js
 share/wordpress/wp-includes/js/plupload/plupload.silverlight.js
 share/wordpress/wp-includes/js/plupload/plupload.silverlight.xap
+share/wordpress/wp-includes/js/plupload/wp-plupload.dev.js
+share/wordpress/wp-includes/js/plupload/wp-plupload.js
 share/wordpress/wp-includes/js/prototype.js
 share/wordpress/wp-includes/js/quicktags.dev.js
 share/wordpress/wp-includes/js/quicktags.js
@@ -723,10 +762,14 @@ share/wordpress/wp-includes/js/thickbox/thickbox.js
 share/wordpress/wp-includes/js/tinymce/langs/wp-langs-en.js
 share/wordpress/wp-includes/js/tinymce/langs/wp-langs.php
 share/wordpress/wp-includes/js/tinymce/license.txt
+share/wordpress/wp-includes/js/tinymce/mark_loaded_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
 share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
 share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
 share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
@@ -739,12 +782,13 @@ share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/wi
 share/wordpress/wp-includes/js/tinymce/plugins/inlinepopups/template.htm
 share/wordpress/wp-includes/js/tinymce/plugins/media/css/media.css
 share/wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/media/js/embed.js
 share/wordpress/wp-includes/js/tinymce/plugins/media/js/media.js
 share/wordpress/wp-includes/js/tinymce/plugins/media/media.htm
 share/wordpress/wp-includes/js/tinymce/plugins/media/moxieplayer.swf
-share/wordpress/wp-includes/js/tinymce/plugins/paste/blank.htm
 share/wordpress/wp-includes/js/tinymce/plugins/paste/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/paste/js/pastetext.js
 share/wordpress/wp-includes/js/tinymce/plugins/paste/js/pasteword.js
 share/wordpress/wp-includes/js/tinymce/plugins/paste/pastetext.htm
@@ -760,53 +804,50 @@ share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/Logger
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/config.php
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/css/content.css
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/includes/general.php
 share/wordpress/wp-includes/js/tinymce/plugins/spellchecker/rpc.php
 share/wordpress/wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js
-share/wordpress/wp-includes/js/tinymce/plugins/wordpress/css/content.css
-share/wordpress/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
+share/wordpress/wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/audio.gif
-share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/embedded.png
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/image.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/media.gif
-share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/page.gif
-share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/trans.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/video.gif
-share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js
-share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
-share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/img/image.png
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css
-share/wordpress/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js
-share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js
+share/wordpress/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/img/delete.png
 share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/img/edit.png
-share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png
 share/wordpress/wp-includes/js/tinymce/plugins/wpgallery/img/t.gif
-share/wordpress/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js
+share/wordpress/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js
 share/wordpress/wp-includes/js/tinymce/themes/advanced/about.htm
 share/wordpress/wp-includes/js/tinymce/themes/advanced/anchor.htm
 share/wordpress/wp-includes/js/tinymce/themes/advanced/charmap.htm
 share/wordpress/wp-includes/js/tinymce/themes/advanced/color_picker.htm
 share/wordpress/wp-includes/js/tinymce/themes/advanced/editor_template.js
+share/wordpress/wp-includes/js/tinymce/themes/advanced/editor_template_src.js
 share/wordpress/wp-includes/js/tinymce/themes/advanced/image.htm
 share/wordpress/wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg
 share/wordpress/wp-includes/js/tinymce/themes/advanced/img/flash.gif
@@ -851,6 +892,10 @@ share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_black.css
 share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css
 share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
 share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css
+share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/embedded.png
+share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/gallery.png
+share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif
+share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif
 share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif
 share/wordpress/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css
 share/wordpress/wp-includes/js/tinymce/themes/advanced/source_editor.htm
@@ -892,6 +937,7 @@ share/wordpress/wp-includes/ms-load.php
 share/wordpress/wp-includes/ms-settings.php
 share/wordpress/wp-includes/nav-menu-template.php
 share/wordpress/wp-includes/nav-menu.php
+share/wordpress/wp-includes/option.php
 share/wordpress/wp-includes/pluggable-deprecated.php
 share/wordpress/wp-includes/pluggable.php
 share/wordpress/wp-includes/plugin.php
@@ -913,6 +959,7 @@ share/wordpress/wp-includes/script-loader.php
 share/wordpress/wp-includes/shortcodes.php
 share/wordpress/wp-includes/taxonomy.php
 share/wordpress/wp-includes/template-loader.php
+share/wordpress/wp-includes/template.php
 share/wordpress/wp-includes/theme-compat/comments-popup.php
 share/wordpress/wp-includes/theme-compat/comments.php
 share/wordpress/wp-includes/theme-compat/footer.php
@@ -931,8 +978,6 @@ share/wordpress/wp-links-opml.php
 share/wordpress/wp-load.php
 share/wordpress/wp-login.php
 share/wordpress/wp-mail.php
-share/wordpress/wp-pass.php
-share/wordpress/wp-register.php
 share/wordpress/wp-settings.php
 share/wordpress/wp-signup.php
 share/wordpress/wp-trackback.php
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index f7405423a11..d8b725be3d1 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2012/04/25 13:00:37 morr Exp $
+$NetBSD: distinfo,v 1.21 2012/06/29 10:40:13 morr Exp $
 
-SHA1 (wordpress-3.3.2.tar.gz) = f4c0ee4d14d3364d158755072a944cd8cf685475
-RMD160 (wordpress-3.3.2.tar.gz) = 1fce1f9402308f9e4689778656a2e7e8fab45211
-Size (wordpress-3.3.2.tar.gz) = 3883667 bytes
+SHA1 (wordpress-3.4.1.tar.gz) = ca9cb1a336a68a731fdfc3373c43a4797edd401c
+RMD160 (wordpress-3.4.1.tar.gz) = 0cb3620a5c08a579b6116d6e496a1d7bf397c0d3
+Size (wordpress-3.4.1.tar.gz) = 4536505 bytes