From a9b9800e6686d10145533e55ed55967f4cccd341 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Feb 2021 11:03:15 +0100 Subject: [PATCH 1/8] v5.6.1 (cherry picked from commit c7fee329b54103bd29939d627a1e6081b4cafc34) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 70ca596..4c4b8f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.tar.gz) = c62041463ad2f47069b2b78381166eb68cf2ce12e16f623bd14b3321a16b4a647650dd4fc680780d4ce55dbd8b858745150320fa5e38fb0f7ad45c68cdda2dec +SHA512 (wordpress-5.6.1.tar.gz) = c6ede085a3b9fc66e5b9d685bfb0f82c5c69fda92a5184baf2ed0e9ae375e1b122628fd3d59cad88f67ea5f8d069fe84ca736be6f183ff539fd575889699b286 diff --git a/wordpress.spec b/wordpress.spec index ea19df0..523e0d8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6 +%global upstream_version 5.6.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Feb 5 2021 Remi Collet - 5.6.1-1 +- WordPress 5.6.1 Maintenance Release + * Wed Dec 9 2020 Remi Collet - 5.6-1 - WordPress 5.6 “Simone” From d566e89f4304b5368f9cf8aac72b013c62d71b49 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Feb 2021 10:01:09 +0100 Subject: [PATCH 2/8] WordPress 5.6.2 Maintenance Release (cherry picked from commit 8281850818216371f0ccee09aadc2d1ebb817421) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4c4b8f0..d6c4e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.1.tar.gz) = c6ede085a3b9fc66e5b9d685bfb0f82c5c69fda92a5184baf2ed0e9ae375e1b122628fd3d59cad88f67ea5f8d069fe84ca736be6f183ff539fd575889699b286 +SHA512 (wordpress-5.6.2.tar.gz) = 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69 diff --git a/wordpress.spec b/wordpress.spec index 523e0d8..3f3253a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6.1 +%global upstream_version 5.6.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Feb 23 2021 Remi Collet - 5.6.2-1 +- WordPress 5.6.2 Maintenance Release + * Fri Feb 5 2021 Remi Collet - 5.6.1-1 - WordPress 5.6.1 Maintenance Release From 4b7ac4446467a20440650b8341f892080405ef82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Mar 2021 06:49:20 +0100 Subject: [PATCH 3/8] =?UTF-8?q?WordPress=205.7=20=E2=80=9CEsperanza?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 53dd7b266105e03476cb11c0d4f80c9f3df7f006) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d6c4e33..b43bd93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.2.tar.gz) = 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69 +SHA512 (wordpress-5.7.tar.gz) = 84516473add8624cd7e318af98d257f5f113fcc98cd9f5c0a0d7c1a8060f9f5dd5989d995259d3920b89f71f3391fc8b28b520f7d8aae7511cc1e26e90116567 diff --git a/wordpress.spec b/wordpress.spec index 3f3253a..f6d2f4f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6.2 +%global upstream_version 5.7 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Mar 10 2021 Remi Collet - 5.7-1 +- WordPress 5.7 “Esperanza” + * Tue Feb 23 2021 Remi Collet - 5.6.2-1 - WordPress 5.6.2 Maintenance Release From d27b55524a1d28515cf50bddac34592378782a79 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 08:34:18 +0200 Subject: [PATCH 4/8] WordPress 5.7.1 Security and Maintenance Release (cherry picked from commit 16946d865d4aff8f7449f5c052f7dd3681b20fb4) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b43bd93..5b0e584 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.tar.gz) = 84516473add8624cd7e318af98d257f5f113fcc98cd9f5c0a0d7c1a8060f9f5dd5989d995259d3920b89f71f3391fc8b28b520f7d8aae7511cc1e26e90116567 +SHA512 (wordpress-5.7.1.tar.gz) = 9144a2269efc4ee24a732bacf8f25d7c02136db546c6cf86890b2690f001acfafb9ece1dde7dd7d557b5eb9f3e01a829aab1c7ae80384d4e9389155bdbc3df86 diff --git a/wordpress.spec b/wordpress.spec index f6d2f4f..4b02a7c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7 +%global upstream_version 5.7.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Apr 15 2021 Remi Collet - 5.7.1-1 +- WordPress 5.7.1 Security and Maintenance Release + * Wed Mar 10 2021 Remi Collet - 5.7-1 - WordPress 5.7 “Esperanza” From e00155a3d2cae4a981036ef8600744faf66e8057 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 07:31:01 +0200 Subject: [PATCH 5/8] WordPress 5.7.2 Security Release (cherry picked from commit 4ea211141f7e435ead4d99e56098e8fd43300795) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5b0e584..e9ac861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.1.tar.gz) = 9144a2269efc4ee24a732bacf8f25d7c02136db546c6cf86890b2690f001acfafb9ece1dde7dd7d557b5eb9f3e01a829aab1c7ae80384d4e9389155bdbc3df86 +SHA512 (wordpress-5.7.2.tar.gz) = 84d41dddba5c4c59a0ceb3ef2e04760c27ae811e9db5cb43484f91973dd9c5acfb66affd8f76db06dfefd77e1bd90acad1eba7ba176a5f43b28ec806f3861edb diff --git a/wordpress.spec b/wordpress.spec index 4b02a7c..5a63e4c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7.1 +%global upstream_version 5.7.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu May 13 2021 Remi Collet - 5.7.2-1 +- WordPress 5.7.2 Security Release + * Thu Apr 15 2021 Remi Collet - 5.7.1-1 - WordPress 5.7.1 Security and Maintenance Release From ef322c0f4996901d10c16575423c3777445d4179 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Jul 2021 14:01:05 +0200 Subject: [PATCH 6/8] WordPress 5.8 Tatum (cherry picked from commit 7c95aa67127e2fdb60f571bc222eea3cce9664e4) --- 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 5a63e4c..175e27b 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 From 311c1db05bc2ff8812e7a8f99f89abbc0dc9fcc6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Sep 2021 09:03:16 +0200 Subject: [PATCH 7/8] WordPress 5.8.1 Security and Maintenance Release (cherry picked from commit 9ee2734f6bdcb540d668f60933edf16f3dc7dc33) (cherry picked from commit b67af282351c7c5086909286aadf1f9259dcf905) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5d62e89..9a85b1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.tar.gz) = 6f3c2f2e2d3d3ac57798533d062f12d1d751dc8c2fd30fb6448d60d50d74b416ecc32f1b3c54efd6a3edfcc227f29b14706e8ffadaf7d9710ab345ee47b88629 +SHA512 (wordpress-5.8.1.tar.gz) = f1eb56832ca5204b34fa67dd58d2e37eb0f794472407859e21eeaa427b1683ca9b94551303271cfe84a0aa65d04928f2a2d5d47b641d9b5fd9dae5c18ce101af diff --git a/wordpress.spec b/wordpress.spec index 175e27b..385bd47 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8 +%global upstream_version 5.8.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Sep 9 2021 Remi Collet - 5.8.1-1 +- WordPress 5.8.1 Security and Maintenance Release + * Wed Jul 21 2021 Remi Collet - 5.8-1 - WordPress 5.8 Tatum From 08737c561a455a1e60b2573d66b495736592a54e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Nov 2021 07:49:47 +0100 Subject: [PATCH 8/8] WordPress 5.8.2 Security and Maintenance Release (cherry picked from commit a18a4f7675ccfdd6448d92b09c3b2432531b14dc) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9a85b1f..10c6c02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.1.tar.gz) = f1eb56832ca5204b34fa67dd58d2e37eb0f794472407859e21eeaa427b1683ca9b94551303271cfe84a0aa65d04928f2a2d5d47b641d9b5fd9dae5c18ce101af +SHA512 (wordpress-5.8.2.tar.gz) = 84f33132fb453de437f17b09abd2acf97aaea0ab30ae781204abee2c900beb2629db465d3fabdd29011d98e7fc998a0d559ddc836ce3492381565ac3304fa0d3 diff --git a/wordpress.spec b/wordpress.spec index 385bd47..fcf9c17 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8.1 +%global upstream_version 5.8.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Nov 11 2021 Remi Collet - 5.8.2-1 +- WordPress 5.8.2 Security and Maintenance Release + * Thu Sep 9 2021 Remi Collet - 5.8.1-1 - WordPress 5.8.1 Security and Maintenance Release