WordPress 4.3.1 Security and Maintenance Release

(cherry picked from commit 2edf6e9b3d)

.gitignore

@@ -14,3 +14,10 @@ clog
 /wordpress-4.1.tar.gz
 /wordpress-4.1.1.tar.gz
 /wordpress-4.1.2.tar.gz
+/wordpress-4.2.tar.gz
+/wordpress-4.2.1.tar.gz
+/wordpress-4.2.2.tar.gz
+/wordpress-4.2.3.tar.gz
+/wordpress-4.2.4.tar.gz
+/wordpress-4.3.tar.gz
+/wordpress-4.3.1.tar.gz

sources

@@ -1 +1 @@
-266abe568f3f1a82aba0b0aac3e11d16  wordpress-4.1.2.tar.gz
+de8004fa1035817435eaa780a681aaff  wordpress-4.3.1.tar.gz

wordpress-4.1-noupdate.patch

@@ -1,86 +0,0 @@
-diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admin/includes/class-wp-upgrader.php
---- wordpress/wp-admin/includes/class-wp-upgrader.php.rpm	2014-12-16 20:54:23.000000000 +0100
-+++ wordpress/wp-admin/includes/class-wp-upgrader.php	2014-12-22 06:46:28.487097611 +0100
-@@ -2141,6 +2141,9 @@ class Core_Upgrader extends WP_Upgrader
- 			}
- 		}
- 
-+		// RPM: nether allow core update
-+		return false;
-+
- 		// 1: If we're already on that version, not much point in updating?
- 		if ( $offered_ver == $wp_version )
- 			return false;
-@@ -2372,7 +2375,7 @@ class WP_Automatic_Updater {
- 	 */
- 	public function is_disabled() {
- 		// Background updates are disabled if you don't want file changes.
--		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-+		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
- 			return true;
- 
- 		if ( defined( 'WP_INSTALLING' ) )
-diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.rpm	2014-11-30 12:28:24.000000000 +0100
-+++ wordpress/wp-admin/includes/update.php	2014-12-22 06:46:28.487097611 +0100
-@@ -211,8 +211,6 @@ function update_nag() {
- 	}
- 	echo "<div class='update-nag'>$msg</div>";
- }
--add_action( 'admin_notices', 'update_nag', 3 );
--add_action( 'network_admin_notices', 'update_nag', 3 );
- 
- // Called directly from dashboard
- function update_right_now_message() {
-@@ -227,7 +225,7 @@ function update_right_now_message() {
- 		$cur = get_preferred_from_update_core();
- 
- 		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
--			$msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
-+			$msg .= '';
- 	}
- 
- 	echo "<p id='wp-version-message'>$msg</p>";
-diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php
---- wordpress/wp-includes/capabilities.php.rpm	2014-12-01 02:34:24.000000000 +0100
-+++ wordpress/wp-includes/capabilities.php	2014-12-22 06:46:28.487097611 +0100
-@@ -1255,7 +1255,7 @@ function map_meta_cap( $cap, $user_id )
- 		// Disallow the file editors.
- 		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
- 			$caps[] = 'do_not_allow';
--		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-+		elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
- 			$caps[] = 'do_not_allow';
- 		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
- 			$caps[] = 'do_not_allow';
-@@ -1273,7 +1273,7 @@ function map_meta_cap( $cap, $user_id )
- 	case 'update_core':
- 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
- 		// Files in uploads are excepted.
--		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-+		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) {
- 			$caps[] = 'do_not_allow';
- 		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
- 			$caps[] = 'do_not_allow';
-diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.rpm	2014-12-22 06:48:34.883575009 +0100
-+++ wordpress/wp-includes/update.php	2014-12-22 06:48:44.144609988 +0100
-@@ -624,9 +624,6 @@ function _maybe_update_themes() {
-  * @since 3.1.0
-  */
- function wp_schedule_update_checks() {
--	if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') )
--		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
--
- 	if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
- 		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
- 
-@@ -669,8 +666,6 @@ if ( ( ! is_main_site() && ! is_network_
- }
- 
- add_action( 'admin_init', '_maybe_update_core' );
--add_action( 'wp_version_check', 'wp_version_check' );
--add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
- 
- add_action( 'load-plugins.php', 'wp_update_plugins' );
- add_action( 'load-update.php', 'wp_update_plugins' );

wordpress-4.2-no_swfupload.patch

@@ -1,7 +1,7 @@
 diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php
 --- wordpress/wp-includes/script-loader.php.orig	2014-05-07 15:55:26.485228222 +0200
 +++ wordpress/wp-includes/script-loader.php	2014-05-07 15:55:18.019198073 +0200
-@@ -273,15 +273,6 @@ function wp_default_scripts( &$scripts )
+@@ -280,15 +280,6 @@
  	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
  	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
  
@@ -16,4 +16,4 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/scri
 -
  	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
  
- 	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');
+ 	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23' );

wordpress-4.3-noupdate.patch

@@ -0,0 +1,97 @@
+diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php
+--- wordpress/wp-admin/includes/admin-filters.php.noupdate	2015-08-26 09:56:30.113424058 +0200
++++ wordpress/wp-admin/includes/admin-filters.php	2015-08-26 09:56:50.729529575 +0200
+@@ -101,7 +101,6 @@ add_action( 'profile_update', 'default_p
+ add_action( 'admin_init', 'wp_plugin_update_rows' );
+ add_action( 'admin_init', 'wp_theme_update_rows'  );
+ 
+-add_action( 'admin_notices', 'update_nag',      3  );
+ add_action( 'admin_notices', 'maintenance_nag', 10 );
+ 
+ add_filter( 'update_footer', 'core_update_footer' );
+diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php
+--- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate	2015-07-29 16:57:25.000000000 +0200
++++ wordpress/wp-admin/includes/class-wp-upgrader.php	2015-08-26 09:55:58.269261073 +0200
+@@ -2276,6 +2276,9 @@ class Core_Upgrader extends WP_Upgrader
+ 			}
+ 		}
+ 
++		// RPM: nether allow core update
++		return false;
++
+ 		// 1: If we're already on that version, not much point in updating?
+ 		if ( $offered_ver == $wp_version )
+ 			return false;
+@@ -2510,7 +2513,7 @@ class WP_Automatic_Updater {
+ 	 */
+ 	public function is_disabled() {
+ 		// Background updates are disabled if you don't want file changes.
+-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
++		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
+ 			return true;
+ 
+ 		if ( defined( 'WP_INSTALLING' ) )
+diff -up wordpress/wp-admin/includes/ms-admin-filters.php.noupdate wordpress/wp-admin/includes/ms-admin-filters.php
+--- wordpress/wp-admin/includes/ms-admin-filters.php.noupdate	2015-08-26 09:57:03.337594106 +0200
++++ wordpress/wp-admin/includes/ms-admin-filters.php	2015-08-26 09:57:09.398625127 +0200
+@@ -38,5 +38,4 @@ add_action( 'admin_notices',         'si
+ add_action( 'network_admin_notices', 'site_admin_notice' );
+ 
+ // Update Hooks
+-add_action( 'network_admin_notices', 'update_nag',      3  );
+ add_action( 'network_admin_notices', 'maintenance_nag', 10 );
+diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php
+--- wordpress/wp-admin/includes/update.php.noupdate	2015-07-07 02:02:24.000000000 +0200
++++ wordpress/wp-admin/includes/update.php	2015-08-26 09:56:00.298271458 +0200
+@@ -251,7 +251,7 @@ function update_right_now_message() {
+ 		$cur = get_preferred_from_update_core();
+ 
+ 		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
+-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
++			$msg .= '';
+ 	}
+ 
+ 	$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php
+--- wordpress/wp-includes/capabilities.php.noupdate	2015-08-14 00:31:24.000000000 +0200
++++ wordpress/wp-includes/capabilities.php	2015-08-26 09:56:00.299271463 +0200
+@@ -1337,7 +1337,7 @@ function map_meta_cap( $cap, $user_id )
+ 		// Disallow the file editors.
+ 		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+ 			$caps[] = 'do_not_allow';
+-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
++		elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
+ 			$caps[] = 'do_not_allow';
+ 		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ 			$caps[] = 'do_not_allow';
+@@ -1355,7 +1355,7 @@ function map_meta_cap( $cap, $user_id )
+ 	case 'update_core':
+ 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+ 		// Files in uploads are excepted.
+-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
++		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) {
+ 			$caps[] = 'do_not_allow';
+ 		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+ 			$caps[] = 'do_not_allow';
+diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php
+--- wordpress/wp-includes/update.php.noupdate	2015-05-28 17:29:28.000000000 +0200
++++ wordpress/wp-includes/update.php	2015-08-26 09:56:00.299271463 +0200
+@@ -636,9 +636,6 @@ function _maybe_update_themes() {
+  * @since 3.1.0
+  */
+ function wp_schedule_update_checks() {
+-	if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') )
+-		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
+-
+ 	if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
+ 		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
+ 
+@@ -680,8 +677,6 @@ if ( ( ! is_main_site() && ! is_network_
+ }
+ 
+ add_action( 'admin_init', '_maybe_update_core' );
+-add_action( 'wp_version_check', 'wp_version_check' );
+-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
+ 
+ add_action( 'load-plugins.php', 'wp_update_plugins' );
+ add_action( 'load-update.php', 'wp_update_plugins' );

wordpress.spec

@@ -1,3 +1,10 @@
+# Fedora spec file for wordpress
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global wp_content %{_datadir}/wordpress/wp-content
 
@@ -16,7 +23,7 @@
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
-Version:    4.1.2
+Version:    4.3.1
 Group:      Applications/Publishing
 Release:    1%{?dist}
 License:    GPLv2
@@ -33,7 +40,7 @@ Patch0: wordpress-debian_patches_hello.patch
 # This patch doesn’t work well, see bugzilla.redhat.com/522897
 Patch1: wordpress-move-wp-content.patch
 # Drop swfupload: not built from source, not reasonably possible to do
-Patch2: wordpress-3.9-no_swfupload.patch
+Patch2: wordpress-4.2-no_swfupload.patch
 # Adjust tinymce's media plugin not to use its SWF plugin. This changes
 # 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))'
 # to 'false'
@@ -41,7 +48,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch
 # Adjust mediaelement not to use its SWF and Silverlight plugins. This
 # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
 # 'plugins:["youtube","vimeo"]'
-Patch4: wordpress-4.1-mediaelement-noflash_silverlight.patch
+Patch4: wordpress-4.3-mediaelement-noflash_silverlight.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
@@ -50,7 +57,7 @@ Patch5: wordpress-4.0-config.patch
 # disable version check and updated
 # change DISALLOW_FILE_MODS default value to true
 # ignore WP_AUTO_UPDATE_CORE (always false)
-Patch6: wordpress-4.1-noupdate.patch
+Patch6: wordpress-4.3-noupdate.patch
 # Use system libraries
 Patch7: wordpress-4.0-systemlibs.patch
 
@@ -145,7 +152,7 @@ rm wp-content/plugins/akismet/.htaccess
 #patch1 -p1 -b .rhbz522897
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
 %if %{with_getid3}
 %patch7 -p1
 %endif
@@ -281,6 +288,28 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 4.3.1-1
+- WordPress 4.3.1 Security and Maintenance Release
+
+* Wed Aug 26 2015 Remi Collet <remi@fedoraproject.org> - 4.3-1
+- WordPress 4.3 “Billie”
+
+* Tue Aug  4 2015 Remi Collet <remi@fedoraproject.org> - 4.2.4-1
+- WordPress 4.2.4 Security and Maintenance Release
+
+* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 4.2.3-1
+- WordPress 4.2.3 Security and Maintenance Release
+
+* Thu May  7 2015 Remi Collet <remi@fedoraproject.org> - 4.2.2-1
+- WordPress 4.2.2 Security and Maintenance Release
+
+* Tue Apr 28 2015 Remi Collet <remi@fedoraproject.org> - 4.2.1-1
+- WordPress 4.2.1 Security Release
+- WordPress 4.2 “Powell”
+
+* Fri Apr 24 2015 Remi Collet <remi@fedoraproject.org> - 4.1.3-1
+- WordPress 4.1.3 Maintenance Release
+
 * Thu Apr 23 2015 Remi Collet <remi@fedoraproject.org> - 4.1.2-1
 - WordPress 4.1.2 Security Release