From 7c95aa67127e2fdb60f571bc222eea3cce9664e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Jul 2021 14:01:05 +0200 Subject: [PATCH] WordPress 5.8 Tatum --- sources | 2 +- ...date.patch => wordpress-5.8-noupdate.patch | 52 +++++++++---------- wordpress.spec | 7 ++- 3 files changed, 32 insertions(+), 29 deletions(-) rename wordpress-5.4-noupdate.patch => wordpress-5.8-noupdate.patch (60%) diff --git a/sources b/sources index e9ac861..5d62e89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.2.tar.gz) = 84d41dddba5c4c59a0ceb3ef2e04760c27ae811e9db5cb43484f91973dd9c5acfb66affd8f76db06dfefd77e1bd90acad1eba7ba176a5f43b28ec806f3861edb +SHA512 (wordpress-5.8.tar.gz) = 6f3c2f2e2d3d3ac57798533d062f12d1d751dc8c2fd30fb6448d60d50d74b416ecc32f1b3c54efd6a3edfcc227f29b14706e8ffadaf7d9710ab345ee47b88629 diff --git a/wordpress-5.4-noupdate.patch b/wordpress-5.8-noupdate.patch similarity index 60% rename from wordpress-5.4-noupdate.patch rename to wordpress-5.8-noupdate.patch index 3195c5b..39dbb92 100644 --- a/wordpress-5.4-noupdate.patch +++ b/wordpress-5.8-noupdate.patch @@ -1,17 +1,17 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.noup wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.noup 2020-07-10 01:29:08.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2020-10-20 14:12:55.970194210 +0200 +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 2021-07-21 13:55:03.381224813 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2021-07-21 13:55:11.920208285 +0200 @@ -113,7 +113,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. -add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'deactivated_plugins_notice', 5 ); 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.noup wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.noup 2020-06-25 09:15:12.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-10-20 14:12:55.970194210 +0200 +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noupdate wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.noupdate 2021-06-19 23:37:57.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2021-07-21 13:55:03.381224813 +0200 @@ -271,6 +271,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ @@ -22,9 +22,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noup wordpress/wp-a 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.noup wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup 2020-08-31 20:02:04.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-10-20 14:12:55.970194210 +0200 +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate 2021-04-16 14:01:15.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2021-07-21 13:55:03.381224813 +0200 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -34,10 +34,10 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup wordpre /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/file.php.noup wordpress/wp-admin/includes/file.php ---- wordpress/wp-admin/includes/file.php.noup 2020-10-20 14:13:30.079070699 +0200 -+++ wordpress/wp-admin/includes/file.php 2020-10-20 14:13:46.240012179 +0200 -@@ -1901,7 +1901,7 @@ function WP_Filesystem( $args = false, $ +diff -up wordpress/wp-admin/includes/file.php.noupdate wordpress/wp-admin/includes/file.php +--- wordpress/wp-admin/includes/file.php.noupdate 2021-05-24 21:24:57.000000000 +0200 ++++ wordpress/wp-admin/includes/file.php 2021-07-21 13:55:03.381224813 +0200 +@@ -1992,7 +1992,7 @@ function WP_Filesystem( $args = false, $ */ function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) { // Please ensure that this is either 'direct', 'ssh2', 'ftpext', or 'ftpsockets'. @@ -46,10 +46,10 @@ diff -up wordpress/wp-admin/includes/file.php.noup wordpress/wp-admin/includes/f if ( ! $context ) { $context = WP_CONTENT_DIR; -diff -up wordpress/wp-admin/includes/update.php.noup wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.noup 2020-07-30 13:46:05.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2020-10-20 14:12:55.970194210 +0200 -@@ -339,12 +339,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2021-07-21 13:55:03.381224813 +0200 +@@ -341,12 +341,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { @@ -63,10 +63,10 @@ diff -up wordpress/wp-admin/includes/update.php.noup wordpress/wp-admin/includes } } -diff -up wordpress/wp-includes/load.php.noup wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.noup 2020-08-27 23:46:05.000000000 +0200 -+++ wordpress/wp-includes/load.php 2020-10-20 14:12:55.970194210 +0200 -@@ -1476,7 +1476,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.noupdate wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.noupdate 2021-06-23 21:05:57.000000000 +0200 ++++ wordpress/wp-includes/load.php 2021-07-21 13:55:03.381224813 +0200 +@@ -1579,7 +1579,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -75,10 +75,10 @@ diff -up wordpress/wp-includes/load.php.noup wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.noup wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.noup 2020-07-31 00:04:05.000000000 +0200 -+++ wordpress/wp-includes/update.php 2020-10-20 14:12:55.970194210 +0200 -@@ -840,10 +840,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 ++++ wordpress/wp-includes/update.php 2021-07-21 13:55:03.381224813 +0200 +@@ -926,10 +926,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress.spec b/wordpress.spec index c0a782b..0906dea 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7.2 +%global upstream_version 5.8 #global upstream_prever RC5 #global upstream_lower rc5 @@ -54,7 +54,7 @@ Patch5: wordpress-5.4-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.4-noupdate.patch +Patch6: wordpress-5.8-noupdate.patch # Use system libraries Patch7: wordpress-5.4-systemlibs.patch # Debian patch for jshint @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Jul 21 2021 Remi Collet - 5.8-1 +- WordPress 5.8 Tatum + * Thu May 13 2021 Remi Collet - 5.7.2-1 - WordPress 5.7.2 Security Release