From 222ec0a6382cf0f3b937d0a391b39b85b6354943 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Aug 2023 09:08:57 +0200 Subject: [PATCH 1/8] =?UTF-8?q?WordPress=206.3=20=E2=80=9CLionel=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5d372d92f91ba53555d9ea546084b31410e74729) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a9a7d70..67f43cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.2.tar.gz) = 346c8c38e139b4a1de491a767fe34d1ff63b9ce4fbe62d2d5957c5b57704c47bed12c34e753324e018297a95a2e82e9d393e6255b540e22e0cecc74d4f557264 +SHA512 (wordpress-6.3.tar.gz) = b9b2fa19efb8a352cd53a16de6baa492e201d8607d4a07758146d9b40b09dd40172d7292cd6ca21be92799e2b40763a537f63c8506da7b99acc5d144196b0566 diff --git a/wordpress.spec b/wordpress.spec index 61eb709..098655a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2.2 +%global upstream_version 6.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Sun Aug 20 2023 Remi Collet - 6.3-1 +- WordPress 6.3 “Lionel” + * Sun May 21 2023 Remi Collet - 6.2.2-1 - WordPress 6.2.2 Security Release From f972c4413c6c46e76a5d8b792ce85f0fc3c619d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Aug 2023 08:06:15 +0200 Subject: [PATCH 2/8] * WordPress 6.3.1 Maintenance Release (cherry picked from commit dd57a81f902f7655e55d04dcfd00b6853443e86d) --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 67f43cb..44a4fc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.tar.gz) = b9b2fa19efb8a352cd53a16de6baa492e201d8607d4a07758146d9b40b09dd40172d7292cd6ca21be92799e2b40763a537f63c8506da7b99acc5d144196b0566 +SHA512 (wordpress-6.3.1.tar.gz) = 786abd032f2c245f2af4974a3b11cfbc541754a12cbb1bfa2339ab68b469711d5d8bf9394ff12fd7b6b7a5b4006d72aeecd34dc8fbed531b39df287e878e2da9 diff --git a/wordpress.spec b/wordpress.spec index 098655a..b528b7f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3 +%global upstream_version 6.3.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -112,7 +112,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.7 +Provides: bundled(php-phpmailer) = 6.8.0 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -266,6 +266,9 @@ end %changelog +* Thu Aug 31 2023 Remi Collet - 6.3.1-1 +* WordPress 6.3.1 Maintenance Release + * Sun Aug 20 2023 Remi Collet - 6.3-1 - WordPress 6.3 “Lionel” From 675bfcf56144d655ecfd67e67c4cd188faa0f9e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Oct 2023 07:20:48 +0200 Subject: [PATCH 3/8] =?UTF-8?q?WordPress=206.3.2=20=E2=80=93=20Maintenance?= =?UTF-8?q?=20and=20Security=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 09fd35536419b844b35fd6cba853bf2a1b3188c8) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 44a4fc5..132d904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.1.tar.gz) = 786abd032f2c245f2af4974a3b11cfbc541754a12cbb1bfa2339ab68b469711d5d8bf9394ff12fd7b6b7a5b4006d72aeecd34dc8fbed531b39df287e878e2da9 +SHA512 (wordpress-6.3.2.tar.gz) = 68fade6d608b8be4f35c7b7d0e8d73658b8690f3548d5374ca8a16a7b18affb9bcea54c1357fb442a1928cc0826ab40cabfd6ad91f0b4a5c00451036bea78747 diff --git a/wordpress.spec b/wordpress.spec index b528b7f..3d5de53 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3.1 +%global upstream_version 6.3.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Mon Oct 16 2023 Remi Collet - 6.3.2-1 +- WordPress 6.3.2 – Maintenance and Security release + * Thu Aug 31 2023 Remi Collet - 6.3.1-1 * WordPress 6.3.1 Maintenance Release From 454fa762458c43aaed2fd306a74ae207d49dbfab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Nov 2023 14:58:13 +0100 Subject: [PATCH 4/8] =?UTF-8?q?WordPress=206.4=20=E2=80=9CShirley=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 4cc3f8f944f388c03ff0009d75c5eaa476c288f4) --- sources | 2 +- ...o_swfupload.patch => wordpress-6.4-no_swfupload.patch | 8 ++++---- wordpress.spec | 9 ++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) rename wordpress-5.4-no_swfupload.patch => wordpress-6.4-no_swfupload.patch (74%) diff --git a/sources b/sources index 132d904..4464241 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.2.tar.gz) = 68fade6d608b8be4f35c7b7d0e8d73658b8690f3548d5374ca8a16a7b18affb9bcea54c1357fb442a1928cc0826ab40cabfd6ad91f0b4a5c00451036bea78747 +SHA512 (wordpress-6.4.tar.gz) = 9b39725b11a22a4937facb88ebee7999ad6dc539196b763f697773becd05ae18d806aef42ba6992c2b63ab1febb634adc2e87b97654b15f2e0bd9400cc163608 diff --git a/wordpress-5.4-no_swfupload.patch b/wordpress-6.4-no_swfupload.patch similarity index 74% rename from wordpress-5.4-no_swfupload.patch rename to wordpress-6.4-no_swfupload.patch index 3683cb7..2ef7c9e 100644 --- a/wordpress-5.4-no_swfupload.patch +++ b/wordpress-6.4-no_swfupload.patch @@ -1,7 +1,7 @@ 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 ) +--- wordpress/wp-includes/script-loader.php.old 2023-11-08 14:47:40.820208939 +0100 ++++ wordpress/wp-includes/script-loader.php 2023-11-08 14:47:48.593183436 +0100 +@@ -1029,12 +1029,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,5 +12,5 @@ diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/scrip - did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); + did_action( 'init' ) && $scripts->add_data( 'comment-reply', 'strategy', 'async' ); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' ); diff --git a/wordpress.spec b/wordpress.spec index 3d5de53..c666972 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3.2 +%global upstream_version 6.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -40,7 +40,7 @@ Source5: wordpress-minify.php # (and replace it with Free Software Song) Patch0: wordpress-5.2-hello.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-5.4-no_swfupload.patch +Patch2: wordpress-6.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' @@ -112,7 +112,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.8.0 +Provides: bundled(php-phpmailer) = 6.8.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -266,6 +266,9 @@ end %changelog +* Wed Nov 8 2023 Remi Collet - 6.4-1 +- WordPress 6.4 “Shirley” + * Mon Oct 16 2023 Remi Collet - 6.3.2-1 - WordPress 6.3.2 – Maintenance and Security release From eee32b979d1e72887a9322af93e7881099f4df9b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Nov 2023 09:53:56 +0100 Subject: [PATCH 5/8] WordPress 6.4.1 Maintenance Release (cherry picked from commit 7d5422b77cfc28cd4136a54583eeaa381ded4c92) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4464241..befc635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.tar.gz) = 9b39725b11a22a4937facb88ebee7999ad6dc539196b763f697773becd05ae18d806aef42ba6992c2b63ab1febb634adc2e87b97654b15f2e0bd9400cc163608 +SHA512 (wordpress-6.4.1.tar.gz) = 4b977cc8733f9f99e383f7495d626bee0d5b7c84ebffcb4d2eaad8dd2456a00c06f8f3d0eee741048e86ae38357b0e81928c3b4f76bfcb01f441c911704b4f99 diff --git a/wordpress.spec b/wordpress.spec index c666972..9762755 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4 +%global upstream_version 6.4.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Nov 9 2023 Remi Collet - 6.4.1-1 +- WordPress 6.4.1 Maintenance Release + * Wed Nov 8 2023 Remi Collet - 6.4-1 - WordPress 6.4 “Shirley” From 7589fd837c3e5cbeb3d66ba8bc42a6d039613611 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Dec 2023 08:39:06 +0100 Subject: [PATCH 6/8] WordPress 6.4.2 Maintenance & Security Release (cherry picked from commit 19ce14b238a774ba12e855483a6246b88fac2cb5) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index befc635..68fa774 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.1.tar.gz) = 4b977cc8733f9f99e383f7495d626bee0d5b7c84ebffcb4d2eaad8dd2456a00c06f8f3d0eee741048e86ae38357b0e81928c3b4f76bfcb01f441c911704b4f99 +SHA512 (wordpress-6.4.2.tar.gz) = 05f23101169d9340000121569b0b1676acc5f144e6e5f1fc320f41e3f57899b39c065049b3cf43fe278248cf51f7102853afa8673ba1be503f5a1016c593db68 diff --git a/wordpress.spec b/wordpress.spec index 9762755..582d546 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.1 +%global upstream_version 6.4.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Dec 7 2023 Remi Collet - 6.4.2-1 +- WordPress 6.4.2 Maintenance & Security Release + * Thu Nov 9 2023 Remi Collet - 6.4.1-1 - WordPress 6.4.1 Maintenance Release From cf3b81f471bc7809bc4d8cf8164a1bf390268f49 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Feb 2024 08:30:33 +0100 Subject: [PATCH 7/8] WordPress 6.4.3 Maintenance & Security Release (cherry picked from commit b32b47631ad7b2ea2f4de1d283941994f14d756a) (cherry picked from commit 9867f65beaf700032003602d09719f65abc2ed7d) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 68fa774..83cab3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.2.tar.gz) = 05f23101169d9340000121569b0b1676acc5f144e6e5f1fc320f41e3f57899b39c065049b3cf43fe278248cf51f7102853afa8673ba1be503f5a1016c593db68 +SHA512 (wordpress-6.4.3.tar.gz) = a3602f1b7c046b6463d03d74a4f091434e5251518a4a11146675a5836f75a532d04e9b0fad9474bd9c53ed3e2adb06a2cfb0121fde017180e120ebb58cb643eb diff --git a/wordpress.spec b/wordpress.spec index 582d546..f58e062 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.2 +%global upstream_version 6.4.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Feb 1 2024 Remi Collet - 6.4.3-1 +- WordPress 6.4.3 Maintenance & Security Release + * Thu Dec 7 2023 Remi Collet - 6.4.2-1 - WordPress 6.4.2 Maintenance & Security Release From bd0d92de5ed775f6e1300555dd0a91eb806f056d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Apr 2024 15:26:13 +0200 Subject: [PATCH 8/8] WordPress 6.4.4 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 83cab3d..11ca516 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.3.tar.gz) = a3602f1b7c046b6463d03d74a4f091434e5251518a4a11146675a5836f75a532d04e9b0fad9474bd9c53ed3e2adb06a2cfb0121fde017180e120ebb58cb643eb +SHA512 (wordpress-6.4.4.tar.gz) = c369567ecdde465e063127b21de55136d37f35d959944708b2fdf05ac9fa876bbf30395783ce0435ecb68f0662bedfb83900463ebe0b442c57ac02491b5e87a4 diff --git a/wordpress.spec b/wordpress.spec index f58e062..8386049 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.3 +%global upstream_version 6.4.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Wed Apr 10 2024 Remi Collet - 6.4.4-1 +- WordPress 6.4.4 Security Release + * Thu Feb 1 2024 Remi Collet - 6.4.3-1 - WordPress 6.4.3 Maintenance & Security Release