v6.9.7

(cherry picked from commit 2a0979cb09)

sources

@@ -1 +1 @@
-SHA512 (wordpress-5.8.3.tar.gz) = 08ebf959d9ae8ca33bee86fec222fb0266dc10bf6db4ed1ebeb7886a422abd838cbcc4d004002dea2c923c7a0822a1f410881b01f2e234560836b1635d98718b
+SHA512 (wordpress-6.9.7.tar.gz) = 082d73913859c79ca5a78a740bc40eaf9ef2c9352a14be605a1fe0d61d00eb8d171da75ff777929160766476780ba7b3bce73e3b56e56a46c59f632b8479a9d8

wordpress-5.4-no_swfupload.patch

@@ -1,16 +0,0 @@
-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.
--	$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' );
--	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
--
- 	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
- 
- 	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' );

wordpress-5.4-systemlibs.patch

@@ -1,21 +0,0 @@
-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();

wordpress-6.8-hello.patch

@@ -1,7 +1,7 @@
 diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php
---- wordpress/wp-content/plugins/hello.php.dolly	2019-03-28 15:09:05.874797878 +0100
-+++ wordpress/wp-content/plugins/hello.php	2019-03-28 15:10:15.892164549 +0100
-@@ -6,41 +6,26 @@
+--- wordpress/wp-content/plugins/hello.php.dolly	2025-04-16 08:21:31.710644174 +0200
++++ wordpress/wp-content/plugins/hello.php	2025-04-16 08:23:15.011000365 +0200
+@@ -6,7 +6,7 @@
  /*
  Plugin Name: Hello Dolly
  Plugin URI: http://wordpress.org/plugins/hello-dolly/
@@ -10,7 +10,8 @@ diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugi
  Author: Matt Mullenweg
  Version: 1.7.2
  Author URI: http://ma.tt/
- */
+@@ -18,34 +18,19 @@ if ( ! defined( 'ABSPATH' ) ) {
+ }
  
  function hello_dolly_get_lyric() {
 -	/** These are the lyrics to Hello Dolly */

wordpress-httpd-conf

@@ -5,31 +5,19 @@ Alias /wordpress /usr/share/wordpress
 
 <Directory /usr/share/wordpress>
   AllowOverride Options
-  <IfModule mod_authz_core.c>
-    # Apache 2.4
     Require local
-  </IfModule>
-  <IfModule !mod_authz_core.c>
-    # Apache 2.2
-    Order Deny,Allow
-    Deny from All
-    Allow from 127.0.0.1
-    Allow from ::1
- </IfModule>
 </Directory>
 
 <Directory /usr/share/wordpress/wp-content/uploads>
   # Deny access to any php file in the uploads directory
   <FilesMatch "\.(php|phar)$">
-    Order Deny,Allow
-    Deny from all
+    Require all denied
   </FilesMatch>
 </Directory>
 
 <Directory /usr/share/wordpress/wp-content/plugins/akismet>
   # Deny access to any php file in the akismet directory
   <FilesMatch "\.(php|txt)$">
-    Order Deny,Allow
-    Deny from all
+    Require all denied
   </FilesMatch>
 </Directory>

wordpress-move-wp-content.patch

@@ -1,30 +0,0 @@
-diff -up wordpress/wp-includes/default-constants.php.rhbz522897 wordpress/wp-includes/default-constants.php
---- wordpress/wp-includes/default-constants.php.rhbz522897	2010-05-26 04:42:15.000000000 +0200
-+++ wordpress/wp-includes/default-constants.php	2011-06-02 12:29:57.919714584 +0200
-@@ -39,7 +39,7 @@ function wp_initial_constants( ) {
- 		@ini_set('memory_limit', WP_MEMORY_LIMIT);
- 
- 	if ( !defined('WP_CONTENT_DIR') )
--		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
-+		define( 'WP_CONTENT_DIR', '/var/www/wordpress/wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
- 
- 	// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
- 	if ( !defined('WP_DEBUG') )
-@@ -75,7 +75,7 @@ function wp_initial_constants( ) {
-  */
- function wp_plugin_directory_constants( ) {
- 	if ( !defined('WP_CONTENT_URL') )
--		define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
-+		define( 'WP_CONTENT_URL', get_option('siteurl')); // full url - WP_CONTENT_DIR is defined further up
- 
- 	/**
- 	 * Allows for the plugins directory to be moved from the default location.
-@@ -100,7 +100,7 @@ function wp_plugin_directory_constants( 
- 	 * @deprecated
- 	 */
- 	if ( !defined('PLUGINDIR') )
--		define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH.  For back compat.
-+		define( 'PLUGINDIR', WP_CONTENT_DIR . 'plugins' ); // Relative to ABSPATH.  For back compat.
- 
- 	/**
- 	 * Allows for the mu-plugins directory to be moved from the default location.

wordpress.spec

@@ -5,24 +5,22 @@
 #
 # Please preserve changelog entries
 #
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global wp_content %{_datadir}/wordpress/wp-content
 
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
-%global with_nginx 1
-%else
-%global with_nginx 0
-%endif
-%global upstream_version 5.8.3
+%global upstream_version 6.9.7
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
 Summary:    Blog tool and publishing platform
-URL:        http://www.wordpress.org
+URL:        https://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
@@ -34,12 +32,7 @@ Source5:    wordpress-minify.php
 
 # Patch out copyrighted text of Hello, Dolly
 # (and replace it with Free Software Song)
-Patch0: wordpress-5.2-hello.patch
-# Move wp-content to /var/www/wordpress/
-# 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.4-no_swfupload.patch
+Patch0: wordpress-6.8-hello.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'
@@ -55,8 +48,6 @@ Patch5: wordpress-5.4-config.patch
 # change DISALLOW_FILE_MODS default value to true
 # ignore WP_AUTO_UPDATE_CORE (always false)
 Patch6: wordpress-5.8-noupdate.patch
-# Use system libraries
-Patch7: wordpress-5.4-systemlibs.patch
 # Debian patch for jshint
 Patch8: wordpress-5.1-remove-jshint-refs.patch
 
@@ -66,16 +57,12 @@ BuildRequires: php-cli
 BuildRequires: php-patchwork-jsqueeze
 BuildRequires: php(language) >= 7.2
 
-%if %{with_nginx}
 Requires: webserver
 Requires: php(httpd)
 Suggests: httpd
 # For directory ownership
 Requires: httpd-filesystem
 Requires: nginx-filesystem
-%else
-Requires: php
-%endif
 Requires: php(language) >= 7.2
 Requires: php-sodium
 Requires: php-ctype
@@ -84,22 +71,18 @@ Requires: php-mysqli
 
 # From phpcompatinfo report for version 4.5.3
 Requires: php-curl
-Requires: php-date
 Requires: php-dom
 Requires: php-exif
 Requires: php-fileinfo
 Requires: php-gd
 Requires: php-gettext
-Requires: php-hash
 Requires: php-iconv
 Requires: php-intl
 Requires: php-json
 Requires: php-libxml
 Requires: php-mbstring
 Requires: php-openssl
-Requires: php-pcre
 Requires: php-simplexml
-Requires: php-spl
 Requires: php-xml
 Requires: php-xmlreader
 Requires: php-zip
@@ -109,11 +92,11 @@ Requires: httpd
 Requires: ca-certificates
 # Bundled
 # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php
-Provides: bundled(php-simplepie) = 1.5.6
+Provides: bundled(php-simplepie) = 1.9.0
 # grep ' VERSION '  wordpress/wp-includes/ID3/getid3.php
-Provides: bundled(php-getid3) = 1.9.20
+Provides: bundled(php-getid3) = 1.9.24
 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php
-Provides: bundled(php-phpmailer)  = 6.5.0
+Provides: bundled(php-phpmailer)  = 7.0.0
 Provides: wordpress-mu = %{version}-%{release}
 Obsoletes: wordpress-mu < 2.9.3
 
@@ -139,15 +122,11 @@ 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
-#patch1 -p1 -b .rhbz522897
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p1 -b .dolly
+%patch -P3 -p1
 # Adjust mediaelement not to use its SWF
-%patch4 -p1
-#rm  wp-includes/js/mediaelement/media*swf
-%patch7 -p1
-%patch8 -p1
+%patch -P4 -p1
+%patch -P8 -p1
 
 # We patch .js files, so minify them
 php %{SOURCE5} \
@@ -181,16 +160,16 @@ 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
 
 : Bundled library versions
-grep "SIMPLEPIE_VERSION'" wp-includes/class-simplepie.php
-grep ' VERSION '          wp-includes/ID3/getid3.php
-grep ' VERSION '          wp-includes/PHPMailer/PHPMailer.php
+grep ' VERSION '  wp-includes/SimplePie/src/SimplePie.php
+grep ' VERSION '  wp-includes/ID3/getid3.php
+grep ' VERSION '  wp-includes/PHPMailer/PHPMailer.php
 
 
 %build
@@ -199,9 +178,7 @@ grep ' VERSION '          wp-includes/PHPMailer/PHPMailer.php
 # Apache configuration
 install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf
 
-%if %{with_nginx}
 install -m 0644 -D -p %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/nginx/default.d/wordpress.conf
-%endif
 
 # Application
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress
@@ -243,9 +220,7 @@ end
 
 %files
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf
-%if %{with_nginx}
 %config(noreplace) %{_sysconfdir}/nginx/default.d/wordpress.conf
-%endif
 %dir %{_datadir}/wordpress
 %{_datadir}/wordpress/wp-admin
 %{_datadir}/wordpress/wp-includes
@@ -270,6 +245,133 @@ end
 
 
 %changelog
+* Thu Aug 13 2026 Remi Collet <remi@remirepo.net> - 6.9.7-1
+- WordPress 6.9.7 Security Release
+
+* Fri Aug  7 2026 Remi Collet <remi@remirepo.net> - 6.9.6-1
+- WordPress 6.9.6 Security Release
+
+* Tue Jul 21 2026 Remi Collet <remi@remirepo.net> - 6.9.5-1
+- WordPress 6.9.5 Security Release
+
+* Thu Mar 12 2026 Remi Collet <remi@remirepo.net> - 6.9.4-1
+- WordPress 6.9.4 Release
+
+* Wed Mar 11 2026 Remi Collet <remi@remirepo.net> - 6.9.3-1
+- WordPress 6.9.3 Release
+
+* Wed Feb  4 2026 Remi Collet <remi@remirepo.net> - 6.9.1-1
+- WordPress 6.9.1 Maintenance Release
+
+* Wed Dec  3 2025 Remi Collet <remi@remirepo.net> - 6.9-1
+- WordPress 6.9 “Gene”
+
+* Wed Oct  1 2025 Remi Collet <remi@remirepo.net> - 6.8.3-1
+- WordPress 6.8.3 Security Release
+
+* Tue Jul 22 2025 Remi Collet <remi@remirepo.net> - 6.8.2-1
+- WordPress 6.8.2 Maintenance Release
+
+* Mon May  5 2025 Remi Collet <remi@remirepo.net> - 6.8.1-1
+- WordPress 6.8.1 Maintenance Release
+
+* Wed Apr 16 2025 Remi Collet <remi@remirepo.net> - 6.8-1
+- WordPress 6.8 “Cecil”
+
+* Wed Feb 12 2025 Remi Collet <remi@remirepo.net> - 6.7.2-1
+- WordPress 6.7.2 Maintenance Release
+
+* Fri Nov 22 2024 Remi Collet <remi@remirepo.net> - 6.7.1-1
+- WordPress 6.7.1 Maintenance Release
+
+* Wed Nov 13 2024 Remi Collet <remi@remirepo.net> - 6.7-1
+- WordPress 6.7 “Rollins”
+
+* Wed Sep 11 2024 Remi Collet <remi@remirepo.net> - 6.6.2-1
+- WordPress 6.6.2 Maintenance Release
+
+* Wed Jul 24 2024 Remi Collet <remi@remirepo.net> - 6.6.1-1
+- WordPress 6.6.1 Maintenance Release
+
+* Wed Jul 17 2024 Remi Collet <remi@remirepo.net> - 6.6-1
+- WordPress 6.6 “Dorsey”
+
+* Tue Jul  2 2024 Remi Collet <remi@remirepo.net> - 6.5.5-1
+- WordPress 6.4.2 Maintenance & Security Release
+
+* Thu Jun  6 2024 Remi Collet <remi@remirepo.net> - 6.5.4-1
+- WordPress 6.5.4 Maintenance Release
+
+* Mon May 13 2024 Remi Collet <remi@remirepo.net> - 6.5.3-1
+- WordPress 6.5.3 Maintenance Release
+
+* Wed Apr 10 2024 Remi Collet <remi@remirepo.net> - 6.5.2-1
+- WordPress 6.5.2 Maintenance and Security Release
+
+* Wed Apr  3 2024 Remi Collet <remi@remirepo.net> - 6.5-1
+- WordPress 6.5 “Regina”
+
+* Thu Feb  1 2024 Remi Collet <remi@remirepo.net> - 6.4.3-1
+- WordPress 6.4.3 Maintenance & Security Release
+
+* Thu Dec  7 2023 Remi Collet <remi@remirepo.net> - 6.4.2-1
+- WordPress 6.4.2 Maintenance & Security Release
+
+* Thu Nov  9 2023 Remi Collet <remi@remirepo.net> - 6.4.1-1
+- WordPress 6.4.1 Maintenance Release
+
+* Wed Nov  8 2023 Remi Collet <remi@remirepo.net> - 6.4-1
+- WordPress 6.4 “Shirley”
+
+* Mon Oct 16 2023 Remi Collet <remi@remirepo.net> - 6.3.2-1
+- WordPress 6.3.2 – Maintenance and Security release
+
+* Thu Aug 31 2023 Remi Collet <remi@remirepo.net> - 6.3.1-1
+* WordPress 6.3.1 Maintenance Release
+
+* Sun Aug 20 2023 Remi Collet <remi@remirepo.net> - 6.3-1
+- WordPress 6.3 “Lionel”
+
+* Sun May 21 2023 Remi Collet <remi@remirepo.net> - 6.2.2-1
+- WordPress 6.2.2 Security Release
+
+* Wed May 17 2023 Remi Collet <remi@remirepo.net> - 6.2.1-1
+- WordPress 6.2.1 Maintenance & Security Release
+
+* Thu Mar 30 2023 Remi Collet <remi@remirepo.net> - 6.2-1
+- WordPress 6.2 “Dolphy”
+- use SPDX license IDs
+
+* Wed Nov 16 2022 Remi Collet <remi@remirepo.net> - 6.1.1-1
+- WordPress 6.1.1 Maintenance Release
+
+* Wed Nov  2 2022 Remi Collet <remi@remirepo.net> - 6.1-1
+- WordPress 6.1 “Misha”
+
+* Tue Oct 18 2022 Remi Collet <remi@remirepo.net> - 6.0.3-1
+- WordPress 6.0.3 Security Release
+
+* Thu Sep  8 2022 Remi Collet <remi@remirepo.net> - 6.0.2-1
+- WordPress 6.0.2 Security and Maintenance Release
+
+* Wed Jul 13 2022 Remi Collet <remi@remirepo.net> - 6.0.1-1
+- WordPress 6.0.1 Maintenance Release
+
+* Wed May 25 2022 Remi Collet <remi@remirepo.net> - 6.0-1
+- WordPress 6.0 “Arturo”
+
+* Wed Apr  6 2022 Remi Collet <remi@remirepo.net> - 5.9.3-1
+- WordPress 5.9.3 Maintenance Release
+
+* Fri Mar 11 2022 Remi Collet <remi@remirepo.net> - 5.9.2-1
+- WordPress 5.9.2 Security & Maintenance Release
+
+* Wed Feb 23 2022 Remi Collet <remi@remirepo.net> - 5.9.1-1
+- WordPress 5.9.1 Maintenance Release
+
+* Wed Jan 26 2022 Remi Collet <remi@remirepo.net> - 5.9-1
+- WordPress 5.9 Josephine
+
 * Fri Jan  7 2022 Remi Collet <remi@remirepo.net> - 5.8.3-1
 - WordPress 5.8.3 Security Release