diff --git a/sources b/sources index 969f05d..80ec3c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.8.2.tar.gz) = 448ab7819bf4ccd00e5cda13122cb89f838db55833fdc5ffc48321a7e201f112e7f80279387386410a29f248bd5aa4b85a145a68b1c42f72287c9d0be38313f7 +SHA512 (wordpress-7.1.tar.gz) = 4bb95bddeb0d30778b9d744e42f7e21507ed3070fda3e34dd41918073618181e350cf77ea8dfaacc48c59a00f50273b4a1b7a6e4c43d2a81ccfd35f27df342bc diff --git a/wordpress-6.4-no_swfupload.patch b/wordpress-6.4-no_swfupload.patch deleted file mode 100644 index 2ef7c9e..0000000 --- a/wordpress-6.4-no_swfupload.patch +++ /dev/null @@ -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 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 ); - -- // 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 ); - did_action( 'init' ) && $scripts->add_data( 'comment-reply', 'strategy', 'async' ); - diff --git a/wordpress-5.8-noupdate.patch b/wordpress-7.1-noupdate.patch similarity index 56% rename from wordpress-5.8-noupdate.patch rename to wordpress-7.1-noupdate.patch index 39dbb92..d327e71 100644 --- a/wordpress-5.8-noupdate.patch +++ b/wordpress-7.1-noupdate.patch @@ -1,7 +1,7 @@ -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', ' +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', ' 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.noupdate wordpress/wp-adm 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.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 +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 * @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.noupdate wordpress/ 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.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 { +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 { } // 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.noupdate wor /** * Filters whether to entirely disable background updates. -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, $ +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, $ */ 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.noupdate wordpress/wp-admin/includ if ( ! $context ) { $context = WP_CONTENT_DIR; -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() { +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() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { - $msg .= sprintf( -- '%s ', +- '%s', - 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.noupdate wordpress/wp-admin/incl } } -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 +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 * @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.noupdate wordpress/wp-includes/load.php } /** -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() { +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() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress-5.1-remove-jshint-refs.patch b/wordpress-7.1-remove-jshint-refs.patch similarity index 59% rename from wordpress-5.1-remove-jshint-refs.patch rename to wordpress-7.1-remove-jshint-refs.patch index fff7368..61d3b6b 100644 --- a/wordpress-5.1-remove-jshint-refs.patch +++ b/wordpress-7.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 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' ); +--- 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' ); $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.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( '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( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index ddc73ee..e2d9f03 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.8.2 +%global upstream_version 7.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -33,8 +33,6 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) Patch0: wordpress-6.8-hello.patch -# Drop swfupload: not built from source, not reasonably possible to do -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' @@ -49,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-5.8-noupdate.patch +Patch6: wordpress-7.1-noupdate.patch # Debian patch for jshint -Patch8: wordpress-5.1-remove-jshint-refs.patch +Patch8: wordpress-7.1-remove-jshint-refs.patch BuildArch: noarch @@ -73,36 +71,32 @@ 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 Requires: php-zlib Requires: httpd # Unbundled -Requires: ca-certificates +Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # Bundled # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php -Provides: bundled(php-simplepie) = 1.8.0 +Provides: bundled(php-simplepie) = 1.9.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.23 +Provides: bundled(php-getid3) = 1.9.25 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.9.3 +Provides: bundled(php-phpmailer) = 7.1.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -129,7 +123,6 @@ rm -rf wp-includes/random_compat rm -rf wp-includes/sodium_compat %patch -P0 -p1 -b .dolly -%patch -P2 -p1 %patch -P3 -p1 # Adjust mediaelement not to use its SWF %patch -P4 -p1 @@ -208,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/tls/certs/ca-bundle.crt \ +ln -s %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt # Remove backup copies of patches @@ -252,6 +245,51 @@ end %changelog +* Tue Aug 25 2026 Remi Collet -7.1-1 +- WordPress 7.1 “Mary Lou” + +* Thu Aug 13 2026 Remi Collet -7.0.4-1 +- WordPress 7.0.4 Release + +* Fri Aug 7 2026 Remi Collet -7.0.3-1 +- WordPress 7.0.3 Release + +* Tue Jul 21 2026 Remi Collet -7.0.2-1 +- WordPress 7.0.2 Release + +* Fri Jul 17 2026 Fedora Release Engineering - 7.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Fri Jul 10 2026 Remi Collet -7.0.1-1 +- WordPress 7.0.1 Maintenance Release + +* Tue May 26 2026 Remi Collet -7.0-1 +- WordPress 7.0 “Armstrong” + +* Thu Mar 12 2026 Remi Collet - 6.9.4-1 +- WordPress 6.9.4 Release + +* Wed Mar 11 2026 Remi Collet - 6.9.3-1 +- WordPress 6.9.3 Release + +* Wed Feb 4 2026 Remi Collet - 6.9.1-1 +- WordPress 6.9.1 Maintenance Release + +* Sat Jan 17 2026 Fedora Release Engineering - 6.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Dec 3 2025 Remi Collet - 6.9-1 +- WordPress 6.9 “Gene” + +* Wed Oct 1 2025 Remi Collet - 6.8.3-1 +- WordPress 6.8.3 Security Release + +* Mon Jul 28 2025 Remi Collet - 6.8.2-3 +- fix system certificates path + +* Fri Jul 25 2025 Fedora Release Engineering - 6.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Remi Collet - 6.8.2-1 - WordPress 6.8.2 Maintenance Release