rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WordPress 4.2 “Powell”

Browse source
This commit is contained in:
Remi Collet 2015-04-24 10:49:41 +02:00
commit c572f2c6f5
7 changed files with 48 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -14,3 +14,4 @@ clog
/wordpress-4.1.tar.gz
/wordpress-4.1.1.tar.gz
/wordpress-4.1.2.tar.gz
/wordpress-4.2.tar.gz

2
sources
View file

@ -1 +1 @@
266abe568f3f1a82aba0b0aac3e11d16 wordpress-4.1.2.tar.gz
f48458379c82de934bb3e8539e5d9b9e wordpress-4.2.tar.gz

11
wordpress-4.1-mediaelement-noflash_silverlight.patch
View file

File diff suppressed because one or more lines are too long

18
wordpress-4.2-mediaelement-noflash_silverlight.patch Normal file
View file

File diff suppressed because one or more lines are too long

4
wordpress-3.9-no_swfupload.patch → wordpress-4.2-no_swfupload.patch
View file

@ -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' );

38
wordpress-4.1-noupdate.patch → wordpress-4.2-noupdate.patch
View file

@ -1,7 +1,7 @@
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
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-04-03 02:18:27.000000000 +0200
+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-04-24 10:33:31.166724612 +0200
@@ -2142,6 +2142,9 @@ class Core_Upgrader extends WP_Upgrader
}
}
@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admi
// 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 {
@@ -2373,7 +2376,7 @@ class WP_Automatic_Updater {
*/
public function is_disabled() {
// Background updates are disabled if you don't want file changes.
@ -20,9 +20,9 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admi
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
diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.noupdate 2015-04-24 10:37:28.288734495 +0200
+++ wordpress/wp-admin/includes/update.php 2015-04-24 10:37:46.985814124 +0200
@@ -211,8 +211,6 @@ function update_nag() {
}
echo "<div class='update-nag'>$msg</div>";
@ -36,15 +36,15 @@ diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/
$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 .= '<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 .= '';
}
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 )
$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-04-20 09:27:27.000000000 +0200
+++ wordpress/wp-includes/capabilities.php 2015-04-24 10:33:31.167724617 +0200
@@ -1281,7 +1281,7 @@ function map_meta_cap( $cap, $user_id )
// Disallow the file editors.
if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
$caps[] = 'do_not_allow';
@ -53,7 +53,7 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi
$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 )
@@ -1299,7 +1299,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.
@ -62,9 +62,9 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi
$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
diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.noupdate 2015-03-18 23:07:28.000000000 +0100
+++ wordpress/wp-includes/update.php 2015-04-24 10:33:31.167724617 +0200
@@ -624,9 +624,6 @@ function _maybe_update_themes() {
* @since 3.1.0
*/
@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
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_
@@ -668,8 +665,6 @@ if ( ( ! is_main_site() && ! is_network_
}
add_action( 'admin_init', '_maybe_update_core' );

11
wordpress.spec
View file

@ -16,7 +16,7 @@
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: 4.1.2
Version: 4.2
Group: Applications/Publishing
Release: 1%{?dist}
License: GPLv2
@ -33,7 +33,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 +41,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.2-mediaelement-noflash_silverlight.patch
# RPM configuration:
# Path to installation
# Disable auto-updater
@ -50,7 +50,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.2-noupdate.patch
# Use system libraries
Patch7: wordpress-4.0-systemlibs.patch
@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Fri Apr 24 2015 Remi Collet <remi@fedoraproject.org> - 4.2-1
- WordPress 4.2 “Powell”
* Thu Apr 23 2015 Remi Collet <remi@fedoraproject.org> - 4.1.2-1
- WordPress 4.1.2 Security Release