From ae0c4b00a381b09e4d3d122b9a0b83a108231877 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Mar 2023 11:09:16 +0200 Subject: [PATCH 1/4] =?UTF-8?q?WordPress=206.2=20=E2=80=9CDolphy=E2=80=9D?= =?UTF-8?q?=20use=20SPDX=20license=20IDs=20(cherry=20picked=20from=20commi?= =?UTF-8?q?t=20aa32e253fdbabb483633c1958af87e898d73bcaa)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v6.2 sources (cherry picked from commit afe38c7fe04229a67bcbf80d55fc22a01666a04b) --- sources | 2 +- wordpress.spec | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1827ffd..d15fe73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.1.1.tar.gz) = b50dd9b5e1628a0285d3f0121d6b4cb3617fb696907ef06c935b40d0a46c9853ce12200e011a58675830602aa6d5b6470a98e8cefeec0f7464145bdc344780bb +SHA512 (wordpress-6.2.tar.gz) = 207e2d7aad658772f33c91ed37440b06029de7977847efde5ccd6b4687e7430f3f1a6d9e6d40d1b09d0565ed12adc1e25dc4f34a0102aae2899ef9a8ef8b3baf diff --git a/wordpress.spec b/wordpress.spec index 27f0f9f..331b035 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.1.1 +%global upstream_version 6.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -22,7 +22,11 @@ URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} Release: 1%{?dist} -License: GPLv2 +# Wordpress is GPL-2.0-or-later +# php-simplepie is BSD-3-Clause +# php-getid3 is LGPL-3.0-or-later (or some others) +# php-mailer is LGPL-2.1-only +License: GPL-2.0-or-later AND BSD-3-Clause AND LGPL-3.0-or-later AND LGPL-2.1-only Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz Source1: wordpress-httpd-conf @@ -108,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.6.5 +Provides: bundled(php-phpmailer) = 6.7 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -262,6 +266,10 @@ end %changelog +* Thu Mar 30 2023 Remi Collet - 6.2-1 +- WordPress 6.2 “Dolphy” +- use SPDX license IDs + * Wed Nov 16 2022 Remi Collet - 6.1.1-1 - WordPress 6.1.1 Maintenance Release From d8c4cff81696cfac0350285f72c210d827f70b72 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 May 2023 07:08:38 +0200 Subject: [PATCH 2/4] WordPress 6.2.1 Maintenance & Security Release (cherry picked from commit 438c995a4eff06c51733d3562ce4ac2b298e5d22) --- sources | 2 +- wordpress.spec | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sources b/sources index d15fe73..7d8d271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.tar.gz) = 207e2d7aad658772f33c91ed37440b06029de7977847efde5ccd6b4687e7430f3f1a6d9e6d40d1b09d0565ed12adc1e25dc4f34a0102aae2899ef9a8ef8b3baf +SHA512 (wordpress-6.2.1.tar.gz) = 88e97a9c6d05ec18ac761ae247659febd19e60a10d80a09cdc70e284fbd4f91ac72c0f852d5482cc5dd7330eb85370c93fd644317d7a0f1b1156fa64b87f556f diff --git a/wordpress.spec b/wordpress.spec index 331b035..181c16a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2 +%global upstream_version 6.2.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -138,12 +138,12 @@ rm -rf wp-includes/random_compat # only for PHP < 7.2 without sodium_crypto_box rm -rf wp-includes/sodium_compat -%patch0 -p1 -b .dolly -%patch2 -p1 -%patch3 -p1 +%patch -P0 -p1 -b .dolly +%patch -P2 -p1 +%patch -P3 -p1 # Adjust mediaelement not to use its SWF -%patch4 -p1 -%patch8 -p1 +%patch -P4 -p1 +%patch -P8 -p1 # We patch .js files, so minify them php %{SOURCE5} \ @@ -177,8 +177,8 @@ fi # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php -%patch5 -p1 -%patch6 -p1 +%patch -P5 -p1 +%patch -P6 -p1 # fix file encoding sed -i -e 's/\r//' license.txt @@ -266,6 +266,9 @@ end %changelog +* Wed May 17 2023 Remi Collet - 6.2.1-1 +- WordPress 6.2.1 Maintenance & Security Release + * Thu Mar 30 2023 Remi Collet - 6.2-1 - WordPress 6.2 “Dolphy” - use SPDX license IDs From e48cdd722a22cf2f3ea36ef7a76948837fb081e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 May 2023 10:54:14 +0200 Subject: [PATCH 3/4] WordPress 6.2.2 Security Release (cherry picked from commit cd7785a711e95ce6f98740b87a983b2f38bfb1c4) (cherry picked from commit 0e30b8645f8ff51ce7e32fa6ec83b919d36204fd) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7d8d271..a9a7d70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.1.tar.gz) = 88e97a9c6d05ec18ac761ae247659febd19e60a10d80a09cdc70e284fbd4f91ac72c0f852d5482cc5dd7330eb85370c93fd644317d7a0f1b1156fa64b87f556f +SHA512 (wordpress-6.2.2.tar.gz) = 346c8c38e139b4a1de491a767fe34d1ff63b9ce4fbe62d2d5957c5b57704c47bed12c34e753324e018297a95a2e82e9d393e6255b540e22e0cecc74d4f557264 diff --git a/wordpress.spec b/wordpress.spec index 181c16a..b72c509 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2.1 +%global upstream_version 6.2.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Sun May 21 2023 Remi Collet - 6.2.2-1 +- WordPress 6.2.2 Security Release + * Wed May 17 2023 Remi Collet - 6.2.1-1 - WordPress 6.2.1 Maintenance & Security Release From 0b6fe3b38bd7234d9ff415d396e02a33a98ff487 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Oct 2023 07:37:09 +0200 Subject: [PATCH 4/4] WordPress 6.2.3 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a9a7d70..25a3f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.2.tar.gz) = 346c8c38e139b4a1de491a767fe34d1ff63b9ce4fbe62d2d5957c5b57704c47bed12c34e753324e018297a95a2e82e9d393e6255b540e22e0cecc74d4f557264 +SHA512 (wordpress-6.2.3.tar.gz) = 22566065371bad0664281b4376df282874b78e4e32b934f8c8e4d90689906e8aa74cd390651d7d5eb965a6abf5f166a7344c2a98d060fce00b5a981c9144d7fc diff --git a/wordpress.spec b/wordpress.spec index b72c509..8938035 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.2.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Mon Oct 16 2023 Remi Collet - 6.2.3-1 +- WordPress 6.2.3 Security Release + * Sun May 21 2023 Remi Collet - 6.2.2-1 - WordPress 6.2.2 Security Release