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

WordPress 5.4 “Adderley”

Browse source
This commit is contained in:
Remi Collet 2020-03-26 08:09:43 +01:00
commit 34e0afd74f
7 changed files with 67 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sources
View file

@ -1 +1 @@
SHA512 (wordpress-5.3.2.tar.gz) = d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198
SHA512 (wordpress-5.4.tar.gz) = 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8

21
wordpress-5.3-systemlibs.patch
View file

@ -1,21 +0,0 @@
diff -up wordpress/wp-admin/includes/media.php.no wordpress/wp-admin/includes/media.php
--- wordpress/wp-admin/includes/media.php.no 2019-11-13 08:01:19.298917453 +0100
+++ wordpress/wp-admin/includes/media.php 2019-11-13 08:02:18.118385610 +0100
@@ -3447,7 +3447,7 @@ function wp_read_video_metadata( $file )
}
if ( ! class_exists( 'getID3', false ) ) {
- require( ABSPATH . WPINC . '/ID3/getid3.php' );
+ require( '/usr/share/php/getid3/getid3.php' );
}
$id3 = new getID3();
@@ -3558,7 +3558,7 @@ function wp_read_audio_metadata( $file )
}
if ( ! class_exists( 'getID3', false ) ) {
- require( ABSPATH . WPINC . '/ID3/getid3.php' );
+ require( '/usr/share/php/getid3/getid3.php' );
}
$id3 = new getID3();

8
wordpress-5.1-config.patch → wordpress-5.4-config.patch
View file

@ -1,6 +1,6 @@
diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
--- wordpress/wp-config.php.orig 2019-02-21 15:07:29.558863904 +0100
+++ wordpress/wp-config.php 2019-02-21 15:07:37.024901925 +0100
diff -up wordpress/wp-config.php.old wordpress/wp-config.php
--- wordpress/wp-config.php.old 2020-03-25 16:41:04.241482906 +0100
+++ wordpress/wp-config.php 2020-03-25 16:42:03.677209804 +0100
@@ -66,6 +66,19 @@ define( 'NONCE_SALT', 'put your un
$table_prefix = 'wp_';
@ -25,7 +25,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
/** Absolute path to the WordPress directory. */
if ( ! defined( 'ABSPATH' ) ) {
- define( 'ABSPATH', dirname( __FILE__ ) . '/' );
- define( 'ABSPATH', __DIR__ . '/' );
+ define('ABSPATH', '/usr/share/wordpress');
}

10
wordpress-5.1-no_swfupload.patch → wordpress-5.4-no_swfupload.patch
View file

@ -1,11 +1,11 @@
diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php
--- wordpress/wp-includes/script-loader.php.orig 2019-02-21 14:57:23.338776485 +0100
+++ wordpress/wp-includes/script-loader.php 2019-02-21 14:57:25.832789185 +0100
@@ -1098,12 +1098,6 @@ function wp_default_scripts( &$scripts )
diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php
--- wordpress/wp-includes/script-loader.php.old 2020-03-25 16:34:50.606199762 +0100
+++ wordpress/wp-includes/script-loader.php 2020-03-25 16:35:59.409883628 +0100
@@ -892,12 +892,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 );
- // keep 'swfupload' for back-compat.
- // Keep 'swfupload' for back-compat.
- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' );
- $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );
- $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' );

50
wordpress-5.3-noupdate.patch → wordpress-5.4-noupdate.patch
View file

@ -1,6 +1,6 @@
diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/includes/admin-filters.php
--- wordpress/wp-admin/includes/admin-filters.php.no 2019-05-26 22:50:53.000000000 +0200
+++ wordpress/wp-admin/includes/admin-filters.php 2019-11-13 08:04:53.832484254 +0100
diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/includes/admin-filters.php
--- wordpress/wp-admin/includes/admin-filters.php.old 2020-01-29 01:45:18.000000000 +0100
+++ wordpress/wp-admin/includes/admin-filters.php 2020-03-25 16:44:02.126665533 +0100
@@ -111,7 +111,6 @@ add_action( 'personal_options_update', '
add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
@ -9,22 +9,22 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/inc
add_action( 'admin_notices', 'paused_plugins_notice', 5 );
add_action( 'admin_notices', 'paused_themes_notice', 5 );
add_action( 'admin_notices', 'maintenance_nag', 10 );
diff -up wordpress/wp-admin/includes/class-core-upgrader.php.no wordpress/wp-admin/includes/class-core-upgrader.php
--- wordpress/wp-admin/includes/class-core-upgrader.php.no 2019-09-03 02:41:05.000000000 +0200
+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-11-13 08:04:53.832484254 +0100
@@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader
diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-admin/includes/class-core-upgrader.php
--- wordpress/wp-admin/includes/class-core-upgrader.php.old 2020-03-25 16:44:02.126665533 +0100
+++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-03-25 16:44:38.649497710 +0100
@@ -270,6 +270,9 @@ class Core_Upgrader extends WP_Upgrader
* @return bool True if we should update to the offered version, otherwise false.
*/
public static function should_update_to_version( $offered_ver ) {
+ // RPM: nether allow core update
+ return false;
+
include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress/wp-admin/includes/class-wp-automatic-updater.php
--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.no 2019-09-03 02:41:05.000000000 +0200
+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-11-13 08:04:53.832484254 +0100
$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.old wordpress/wp-admin/includes/class-wp-automatic-updater.php
--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.old 2020-02-09 17:55:09.000000000 +0100
+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-03-25 16:44:02.126665533 +0100
@@ -38,7 +38,7 @@ class WP_Automatic_Updater {
}
@ -34,13 +34,13 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress
/**
* Filters whether to entirely disable background updates.
diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.no 2019-11-13 08:04:53.833484244 +0100
+++ wordpress/wp-admin/includes/update.php 2019-11-13 08:06:54.383296231 +0100
@@ -314,12 +314,7 @@ function update_right_now_message() {
diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.old 2020-03-25 16:44:02.127665528 +0100
+++ wordpress/wp-admin/includes/update.php 2020-03-25 16:45:28.396269123 +0100
@@ -338,12 +338,7 @@ function update_right_now_message() {
$cur = get_preferred_from_update_core();
if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
- $msg .= sprintf(
- '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
- network_admin_url( 'update-core.php' ),
@ -51,10 +51,10 @@ diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/u
}
}
diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php
--- wordpress/wp-includes/load.php.no 2019-09-19 14:02:58.000000000 +0200
+++ wordpress/wp-includes/load.php 2019-11-13 08:04:53.833484244 +0100
@@ -1422,7 +1422,7 @@ function wp_is_file_mod_allowed( $contex
diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php
--- wordpress/wp-includes/load.php.old 2020-02-25 19:33:06.000000000 +0100
+++ wordpress/wp-includes/load.php 2020-03-25 16:44:02.127665528 +0100
@@ -1435,7 +1435,7 @@ function wp_is_file_mod_allowed( $contex
* @param bool $file_mod_allowed Whether file modifications are allowed.
* @param string $context The usage context.
*/
@ -63,10 +63,10 @@ diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php
}
/**
diff -up wordpress/wp-includes/update.php.no wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.no 2019-09-03 02:41:05.000000000 +0200
+++ wordpress/wp-includes/update.php 2019-11-13 08:04:53.833484244 +0100
@@ -781,10 +781,6 @@ function _maybe_update_themes() {
diff -up wordpress/wp-includes/update.php.old wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.old 2020-02-10 04:30:06.000000000 +0100
+++ wordpress/wp-includes/update.php 2020-03-25 16:44:02.127665528 +0100
@@ -782,10 +782,6 @@ function _maybe_update_themes() {
* @since 3.1.0
*/
function wp_schedule_update_checks() {

21
wordpress-5.4-systemlibs.patch Normal file
View file

@ -0,0 +1,21 @@
diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php
--- wordpress/wp-admin/includes/media.php.old 2020-03-25 16:39:05.484028608 +0100
+++ wordpress/wp-admin/includes/media.php 2020-02-11 00:47:04.000000000 +0100
@@ -3477,7 +3477,7 @@ function wp_read_video_metadata( $file )
}
if ( ! class_exists( 'getID3', false ) ) {
- require ABSPATH . WPINC . '/ID3/getid3.php';
+ require '/usr/share/php/getid3/getid3.php';
}
$id3 = new getID3();
@@ -3588,7 +3588,7 @@ function wp_read_audio_metadata( $file )
}
if ( ! class_exists( 'getID3', false ) ) {
- require ABSPATH . WPINC . '/ID3/getid3.php';
+ require '/usr/share/php/getid3/getid3.php';
}
$id3 = new getID3();

19
wordpress.spec
View file

@ -18,15 +18,15 @@
%else
%global clean_compat 0
%endif
%global upstream_version 5.3.2
#global upstream_prever RC1
#global upstream_lower rc1
%global upstream_version 5.4
#global upstream_prever RC5
#global upstream_lower rc5
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: %{upstream_version}%{?upstream_prever:~%upstream_lower}
Release: 2%{?dist}
Release: 1%{?dist}
License: GPLv2
Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
@ -44,7 +44,7 @@ Patch0: wordpress-5.2-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-5.1-no_swfupload.patch
Patch2: wordpress-5.4-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'
@ -54,14 +54,14 @@ Patch4: wordpress-5.3-mediaelement_no_swf.patch
# RPM configuration:
# Path to installation
# Disable auto-updater
Patch5: wordpress-5.1-config.patch
Patch5: wordpress-5.4-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-5.3-noupdate.patch
Patch6: wordpress-5.4-noupdate.patch
# Use system libraries
Patch7: wordpress-5.3-systemlibs.patch
Patch7: wordpress-5.4-systemlibs.patch
# Debian patch for jshint
Patch8: wordpress-5.1-remove-jshint-refs.patch
@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
%changelog
* Wed Apr 1 2020 Remi Collet <remi@remirepo.net> - 5.4-1
- WordPress 5.4 “Adderley”
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild