diff --git a/sources b/sources index db145d4..80ec3c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.5.3.tar.gz) = acc96987e792c85f1a1e4fbc434dc10e6c648ba51d0239354d8ee398604db90c6dfa075b565ddb4ab15cb36d9e06095c93ce30027b3cb61b04ffe5986069da03 +SHA512 (wordpress-7.1.tar.gz) = 4bb95bddeb0d30778b9d744e42f7e21507ed3070fda3e34dd41918073618181e350cf77ea8dfaacc48c59a00f50273b4a1b7a6e4c43d2a81ccfd35f27df342bc diff --git a/wordpress-5.4-config.patch b/wordpress-5.4-config.patch index 2c458f4..4f94404 100644 --- a/wordpress-5.4-config.patch +++ b/wordpress-5.4-config.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-config.php.old wordpress/wp-config.php ---- wordpress/wp-config.php.old 2020-03-25 16:41:04.241482906 +0100 -+++ wordpress/wp-config.php 2020-03-25 16:42:03.677209804 +0100 -@@ -66,6 +66,19 @@ define( 'NONCE_SALT', 'put your un +diff -up wordpress/wp-config.php.rpm wordpress/wp-config.php +--- wordpress/wp-config.php.rpm 2020-10-20 15:05:26.351765085 +0200 ++++ wordpress/wp-config.php 2020-10-20 15:05:48.663684089 +0200 +@@ -66,6 +66,22 @@ define( 'NONCE_SALT', 'put your un $table_prefix = 'wp_'; /** @@ -11,6 +11,9 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php +/* Disable all file change, as RPM base installation are read-only */ +define('DISALLOW_FILE_MODS', true); + ++/* Please ensure that this is either 'direct', 'ssh2', 'ftpext', 'ftpsockets' or false */ ++define('FS_METHOD', 'direct'); ++ +/* Disable automatic updater, in case you want to allow + above FILE_MODS for plugins, themes, ... */ +define('AUTOMATIC_UPDATER_DISABLED', true); @@ -21,7 +24,7 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -83,7 +96,7 @@ define( 'WP_DEBUG', false ); +@@ -83,7 +99,7 @@ define( 'WP_DEBUG', false ); /** Absolute path to the WordPress directory. */ if ( ! defined( 'ABSPATH' ) ) { diff --git a/wordpress-5.4-no_swfupload.patch b/wordpress-5.4-no_swfupload.patch deleted file mode 100644 index 3683cb7..0000000 --- a/wordpress-5.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 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' ); diff --git a/wordpress-5.4-noupdate.patch b/wordpress-5.4-noupdate.patch deleted file mode 100644 index a996046..0000000 --- a/wordpress-5.4-noupdate.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.old 2020-01-29 01:45:18.000000000 +0100 -+++ wordpress/wp-admin/includes/admin-filters.php 2020-03-25 16:44:02.126665533 +0100 -@@ -111,7 +111,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. - --add_action( 'admin_notices', 'update_nag', 3 ); - add_action( 'admin_notices', 'paused_plugins_notice', 5 ); - add_action( 'admin_notices', 'paused_themes_notice', 5 ); - add_action( 'admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.old 2020-03-25 16:44:02.126665533 +0100 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-03-25 16:44:38.649497710 +0100 -@@ -270,6 +270,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 ) { -+ // RPM: nether allow core update -+ return false; -+ - 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.old wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.old 2020-02-09 17:55:09.000000000 +0100 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-03-25 16:44:02.126665533 +0100 -@@ -38,7 +38,7 @@ class WP_Automatic_Updater { - } - - // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. -- $disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED; -+ $disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED; - - /** - * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.old 2020-03-25 16:44:02.127665528 +0100 -+++ wordpress/wp-admin/includes/update.php 2020-03-25 16:45:28.396269123 +0100 -@@ -338,12 +338,7 @@ function update_right_now_message() { - $cur = get_preferred_from_update_core(); - - if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { -- $msg .= sprintf( -- '%s ', -- network_admin_url( 'update-core.php' ), -- /* translators: %s: WordPress version number, or 'Latest' string. */ -- sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) -- ); -+ $msg .= ''; - } - } - -diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.old 2020-02-25 19:33:06.000000000 +0100 -+++ wordpress/wp-includes/load.php 2020-03-25 16:44:02.127665528 +0100 -@@ -1435,7 +1435,7 @@ function wp_is_file_mod_allowed( $contex - * @param bool $file_mod_allowed Whether file modifications are allowed. - * @param string $context The usage context. - */ -- return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context ); -+ return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context ); - } - - /** -diff -up wordpress/wp-includes/update.php.old wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.old 2020-02-10 04:30:06.000000000 +0100 -+++ wordpress/wp-includes/update.php 2020-03-25 16:44:02.127665528 +0100 -@@ -782,10 +782,6 @@ function _maybe_update_themes() { - * @since 3.1.0 - */ - function wp_schedule_update_checks() { -- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) { -- wp_schedule_event( time(), 'twicedaily', 'wp_version_check' ); -- } -- - if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) { - wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' ); - } diff --git a/wordpress-5.4-systemlibs.patch b/wordpress-5.4-systemlibs.patch deleted file mode 100644 index 6cbe5b1..0000000 --- a/wordpress-5.4-systemlibs.patch +++ /dev/null @@ -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(); diff --git a/wordpress-5.3-mediaelement_no_swf.patch b/wordpress-5.6-mediaelement_no_swf.patch similarity index 58% rename from wordpress-5.3-mediaelement_no_swf.patch rename to wordpress-5.6-mediaelement_no_swf.patch index 9442ddf..4ee0eec 100644 --- a/wordpress-5.3-mediaelement_no_swf.patch +++ b/wordpress-5.6-mediaelement_no_swf.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no 2019-10-08 18:06:02.000000000 +0200 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2019-11-13 07:59:39.418787150 +0100 -@@ -6410,6 +6410,7 @@ if (hasFlash) { +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no 2020-09-29 17:53:06.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2020-12-09 09:44:27.954254919 +0100 +@@ -6135,6 +6135,7 @@ if (hasFlash) { } }); @@ -9,18 +9,18 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wor var FlashMediaElementVideoRenderer = { name: 'flash_video', options: { -@@ -6494,6 +6495,7 @@ if (hasFlash) { +@@ -6219,6 +6220,7 @@ if (hasFlash) { create: FlashMediaElementRenderer.create }; _renderer.renderer.add(FlashMediaElementAudioOggRenderer); +*/ } - },{"10":10,"2":2,"27":27,"29":29,"3":3,"30":30,"7":7,"9":9}],23:[function(_dereq_,module,exports){ + },{"2":2,"25":25,"27":27,"28":28,"3":3,"5":5,"7":7,"8":8}],21:[function(_dereq_,module,exports){ diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-includes/js/mediaelement/mediaelement.js ---- wordpress/wp-includes/js/mediaelement/mediaelement.js.no 2019-10-08 18:06:02.000000000 +0200 -+++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2019-11-13 07:59:45.601728069 +0100 -@@ -2108,6 +2108,7 @@ if (hasFlash) { +--- wordpress/wp-includes/js/mediaelement/mediaelement.js.no 2020-09-29 17:53:06.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2020-12-09 09:44:38.532227178 +0100 +@@ -1842,6 +1842,7 @@ if (hasFlash) { } }); @@ -28,11 +28,11 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-i var FlashMediaElementVideoRenderer = { name: 'flash_video', options: { -@@ -2192,6 +2193,7 @@ if (hasFlash) { +@@ -1926,6 +1927,7 @@ if (hasFlash) { create: FlashMediaElementRenderer.create }; _renderer.renderer.add(FlashMediaElementAudioOggRenderer); +*/ } - },{"10":10,"18":18,"2":2,"20":20,"21":21,"3":3,"7":7,"9":9}],14:[function(_dereq_,module,exports){ + },{"16":16,"18":18,"19":19,"2":2,"3":3,"5":5,"7":7,"8":8}],12:[function(_dereq_,module,exports){ diff --git a/wordpress-5.2-hello.patch b/wordpress-6.8-hello.patch similarity index 90% rename from wordpress-5.2-hello.patch rename to wordpress-6.8-hello.patch index 5ccc2f5..32bdca9 100644 --- a/wordpress-5.2-hello.patch +++ b/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 */ diff --git a/wordpress-7.1-noupdate.patch b/wordpress-7.1-noupdate.patch new file mode 100644 index 0000000..d327e71 --- /dev/null +++ b/wordpress-7.1-noupdate.patch @@ -0,0 +1,91 @@ +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. + +-add_action( 'admin_notices', 'update_nag', 3 ); + 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 + * @return bool True if we should update to the offered version, otherwise false. + */ + public static function should_update_to_version( $offered_ver ) { ++ // RPM: nether allow core update ++ return false; ++ + 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 { + } + + // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. +- $disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED; ++ $disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED; + + /** + * 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, $ + */ + function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) { + // Please ensure that this is either 'direct', 'ssh2', 'ftpext', or 'ftpsockets'. +- $method = defined( 'FS_METHOD' ) ? FS_METHOD : false; ++ $method = defined( 'FS_METHOD' ) ? FS_METHOD : 'direct'; + + 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() { + $cur = get_preferred_from_update_core(); + + if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { +- $msg .= sprintf( +- '%s', +- network_admin_url( 'update-core.php' ), +- /* translators: %s: WordPress version number, or 'Latest' string. */ +- sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) +- ); ++ $msg .= ''; + } + } + +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. + */ +- return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context ); ++ return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context ); + } + + /** +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() { +- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) { +- wp_schedule_event( time(), 'twicedaily', 'wp_version_check' ); +- } +- + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) { + wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' ); + } 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-httpd-conf b/wordpress-httpd-conf index 3692823..dbefe97 100644 --- a/wordpress-httpd-conf +++ b/wordpress-httpd-conf @@ -5,31 +5,19 @@ Alias /wordpress /usr/share/wordpress AllowOverride Options - - # Apache 2.4 Require local - - - # Apache 2.2 - Order Deny,Allow - Deny from All - Allow from 127.0.0.1 - Allow from ::1 - # Deny access to any php file in the uploads directory - Order Deny,Allow - Deny from all + Require all denied # Deny access to any php file in the akismet directory - Order Deny,Allow - Deny from all + Require all denied diff --git a/wordpress-move-wp-content.patch b/wordpress-move-wp-content.patch deleted file mode 100644 index 54eb921..0000000 --- a/wordpress-move-wp-content.patch +++ /dev/null @@ -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. diff --git a/wordpress.spec b/wordpress.spec index 467aafd..e2d9f03 100644 --- a/wordpress.spec +++ b/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.5.3 +%global upstream_version 7.1 #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,18 +32,13 @@ 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' Patch3: wordpress-5.1-tinymce_noflash.patch # We drop the SWF files from mediaelement -Patch4: wordpress-5.3-mediaelement_no_swf.patch +Patch4: wordpress-5.6-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -54,11 +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.4-noupdate.patch -# Use system libraries -Patch7: wordpress-5.4-systemlibs.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 @@ -66,53 +57,50 @@ 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-simplepie >= 1.3.1 -Requires: php-getid3 Requires: php-ctype Requires: php-filter 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 -# Unbundled libraries -Requires: php-phpmailer6 Requires: httpd -Requires: ca-certificates +# Unbundled +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.9.0 +# grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php +Provides: bundled(php-getid3) = 1.9.25 +# grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php +Provides: bundled(php-phpmailer) = 7.1.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 + %description Wordpress is an online publishing / weblog package that makes it very easy, almost trivial, to get information out to people on the web. @@ -134,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} \ @@ -176,12 +160,17 @@ 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 ' VERSION ' wp-includes/SimplePie/src/SimplePie.php +grep ' VERSION ' wp-includes/ID3/getid3.php +grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php + %build @@ -189,9 +178,7 @@ sed -i -e 's/\r//' license.txt # 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 @@ -212,48 +199,28 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # These are docs, remove them from here, docify them later rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} -# Remove bundled php-simplepie and link to system copy -rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie -ln -s /usr/share/php/php-simplepie/autoloader.php \ - ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php - -# Remove bundled PHPMailer and link to system one -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer -ln -s /usr/share/php/PHPMailer/PHPMailer6 \ - ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer - -# Remove bundled php-getid3 -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 - # 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 find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \ -print -delete -## Move wp-content directory to /var/www location -#mkdir -p ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress -#mv -v ${RPM_BUILD_ROOT}%%{wp_content}/ \ -# ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress -#%%post -#if [ $1 -eq 2 ] ; then -## In case user has old wp-content from previous version, move it to -## the new location. -#mv -uf %%{wp_content}/* %%{_localstatedir}/www/wordpress/ -#/sbin/restorecon -R %%{_localstatedir}/www/wordpress/ -#fi +%pretrans -p +-- Remove link to system library +path = "%{_datadir}/wordpress/wp-includes/PHPMailer" +st = posix.stat(path) +if st and st.type == "link" then + os.remove(path) +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 @@ -278,12 +245,223 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %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 + +* Mon May 5 2025 Remi Collet - 6.8.1-1 +- WordPress 6.8.1 Maintenance Release + +* Wed Apr 16 2025 Remi Collet - 6.8-1 +- WordPress 6.8 “Cecil” + +* Wed Feb 12 2025 Remi Collet - 6.7.2-1 +- WordPress 6.7.2 Maintenance Release + +* Sun Jan 19 2025 Fedora Release Engineering - 6.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Nov 22 2024 Remi Collet - 6.7.1-1 +- WordPress 6.7.1 Maintenance Release + +* Wed Nov 13 2024 Remi Collet - 6.7-1 +- WordPress 6.7 “Rollins” + +* Wed Sep 11 2024 Remi Collet - 6.6.2-1 +- WordPress 6.6.2 Maintenance Release + +* Wed Jul 24 2024 Remi Collet - 6.6.1-1 +- WordPress 6.6.1 Maintenance Release + +* Sat Jul 20 2024 Fedora Release Engineering - 6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 17 2024 Remi Collet - 6.6-1 +- WordPress 6.6 “Dorsey” + +* Tue Jul 2 2024 Remi Collet - 6.5.5-1 +- WordPress 6.4.2 Maintenance & Security Release + +* Thu Jun 6 2024 Remi Collet - 6.5.4-1 +- WordPress 6.5.4 Maintenance Release + +* Mon May 13 2024 Remi Collet - 6.5.3-1 +- WordPress 6.5.3 Maintenance Release + +* Wed Apr 10 2024 Remi Collet - 6.5.2-1 +- WordPress 6.5.2 Maintenance and Security Release + +* Wed Apr 3 2024 Remi Collet - 6.5-1 +- WordPress 6.5 “Regina” + +* Thu Feb 1 2024 Remi Collet - 6.4.3-1 +- WordPress 6.4.3 Maintenance & Security Release + +* Sat Jan 27 2024 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* 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 + +* 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 + +* 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” + +* Sat Jul 22 2023 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* 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 + +* Thu Mar 30 2023 Remi Collet - 6.2-1 +- WordPress 6.2 “Dolphy” +- use SPDX license IDs + +* Sat Jan 21 2023 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 16 2022 Remi Collet - 6.1.1-1 +- WordPress 6.1.1 Maintenance Release + +* Wed Nov 2 2022 Remi Collet - 6.1-1 +- WordPress 6.1 “Misha” + +* Tue Oct 18 2022 Remi Collet - 6.0.3-1 +- WordPress 6.0.3 Security Release + +* Thu Sep 8 2022 Remi Collet - 6.0.2-1 +- WordPress 6.0.2 Security and Maintenance Release + +* Sat Jul 23 2022 Fedora Release Engineering - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Remi Collet - 6.0.1-1 +- WordPress 6.0.1 Maintenance Release + +* Wed May 25 2022 Remi Collet - 6.0-1 +- WordPress 6.0 “Arturo” + +* Wed Apr 6 2022 Remi Collet - 5.9.3-1 +- WordPress 5.9.3 Maintenance Release + +* Fri Mar 11 2022 Remi Collet - 5.9.2-1 +- WordPress 5.9.2 Security & Maintenance Release + +* Wed Feb 23 2022 Remi Collet - 5.9.1-1 +- WordPress 5.9.1 Maintenance Release + +* Wed Jan 26 2022 Remi Collet - 5.9-1 +- WordPress 5.9 Josephine + +* Sat Jan 22 2022 Fedora Release Engineering - 5.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 7 2022 Remi Collet - 5.8.3-1 +- WordPress 5.8.3 Security Release + +* Tue Dec 7 2021 Remi Collet - 5.8.2-2 +- use bundled libraries + +* Thu Nov 11 2021 Remi Collet - 5.8.2-1 +- WordPress 5.8.2 Security and Maintenance Release + +* Thu Sep 9 2021 Remi Collet - 5.8.1-1 +- WordPress 5.8.1 Security and Maintenance Release + +* Fri Jul 23 2021 Fedora Release Engineering - 5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Remi Collet - 5.8-1 +- WordPress 5.8 Tatum + +* Thu May 13 2021 Remi Collet - 5.7.2-1 +- WordPress 5.7.2 Security Release + +* Thu Apr 15 2021 Remi Collet - 5.7.1-1 +- WordPress 5.7.1 Security and Maintenance Release + +* Wed Mar 10 2021 Remi Collet - 5.7-1 +- WordPress 5.7 “Esperanza” + +* Tue Feb 23 2021 Remi Collet - 5.6.2-1 +- WordPress 5.6.2 Maintenance Release + +* Fri Feb 5 2021 Remi Collet - 5.6.1-1 +- WordPress 5.6.1 Maintenance Release + +* Wed Jan 27 2021 Fedora Release Engineering - 5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 9 2020 Remi Collet - 5.6-1 +- WordPress 5.6 “Simone” + * Sat Oct 31 2020 Remi Collet - 5.5.3-1 - WordPress 5.5.3 Maintenance Release * Fri Oct 30 2020 Remi Collet - 5.5.2-1 - WordPress 5.5.2 Security and Maintenance Release +* Tue Oct 20 2020 Remi Collet - 5.5.1-2 +- Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644 + * Wed Sep 2 2020 Remi Collet - 5.5.1-1 - WordPress 5.5.1 Maintenance Release @@ -291,6 +469,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig - WordPress 5.5 “Eckstine” - requires php-phpmailer6 instead of old php-PHPMailer +* Wed Jul 29 2020 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 11 2020 Remi Collet - 5.4.2-1 - WordPress 5.4.2 Security and Maintenance Release @@ -300,6 +481,15 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig * Wed Apr 1 2020 Remi Collet - 5.4-1 - WordPress 5.4 “Adderley” +* Mon Mar 30 2020 Remi Collet - 5.4~rc5-1 +- WordPress 5.4 RC 5 + +* Wed Mar 25 2020 Remi Collet - 5.4~rc4-1 +- WordPress 5.4 RC 4 + +* Fri Jan 31 2020 Fedora Release Engineering - 5.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 19 2019 Remi Collet - 5.3.2-1 - WordPress 5.3.2 Maintenance Release