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

update to WordPress 4.0 “Benny”

Browse source 
(cherry picked from commit 00237e3af1)
This commit is contained in:
Remi Collet 2014-09-08 13:34:42 +02:00
commit f094fbbea3
7 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -9,3 +9,4 @@ clog
/wordpress-3.9.tar.gz
/wordpress-3.9.1.tar.gz
/wordpress-3.9.2.tar.gz
/wordpress-4.0.tar.gz

2
sources
View file

@ -1 +1 @@
c942a75d659b801195e53bcbd4770f31 wordpress-3.9.2.tar.gz
cf235297b802fe987e444759bf30c1db wordpress-4.0.tar.gz

2
wordpress-3.9-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
@@ -278,15 +278,6 @@ function wp_default_scripts( &$scripts )
@@ -273,15 +273,6 @@ function wp_default_scripts( &$scripts )
$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 );

12
wordpress-3.8.1-config.patch → wordpress-4.0-config.patch
View file

@ -1,8 +1,8 @@
diff -up wordpress/wp-config.php.old wordpress/wp-config.php
--- wordpress/wp-config.php.old 2014-01-25 07:47:17.622959116 +0100
+++ wordpress/wp-config.php 2014-01-25 07:54:06.816454385 +0100
@@ -72,6 +72,19 @@ $table_prefix = 'wp_';
define('WPLANG', '');
diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
--- wordpress/wp-config.php.orig 2014-09-08 13:12:36.525908423 +0200
+++ wordpress/wp-config.php 2014-09-08 13:14:33.583402525 +0200
@@ -62,6 +62,19 @@ define('NONCE_SALT', 'put your uni
$table_prefix = 'wp_';
/**
+ * See http://make.wordpress.org/core/2013/10/25/the-definitive-guide-to-disabling-auto-updates-in-wordpress-3-7
@ -21,7 +21,7 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php
* For developers: WordPress debugging mode.
*
* Change this to true to enable the display of notices during development.
@@ -84,7 +97,7 @@ define('WP_DEBUG', false);
@@ -74,7 +87,7 @@ define('WP_DEBUG', false);
/** Absolute path to the WordPress directory. */
if ( !defined('ABSPATH') )

26
wordpress-3.9-noupdate.patch → wordpress-4.0-noupdate.patch
View file

@ -1,7 +1,7 @@
diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php
--- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-04-15 12:57:14.000000000 +0200
+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-05-07 17:25:04.434588696 +0200
@@ -1546,6 +1546,9 @@ class Core_Upgrader extends WP_Upgrader
@@ -1618,6 +1618,9 @@ class Core_Upgrader extends WP_Upgrader
}
}
@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi
// 1: If we're already on that version, not much point in updating?
if ( $offered_ver == $wp_version )
return false;
@@ -1734,7 +1737,7 @@ class WP_Automatic_Updater {
@@ -1806,7 +1806,7 @@ class WP_Automatic_Updater {
*/
public function is_disabled() {
// Background updates are disabled if you don't want file changes.
@ -23,7 +23,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi
diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200
+++ wordpress/wp-admin/includes/update.php 2014-05-07 17:26:14.139840288 +0200
@@ -216,8 +216,6 @@ function update_nag() {
@@ -211,8 +211,6 @@ function update_nag() {
}
echo "<div class='update-nag'>$msg</div>";
}
@ -32,7 +32,7 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/
// Called directly from dashboard
function update_right_now_message() {
@@ -232,7 +230,7 @@ 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' )
@ -42,9 +42,9 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/
echo "<p id='wp-version-message'>$msg</p>";
diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php
--- wordpress/wp-includes/capabilities.php.nop 2014-03-04 04:09:15.000000000 +0100
+++ wordpress/wp-includes/capabilities.php 2014-05-07 17:25:04.434588696 +0200
@@ -1238,7 +1238,7 @@ function map_meta_cap( $cap, $user_id )
--- wordpress/wp-includes/capabilities.php.orig 2014-08-27 03:32:18.000000000 +0200
+++ wordpress/wp-includes/capabilities.php 2014-09-08 13:22:00.463291244 +0200
@@ -1252,7 +1252,7 @@
// Disallow the file editors.
if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
$caps[] = 'do_not_allow';
@ -53,19 +53,19 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi
$caps[] = 'do_not_allow';
elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
@@ -1254,7 +1254,7 @@ function map_meta_cap( $cap, $user_id )
@@ -1270,7 +1270,7 @@
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 )
- 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 ) )
} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
$caps[] = 'do_not_allow';
diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200
+++ wordpress/wp-includes/update.php 2014-05-07 17:25:04.435588699 +0200
@@ -602,9 +602,6 @@ function _maybe_update_themes() {
@@ -624,9 +624,6 @@ function _maybe_update_themes() {
* @since 3.1.0
*/
function wp_schedule_update_checks() {
@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php
if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
@@ -630,8 +627,6 @@ if ( ( ! is_main_site() && ! is_network_
@@ -652,8 +649,6 @@ if ( ( ! is_main_site() && ! is_network_
return;
add_action( 'admin_init', '_maybe_update_core' );

13
wordpress-3.9-tinymce_noflash.patch → wordpress-4.0-tinymce_noflash.patch
View file

@ -1,6 +1,7 @@
--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.old 2014-05-07 17:03:41.009962331 +0200
+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-05-07 17:04:08.549061421 +0200
@@ -41,10 +41,6 @@
diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/wp-includes/js/tinymce/plugins/media/plugin.js
--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm 2014-08-22 01:53:18.000000000 +0200
+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-09-08 13:10:15.717314458 +0200
@@ -44,10 +44,6 @@ tinymce.PluginManager.add('media', funct
return 'video/ogg';
}
@ -11,12 +12,12 @@
return '';
}
@@ -198,7 +194,7 @@
@@ -239,7 +235,7 @@ tinymce.PluginManager.add('media', funct
data.source1mime = guessMime(data.source1);
data.source2mime = guessMime(data.source2);
data.poster = editor.convertURL(data.poster, "poster");
- data.flashPlayerUrl = editor.convertURL(url + '/moxieplayer.swf', "movie");
+ data.flashPlayerUrl = false;
if (data.embed) {
html = updateHtml(data.embed, data, true);
tinymce.each(urlPatterns, function(pattern) {
var match, i, url;

13
wordpress.spec
View file

@ -10,9 +10,9 @@
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: 3.9.2
Version: 4.0
Group: Applications/Publishing
Release: 3%{?dist}
Release: 1%{?dist}
License: GPLv2
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@ -31,7 +31,7 @@ Patch2: wordpress-3.9-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'
Patch3: wordpress-3.9-tinymce_noflash.patch
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"]'
@ -39,12 +39,12 @@ Patch4: wordpress-3.9-mediaelement-noflash_silverlight.patch
# RPM configuration:
# Path to installation
# Disable auto-updater
Patch5: wordpress-3.8.1-config.patch
Patch5: wordpress-4.0-config.patch
# RPM are readonly
# disable version check and updated
# change DISALLOW_FILE_MODS default value to true
# ignore WP_AUTO_UPDATE_CORE (always false)
Patch6: wordpress-3.9-noupdate.patch
Patch6: wordpress-4.0-noupdate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@ -257,6 +257,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/wordpress/xmlrpc.php
%changelog
* Mon Sep 8 2014 Remi Collet <remi@fedoraproject.org> - 4.0-1
- WordPress 4.0 “Benny”
* Fri Aug 8 2014 Remi Collet <remi@fedoraproject.org> - 3.9.2-3
- config dir only readable by apache group, better fix for #1124582
- fix license handling