v6.9.4

(cherry picked from commit bfe8ec58b0)

sources

@@ -1 +1 @@
-SHA512 (wordpress-7.1.tar.gz) = 4bb95bddeb0d30778b9d744e42f7e21507ed3070fda3e34dd41918073618181e350cf77ea8dfaacc48c59a00f50273b4a1b7a6e4c43d2a81ccfd35f27df342bc
+SHA512 (wordpress-6.9.4.tar.gz) = 3065a037dae9450459c475ab85030f0ef0517942d681afe364afbdfd010587d2cb0bb3a520e03ac0492fa6c3d6e904c0da67b8b0b5f1fbd5adf40b5ba29d4362

wordpress-5.1-remove-jshint-refs.patch

@@ -1,11 +1,11 @@
 diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php
---- wordpress/wp-includes/script-loader.php.orig	2026-08-25 07:26:03.212320361 +0200
-+++ wordpress/wp-includes/script-loader.php	2026-08-25 07:26:08.488274508 +0200
-@@ -1205,7 +1205,6 @@ function wp_default_scripts( $scripts )
- 	$scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.65.20' );
+--- wordpress/wp-includes/script-loader.php.orig	2019-02-22 10:52:01.902006889 +0100
++++ wordpress/wp-includes/script-loader.php	2019-02-22 10:52:04.560023086 +0100
+@@ -1251,7 +1251,6 @@ function wp_default_scripts( &$scripts )
+ 	$scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' );
  	$scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' );
- 	$scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.1' ); // Deprecated.
--	$scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); // Deprecated.
- 	$scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.3' );
- 	$scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '1.9.2' );
+ 	$scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' );
+-	$scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' );
+ 	$scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' );
+ 	$scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' );
  	$scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );

wordpress-5.8-noupdate.patch

@@ -1,7 +1,7 @@
-diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/includes/admin-filters.php
---- wordpress/wp-admin/includes/admin-filters.php.orig	2026-03-09 00:49:37.395081000 +0100
-+++ wordpress/wp-admin/includes/admin-filters.php	2026-08-25 07:30:05.010828032 +0200
-@@ -130,7 +130,6 @@ add_action( 'personal_options_update', '
+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.
  
@@ -9,10 +9,10 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/i
  add_action( 'admin_notices', 'deactivated_plugins_notice', 5 );
  add_action( 'admin_notices', 'paused_plugins_notice', 5 );
  add_action( 'admin_notices', 'paused_themes_notice', 5 );
-diff -up wordpress/wp-admin/includes/class-core-upgrader.php.orig wordpress/wp-admin/includes/class-core-upgrader.php
---- wordpress/wp-admin/includes/class-core-upgrader.php.orig	2026-02-13 19:34:41.944764000 +0100
-+++ wordpress/wp-admin/includes/class-core-upgrader.php	2026-08-25 07:30:05.010951923 +0200
-@@ -277,6 +277,9 @@ class Core_Upgrader extends WP_Upgrader
+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.
  	 */
  	public static function should_update_to_version( $offered_ver ) {
@@ -22,10 +22,10 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.orig 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.orig wordpress/wp-admin/includes/class-wp-automatic-updater.php
---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.orig	2026-07-29 10:01:50.858475000 +0200
-+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2026-08-25 07:30:05.011078018 +0200
-@@ -41,7 +41,7 @@ class WP_Automatic_Updater {
+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 {
  		}
  
  		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
@@ -34,10 +34,10 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.orig wordpre
  
  		/**
  		 * Filters whether to entirely disable background updates.
-diff -up wordpress/wp-admin/includes/file.php.orig wordpress/wp-admin/includes/file.php
---- wordpress/wp-admin/includes/file.php.orig	2026-07-29 10:01:50.858475000 +0200
-+++ wordpress/wp-admin/includes/file.php	2026-08-25 07:30:05.011274367 +0200
-@@ -2270,7 +2270,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,15 +46,15 @@ diff -up wordpress/wp-admin/includes/file.php.orig wordpress/wp-admin/includes/f
  
  	if ( ! $context ) {
  		$context = WP_CONTENT_DIR;
-diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.orig	2026-07-30 16:55:49.613388000 +0200
-+++ wordpress/wp-admin/includes/update.php	2026-08-25 07:31:37.114050011 +0200
-@@ -382,12 +382,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 ) {
 -			$msg .= sprintf(
--				'<a href="%s" class="button" aria-describedby="wp-version">%s</a>',
+-				'<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
 -				network_admin_url( 'update-core.php' ),
 -				/* translators: %s: WordPress version number, or 'Latest' string. */
 -				sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
@@ -63,10 +63,10 @@ diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes
  		}
  	}
  
-diff -up wordpress/wp-includes/load.php.orig wordpress/wp-includes/load.php
---- wordpress/wp-includes/load.php.orig	2026-08-07 21:13:51.810460000 +0200
-+++ wordpress/wp-includes/load.php	2026-08-25 07:30:05.011640399 +0200
-@@ -1835,7 +1835,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.orig wordpress/wp-includes/load.php
  }
  
  /**
-diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.orig	2026-07-06 23:09:52.376708000 +0200
-+++ wordpress/wp-includes/update.php	2026-08-25 07:30:05.011769619 +0200
-@@ -1087,10 +1087,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() {

wordpress.spec

@@ -7,7 +7,7 @@
 #
 %global wp_content %{_datadir}/wordpress/wp-content
 
-%global upstream_version 7.1
+%global upstream_version 6.9.4
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -47,9 +47,9 @@ 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-7.1-noupdate.patch
+Patch6: wordpress-5.8-noupdate.patch
 # Debian patch for jshint
-Patch8: wordpress-7.1-remove-jshint-refs.patch
+Patch8: wordpress-5.1-remove-jshint-refs.patch
 
 
 BuildArch: noarch
@@ -89,14 +89,14 @@ Requires: php-zip
 Requires: php-zlib
 Requires: httpd
 # Unbundled
-Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
+Requires: ca-certificates
 # Bundled
 # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php
 Provides: bundled(php-simplepie) = 1.9.0
 # grep ' VERSION '  wordpress/wp-includes/ID3/getid3.php
-Provides: bundled(php-getid3) = 1.9.25
+Provides: bundled(php-getid3) = 1.9.24
 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php
-Provides: bundled(php-phpmailer)  = 7.1.1
+Provides: bundled(php-phpmailer)  = 7.0.0
 Provides: wordpress-mu = %{version}-%{release}
 Obsoletes: wordpress-mu < 2.9.3
 
@@ -201,7 +201,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 
 # Remove bundled ca-bundle.crt
 rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
-ln -s %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \
+ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
    ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
 
 # Remove backup copies of patches
@@ -245,27 +245,6 @@ end
 
 
 %changelog
-* Tue Aug 25 2026 Remi Collet <remi@remirepo.net> -7.1-1
-- WordPress 7.1 “Mary Lou”
-
-* Thu Aug 13 2026 Remi Collet <remi@remirepo.net> -7.0.4-1
-- WordPress 7.0.4 Release
-
-* Fri Aug  7 2026 Remi Collet <remi@remirepo.net> -7.0.3-1
-- WordPress 7.0.3 Release
-
-* Tue Jul 21 2026 Remi Collet <remi@remirepo.net> -7.0.2-1
-- WordPress 7.0.2 Release
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jul 10 2026 Remi Collet <remi@remirepo.net> -7.0.1-1
-- WordPress 7.0.1 Maintenance Release
-
-* Tue May 26 2026 Remi Collet <remi@remirepo.net> -7.0-1
-- WordPress 7.0 “Armstrong”
-
 * Thu Mar 12 2026 Remi Collet <remi@remirepo.net> - 6.9.4-1
 - WordPress 6.9.4 Release
 
@@ -275,21 +254,12 @@ end
 * Wed Feb  4 2026 Remi Collet <remi@remirepo.net> - 6.9.1-1
 - WordPress 6.9.1 Maintenance Release
 
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
 * 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
 
-* Mon Jul 28 2025 Remi Collet <remi@remirepo.net> - 6.8.2-3
-- fix system certificates path
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 * Tue Jul 22 2025 Remi Collet <remi@remirepo.net> - 6.8.2-1
 - WordPress 6.8.2 Maintenance Release