From bc5002d4e062e0956f4131fc07d964ced6c1b61d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Jan 2022 09:47:27 +0100 Subject: [PATCH] WordPress 5.9 Josephine (cherry picked from commit fa826e94113d6f5ede1f3fb0bb7f919487f8e927) --- sources | 2 +- wordpress-5.4-systemlibs.patch | 21 --------------------- wordpress-move-wp-content.patch | 30 ------------------------------ wordpress.spec | 19 +++++++------------ 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 wordpress-5.4-systemlibs.patch delete mode 100644 wordpress-move-wp-content.patch diff --git a/sources b/sources index 9dac3f0..63d0ba9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.3.tar.gz) = 08ebf959d9ae8ca33bee86fec222fb0266dc10bf6db4ed1ebeb7886a422abd838cbcc4d004002dea2c923c7a0822a1f410881b01f2e234560836b1635d98718b +SHA512 (wordpress-5.9.tar.gz) = 10530ecc073b6793f1e3c3711160af0e45868a2a84585b1dcb4b643bd1346648c7ed53774f805841c49bf806986ab5db4b244f72688fc6c55a9f9d2f2ab60571 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-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 e5a347a..cfd333a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8.3 +%global upstream_version 5.9 #global upstream_prever RC5 #global upstream_lower rc5 @@ -35,9 +35,6 @@ 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 # Adjust tinymce's media plugin not to use its SWF plugin. This changes @@ -55,8 +52,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 @@ -109,11 +104,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.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.20 +Provides: bundled(php-getid3) = 1.9.21 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.5.0 +Provides: bundled(php-phpmailer) = 6.5.3 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -140,13 +135,10 @@ rm -rf wp-includes/random_compat rm -rf wp-includes/sodium_compat %patch0 -p1 -b .dolly -#patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 # Adjust mediaelement not to use its SWF %patch4 -p1 -#rm wp-includes/js/mediaelement/media*swf -%patch7 -p1 %patch8 -p1 # We patch .js files, so minify them @@ -270,6 +262,9 @@ end %changelog +* Wed Jan 26 2022 Remi Collet - 5.9-1 +- WordPress 5.9 Josephine + * Fri Jan 7 2022 Remi Collet - 5.8.3-1 - WordPress 5.8.3 Security Release