From 689a350c61dcdf5fe09ae3d75605318767e295f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 15 Oct 2019 08:00:07 +0200
Subject: [PATCH 01/11] WordPress 5.2.4 Security Release

(cherry picked from commit dce3e0cbdce3abc5127b5bf9cac5bc57f49940b5)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index b2a0b3a..7778840 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.2.3.tar.gz) = 4fb37cb5b5bafbbb556910a69bbe3c83163c660e0186b1a30e095c1fc5950b8474592f17b743f0fb8a4f23f0f0080d3c92f0c45a2a1388911e69994d9c8a2194
+SHA512 (wordpress-5.2.4.tar.gz) = eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0
diff --git a/wordpress.spec b/wordpress.spec
index 2a89f26..4f6561a 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.2.3
+%global upstream_version 5.2.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 5.2.4-1
+- WordPress 5.2.4 Security Release
+
 * Thu Sep  5 2019 Remi Collet <remi@remirepo.net> - 5.2.3-1
 - WordPress 5.2.3 Security and Maintenance Release
 

From 8b1a4b4e2311812bafccdd8cc0a1fcf00f359e87 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 13 Nov 2019 08:14:19 +0100
Subject: [PATCH 02/11] =?UTF-8?q?WordPress=205.3=20=E2=80=9CKirk=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 21ec765605e3ccd6f0914bb0de648a8147c1ee9c)
---
 sources                                       |  2 +-
 wordpress-4.9-mediaelement_no_swf.patch       | 38 --------------
 wordpress-5.1-systemlibs.patch                | 21 --------
 wordpress-5.3-mediaelement_no_swf.patch       | 38 ++++++++++++++
 ...date.patch => wordpress-5.3-noupdate.patch | 51 ++++++++++---------
 wordpress-5.3-systemlibs.patch                | 21 ++++++++
 wordpress.spec                                | 11 ++--
 7 files changed, 95 insertions(+), 87 deletions(-)
 delete mode 100644 wordpress-4.9-mediaelement_no_swf.patch
 delete mode 100644 wordpress-5.1-systemlibs.patch
 create mode 100644 wordpress-5.3-mediaelement_no_swf.patch
 rename wordpress-5.2-noupdate.patch => wordpress-5.3-noupdate.patch (53%)
 create mode 100644 wordpress-5.3-systemlibs.patch

diff --git a/sources b/sources
index 7778840..b036caa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.2.4.tar.gz) = eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0
+SHA512 (wordpress-5.3.tar.gz) = 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07
diff --git a/wordpress-4.9-mediaelement_no_swf.patch b/wordpress-4.9-mediaelement_no_swf.patch
deleted file mode 100644
index afe3527..0000000
--- a/wordpress-4.9-mediaelement_no_swf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js
---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old	2017-11-16 09:22:17.148277728 +0100
-+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js	2017-11-16 09:23:42.056696625 +0100
-@@ -6121,6 +6121,7 @@ if (hasFlash) {
- 		}
- 	});
- 
-+/* swf files removed from RPM
- 	var FlashMediaElementVideoRenderer = {
- 		name: 'flash_video',
- 		options: {
-@@ -6205,6 +6206,7 @@ if (hasFlash) {
- 		create: FlashMediaElementRenderer.create
- 	};
- 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
-+*/
- }
- 
- },{"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.old wordpress/wp-includes/js/mediaelement/mediaelement.js
---- wordpress/wp-includes/js/mediaelement/mediaelement.js.old	2017-11-16 09:24:44.984007081 +0100
-+++ wordpress/wp-includes/js/mediaelement/mediaelement.js	2017-11-16 09:24:49.655030123 +0100
-@@ -1839,6 +1839,7 @@ if (hasFlash) {
- 		}
- 	});
- 
-+/* swf files removed from RPM
- 	var FlashMediaElementVideoRenderer = {
- 		name: 'flash_video',
- 		options: {
-@@ -1923,6 +1924,7 @@ if (hasFlash) {
- 		create: FlashMediaElementRenderer.create
- 	};
- 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
-+*/
- }
- 
- },{"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.1-systemlibs.patch b/wordpress-5.1-systemlibs.patch
deleted file mode 100644
index 6819e34..0000000
--- a/wordpress-5.1-systemlibs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up wordpress/wp-admin/includes/media.php.orig wordpress/wp-admin/includes/media.php
---- wordpress/wp-admin/includes/media.php.orig	2019-02-21 15:01:56.055165397 +0100
-+++ wordpress/wp-admin/includes/media.php	2019-02-21 15:02:41.288395787 +0100
-@@ -3261,7 +3261,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();
- 	$data = $id3->analyze( $file );
-@@ -3358,7 +3358,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();
- 	$data = $id3->analyze( $file );
diff --git a/wordpress-5.3-mediaelement_no_swf.patch b/wordpress-5.3-mediaelement_no_swf.patch
new file mode 100644
index 0000000..9442ddf
--- /dev/null
+++ b/wordpress-5.3-mediaelement_no_swf.patch
@@ -0,0 +1,38 @@
+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) {
+ 		}
+ 	});
+ 
++/* swf files removed from RPM
+ 	var FlashMediaElementVideoRenderer = {
+ 		name: 'flash_video',
+ 		options: {
+@@ -6494,6 +6495,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){
+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) {
+ 		}
+ 	});
+ 
++/* swf files removed from RPM
+ 	var FlashMediaElementVideoRenderer = {
+ 		name: 'flash_video',
+ 		options: {
+@@ -2192,6 +2193,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){
diff --git a/wordpress-5.2-noupdate.patch b/wordpress-5.3-noupdate.patch
similarity index 53%
rename from wordpress-5.2-noupdate.patch
rename to wordpress-5.3-noupdate.patch
index 68f6fb7..f59cfdb 100644
--- a/wordpress-5.2-noupdate.patch
+++ b/wordpress-5.3-noupdate.patch
@@ -1,7 +1,7 @@
-diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php
---- wordpress/wp-admin/includes/admin-filters.php.rpm	2019-03-28 15:12:21.157820497 +0100
-+++ wordpress/wp-admin/includes/admin-filters.php	2019-03-28 15:12:41.792928559 +0100
-@@ -116,7 +116,6 @@ add_action( 'personal_options_update', '
+diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/includes/admin-filters.php
+--- wordpress/wp-admin/includes/admin-filters.php.no	2019-05-26 22:50:53.000000000 +0200
++++ wordpress/wp-admin/includes/admin-filters.php	2019-11-13 08:04:53.832484254 +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.
  
@@ -9,9 +9,9 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/in
  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.rpm wordpress/wp-admin/includes/class-core-upgrader.php
---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm	2019-03-28 00:05:54.000000000 +0100
-+++ wordpress/wp-admin/includes/class-core-upgrader.php	2019-03-28 15:12:21.157820497 +0100
+diff -up wordpress/wp-admin/includes/class-core-upgrader.php.no wordpress/wp-admin/includes/class-core-upgrader.php
+--- wordpress/wp-admin/includes/class-core-upgrader.php.no	2019-09-03 02:41:05.000000000 +0200
++++ wordpress/wp-admin/includes/class-core-upgrader.php	2019-11-13 08:04:53.832484254 +0100
 @@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader
  	 * @return bool True if we should update to the offered version, otherwise false.
  	 */
@@ -22,9 +22,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad
  		include( 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.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php
---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm	2018-08-30 15:36:25.000000000 +0200
-+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2019-03-28 15:12:21.158820502 +0100
+diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress/wp-admin/includes/class-wp-automatic-updater.php
+--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.no	2019-09-03 02:41:05.000000000 +0200
++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2019-11-13 08:04:53.832484254 +0100
 @@ -38,7 +38,7 @@ class WP_Automatic_Updater {
  		}
  
@@ -34,22 +34,27 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres
  
  		/**
  		 * Filters whether to entirely disable background updates.
-diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.rpm	2019-03-22 02:08:51.000000000 +0100
-+++ wordpress/wp-admin/includes/update.php	2019-03-28 15:12:21.158820502 +0100
-@@ -301,7 +301,7 @@ function update_right_now_message() {
+diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/update.php
+--- wordpress/wp-admin/includes/update.php.no	2019-11-13 08:04:53.833484244 +0100
++++ wordpress/wp-admin/includes/update.php	2019-11-13 08:06:54.383296231 +0100
+@@ -314,12 +314,7 @@ function update_right_now_message() {
  		$cur = get_preferred_from_update_core();
  
  		if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
--			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+-			$msg .= sprintf(
+-				'<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' ) )
+-			);
 +			$msg .= '';
  		}
  	}
  
-diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
---- wordpress/wp-includes/load.php.rpm	2019-03-27 01:03:51.000000000 +0100
-+++ wordpress/wp-includes/load.php	2019-03-28 15:12:21.158820502 +0100
-@@ -1418,7 +1418,7 @@ function wp_is_file_mod_allowed( $contex
+diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php
+--- wordpress/wp-includes/load.php.no	2019-09-19 14:02:58.000000000 +0200
++++ wordpress/wp-includes/load.php	2019-11-13 08:04:53.833484244 +0100
+@@ -1422,7 +1422,7 @@ function wp_is_file_mod_allowed( $contex
  	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
  	 * @param string $context          The usage context.
  	 */
@@ -58,10 +63,10 @@ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
  }
  
  /**
-diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.rpm	2019-01-16 04:38:49.000000000 +0100
-+++ wordpress/wp-includes/update.php	2019-03-28 15:12:21.158820502 +0100
-@@ -770,10 +770,6 @@ function _maybe_update_themes() {
+diff -up wordpress/wp-includes/update.php.no wordpress/wp-includes/update.php
+--- wordpress/wp-includes/update.php.no	2019-09-03 02:41:05.000000000 +0200
++++ wordpress/wp-includes/update.php	2019-11-13 08:04:53.833484244 +0100
+@@ -781,10 +781,6 @@ function _maybe_update_themes() {
   * @since 3.1.0
   */
  function wp_schedule_update_checks() {
diff --git a/wordpress-5.3-systemlibs.patch b/wordpress-5.3-systemlibs.patch
new file mode 100644
index 0000000..41fca12
--- /dev/null
+++ b/wordpress-5.3-systemlibs.patch
@@ -0,0 +1,21 @@
+diff -up wordpress/wp-admin/includes/media.php.no wordpress/wp-admin/includes/media.php
+--- wordpress/wp-admin/includes/media.php.no	2019-11-13 08:01:19.298917453 +0100
++++ wordpress/wp-admin/includes/media.php	2019-11-13 08:02:18.118385610 +0100
+@@ -3447,7 +3447,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();
+@@ -3558,7 +3558,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.spec b/wordpress.spec
index 4f6561a..9b9de1f 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.2.4
+%global upstream_version 5.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -50,7 +50,7 @@ Patch2: wordpress-5.1-no_swfupload.patch
 # to 'false'
 Patch3: wordpress-5.1-tinymce_noflash.patch
 # We drop the SWF files from mediaelement
-Patch4: wordpress-4.9-mediaelement_no_swf.patch
+Patch4: wordpress-5.3-mediaelement_no_swf.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
@@ -59,9 +59,9 @@ Patch5: wordpress-5.1-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.2-noupdate.patch
+Patch6: wordpress-5.3-noupdate.patch
 # Use system libraries
-Patch7: wordpress-5.1-systemlibs.patch
+Patch7: wordpress-5.3-systemlibs.patch
 # Debian patch for jshint
 Patch8: wordpress-5.1-remove-jshint-refs.patch
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 5.3-1
+- WordPress 5.3 “Kirk”
+
 * Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 5.2.4-1
 - WordPress 5.2.4 Security Release
 

From f7249ddf37885036901a3fd3b8695fa3c60d736f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 13 Dec 2019 08:27:19 +0100
Subject: [PATCH 03/11] WordPress 5.3.1 Security and Maintenance Release

(cherry picked from commit b26e7ca65485badddc4010af7b44b92400129237)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index b036caa..6e35b57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.3.tar.gz) = 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07
+SHA512 (wordpress-5.3.1.tar.gz) = 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a
diff --git a/wordpress.spec b/wordpress.spec
index 9b9de1f..abe13fc 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.3
+%global upstream_version 5.3.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 5.3.1-1
+- WordPress 5.3.1 Security and Maintenance Release
+
 * Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 5.3-1
 - WordPress 5.3 “Kirk”
 

From 1109067f72a010e4ff1d7f62910e2b7a843d805a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 19 Dec 2019 07:27:07 +0100
Subject: [PATCH 04/11] WordPress 5.3.2 Maintenance Release

(cherry picked from commit 6937d88230770ac567eecb9cd62a55c6e3a1c861)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 6e35b57..f41f92b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.3.1.tar.gz) = 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a
+SHA512 (wordpress-5.3.2.tar.gz) = d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198
diff --git a/wordpress.spec b/wordpress.spec
index abe13fc..01d9f12 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.3.1
+%global upstream_version 5.3.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Thu Dec 19 2019 Remi Collet <remi@remirepo.net> - 5.3.2-1
+- WordPress 5.3.2 Maintenance Release
+
 * Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 5.3.1-1
 - WordPress 5.3.1 Security and Maintenance Release
 

From 0fe52ca036ea5d0f8abf90aec4a4fe4045e246fd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 26 Mar 2020 08:09:43 +0100
Subject: [PATCH 05/11] =?UTF-8?q?WordPress=205.4=20=E2=80=9CAdderley?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 34e0afd74f45c2bd64d6805cd4f8b1f4386b68b6)
---
 sources                                       |  2 +-
 wordpress-5.3-systemlibs.patch                | 21 --------
 ...config.patch => wordpress-5.4-config.patch |  8 +--
 ....patch => wordpress-5.4-no_swfupload.patch | 10 ++--
 ...date.patch => wordpress-5.4-noupdate.patch | 50 +++++++++----------
 wordpress-5.4-systemlibs.patch                | 21 ++++++++
 wordpress.spec                                | 17 ++++---
 7 files changed, 66 insertions(+), 63 deletions(-)
 delete mode 100644 wordpress-5.3-systemlibs.patch
 rename wordpress-5.1-config.patch => wordpress-5.4-config.patch (78%)
 rename wordpress-5.1-no_swfupload.patch => wordpress-5.4-no_swfupload.patch (70%)
 rename wordpress-5.3-noupdate.patch => wordpress-5.4-noupdate.patch (54%)
 create mode 100644 wordpress-5.4-systemlibs.patch

diff --git a/sources b/sources
index f41f92b..13ccea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.3.2.tar.gz) = d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198
+SHA512 (wordpress-5.4.tar.gz) = 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8
diff --git a/wordpress-5.3-systemlibs.patch b/wordpress-5.3-systemlibs.patch
deleted file mode 100644
index 41fca12..0000000
--- a/wordpress-5.3-systemlibs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up wordpress/wp-admin/includes/media.php.no wordpress/wp-admin/includes/media.php
---- wordpress/wp-admin/includes/media.php.no	2019-11-13 08:01:19.298917453 +0100
-+++ wordpress/wp-admin/includes/media.php	2019-11-13 08:02:18.118385610 +0100
-@@ -3447,7 +3447,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();
-@@ -3558,7 +3558,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.1-config.patch b/wordpress-5.4-config.patch
similarity index 78%
rename from wordpress-5.1-config.patch
rename to wordpress-5.4-config.patch
index a10109e..2c458f4 100644
--- a/wordpress-5.1-config.patch
+++ b/wordpress-5.4-config.patch
@@ -1,6 +1,6 @@
-diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
---- wordpress/wp-config.php.orig	2019-02-21 15:07:29.558863904 +0100
-+++ wordpress/wp-config.php	2019-02-21 15:07:37.024901925 +0100
+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
  $table_prefix = 'wp_';
  
@@ -25,7 +25,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
  
  /** Absolute path to the WordPress directory. */
  if ( ! defined( 'ABSPATH' ) ) {
--	define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+-	define( 'ABSPATH', __DIR__ . '/' );
 +	define('ABSPATH', '/usr/share/wordpress');
  }
  
diff --git a/wordpress-5.1-no_swfupload.patch b/wordpress-5.4-no_swfupload.patch
similarity index 70%
rename from wordpress-5.1-no_swfupload.patch
rename to wordpress-5.4-no_swfupload.patch
index 932ddee..3683cb7 100644
--- a/wordpress-5.1-no_swfupload.patch
+++ b/wordpress-5.4-no_swfupload.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-21 14:57:23.338776485 +0100
-+++ wordpress/wp-includes/script-loader.php	2019-02-21 14:57:25.832789185 +0100
-@@ -1098,12 +1098,6 @@ function wp_default_scripts( &$scripts )
+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.
+-	// 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' );
diff --git a/wordpress-5.3-noupdate.patch b/wordpress-5.4-noupdate.patch
similarity index 54%
rename from wordpress-5.3-noupdate.patch
rename to wordpress-5.4-noupdate.patch
index f59cfdb..a996046 100644
--- a/wordpress-5.3-noupdate.patch
+++ b/wordpress-5.4-noupdate.patch
@@ -1,6 +1,6 @@
-diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/includes/admin-filters.php
---- wordpress/wp-admin/includes/admin-filters.php.no	2019-05-26 22:50:53.000000000 +0200
-+++ wordpress/wp-admin/includes/admin-filters.php	2019-11-13 08:04:53.832484254 +0100
+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.
@@ -9,22 +9,22 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/inc
  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.no wordpress/wp-admin/includes/class-core-upgrader.php
---- wordpress/wp-admin/includes/class-core-upgrader.php.no	2019-09-03 02:41:05.000000000 +0200
-+++ wordpress/wp-admin/includes/class-core-upgrader.php	2019-11-13 08:04:53.832484254 +0100
-@@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader
+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;
 +
- 		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
+ 		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.no wordpress/wp-admin/includes/class-wp-automatic-updater.php
---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.no	2019-09-03 02:41:05.000000000 +0200
-+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2019-11-13 08:04:53.832484254 +0100
+ 		$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 {
  		}
  
@@ -34,13 +34,13 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress
  
  		/**
  		 * Filters whether to entirely disable background updates.
-diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.no	2019-11-13 08:04:53.833484244 +0100
-+++ wordpress/wp-admin/includes/update.php	2019-11-13 08:06:54.383296231 +0100
-@@ -314,12 +314,7 @@ function update_right_now_message() {
+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 ) && $cur->response == 'upgrade' ) {
+ 		if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
 -			$msg .= sprintf(
 -				'<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
 -				network_admin_url( 'update-core.php' ),
@@ -51,10 +51,10 @@ diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/u
  		}
  	}
  
-diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php
---- wordpress/wp-includes/load.php.no	2019-09-19 14:02:58.000000000 +0200
-+++ wordpress/wp-includes/load.php	2019-11-13 08:04:53.833484244 +0100
-@@ -1422,7 +1422,7 @@ function wp_is_file_mod_allowed( $contex
+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.
  	 */
@@ -63,10 +63,10 @@ diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php
  }
  
  /**
-diff -up wordpress/wp-includes/update.php.no wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.no	2019-09-03 02:41:05.000000000 +0200
-+++ wordpress/wp-includes/update.php	2019-11-13 08:04:53.833484244 +0100
-@@ -781,10 +781,6 @@ function _maybe_update_themes() {
+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() {
diff --git a/wordpress-5.4-systemlibs.patch b/wordpress-5.4-systemlibs.patch
new file mode 100644
index 0000000..6cbe5b1
--- /dev/null
+++ b/wordpress-5.4-systemlibs.patch
@@ -0,0 +1,21 @@
+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.spec b/wordpress.spec
index 01d9f12..1fce18f 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,9 +18,9 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.3.2
-#global upstream_prever  RC1
-#global upstream_lower   rc1
+%global upstream_version 5.4
+#global upstream_prever  RC5
+#global upstream_lower   rc5
 
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
@@ -44,7 +44,7 @@ Patch0: wordpress-5.2-hello.patch
 # 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.1-no_swfupload.patch
+Patch2: wordpress-5.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'
@@ -54,14 +54,14 @@ Patch4: wordpress-5.3-mediaelement_no_swf.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
-Patch5: wordpress-5.1-config.patch
+Patch5: wordpress-5.4-config.patch
 # RPM are readonly
 # disable version check and updated
 # change DISALLOW_FILE_MODS default value to true
 # ignore WP_AUTO_UPDATE_CORE (always false)
-Patch6: wordpress-5.3-noupdate.patch
+Patch6: wordpress-5.4-noupdate.patch
 # Use system libraries
-Patch7: wordpress-5.3-systemlibs.patch
+Patch7: wordpress-5.4-systemlibs.patch
 # Debian patch for jshint
 Patch8: wordpress-5.1-remove-jshint-refs.patch
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Wed Apr  1 2020 Remi Collet <remi@remirepo.net> - 5.4-1
+- WordPress 5.4 “Adderley”
+
 * Thu Dec 19 2019 Remi Collet <remi@remirepo.net> - 5.3.2-1
 - WordPress 5.3.2 Maintenance Release
 

From b078f15f1cf866b91e36eadad4a617c05aa3831a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 30 Apr 2020 07:58:01 +0200
Subject: [PATCH 06/11] v5.4.1

(cherry picked from commit f072d1eb172450953cd2733e5ef26f18eed4308c)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 13ccea3..b570e35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.4.tar.gz) = 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8
+SHA512 (wordpress-5.4.1.tar.gz) = 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd
diff --git a/wordpress.spec b/wordpress.spec
index 1fce18f..648fbde 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.4
+%global upstream_version 5.4.1
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Thu Apr 30 2020 Remi Collet <remi@remirepo.net> - 5.4.1-1
+- WordPress 5.4.1 Security and Maintenance Release
+
 * Wed Apr  1 2020 Remi Collet <remi@remirepo.net> - 5.4-1
 - WordPress 5.4 “Adderley”
 

From b8c7f743eef1ec00b5ccdb723163046e6b2c1670 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 11 Jun 2020 07:00:37 +0200
Subject: [PATCH 07/11] WordPress 5.4.2 Security and Maintenance Release

(cherry picked from commit b559bfa93be366b90a1c6f7434bdc04f43327f31)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index b570e35..afbed23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.4.1.tar.gz) = 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd
+SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219
diff --git a/wordpress.spec b/wordpress.spec
index 648fbde..22dd398 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.4.1
+%global upstream_version 5.4.2
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Thu Jun 11 2020 Remi Collet <remi@remirepo.net> - 5.4.2-1
+- WordPress 5.4.2 Security and Maintenance Release
+
 * Thu Apr 30 2020 Remi Collet <remi@remirepo.net> - 5.4.1-1
 - WordPress 5.4.1 Security and Maintenance Release
 

From 913521c822355667a0085d74ddafda8eb7f59b9a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 12 Aug 2020 09:40:40 +0200
Subject: [PATCH 08/11] =?UTF-8?q?WordPress=205.5=20=E2=80=9CEckstine?=
 =?UTF-8?q?=E2=80=9D=20requires=20php-phpmailer6=20instead=20of=20old=20ph?=
 =?UTF-8?q?p-PHPMailer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8fc4eba2f3c4bf10dfa91bffb5711f3cc24e4407)
(cherry picked from commit 50af1532e86f9592e14b4801f72966e6570dec71)
---
 sources        |  2 +-
 wordpress.spec | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sources b/sources
index afbed23..efbd492 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219
+SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865
diff --git a/wordpress.spec b/wordpress.spec
index 22dd398..b60f75f 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.4.2
+%global upstream_version 5.5
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -120,7 +120,7 @@ Requires: php-xmlreader
 Requires: php-zip
 Requires: php-zlib
 # Unbundled libraries
-Requires: php-PHPMailer
+Requires: php-phpmailer6
 Requires: httpd
 Requires: ca-certificates
 Provides: wordpress-mu = %{version}-%{release}
@@ -234,12 +234,9 @@ 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
-# Note POP3 is not from PHPMailer but from SquirrelMail
-for fic in phpmailer smtp; do
-  rm     ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
-  ln -sf /usr/share/php/PHPMailer/class.$fic.php \
-         ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
-done
+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
@@ -296,6 +293,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Wed Aug 12 2020 Remi Collet <remi@remirepo.net> - 5.5-1
+- WordPress 5.5 “Eckstine”
+- requires php-phpmailer6 instead of old php-PHPMailer
+
 * Thu Jun 11 2020 Remi Collet <remi@remirepo.net> - 5.4.2-1
 - WordPress 5.4.2 Security and Maintenance Release
 

From a8ffbacc31864d3c452e2f98c07f9c5a5d6548ec Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 2 Sep 2020 12:34:15 +0200
Subject: [PATCH 09/11] WordPress 5.5.1 Maintenance Release

(cherry picked from commit 5cfa3510923dc0cd136b09965d419dc2c27af2fc)
---
 sources        |  2 +-
 wordpress.spec | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/sources b/sources
index efbd492..ab1bf0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865
+SHA512 (wordpress-5.5.1.tar.gz) = 11285e6e776756185814cde905986ce01f586d159fb06de5d16463cec544c8b3b85a695af51e9de71cbcd79f039ed8f6da233a8e82f5ee797d5124983b6ff0d3
diff --git a/wordpress.spec b/wordpress.spec
index b60f75f..7d747a7 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -13,12 +13,7 @@
 %else
 %global with_nginx 0
 %endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-%global clean_compat 1
-%else
-%global clean_compat 0
-%endif
-%global upstream_version 5.5
+%global upstream_version 5.5.1
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -69,11 +64,7 @@ Patch8: wordpress-5.1-remove-jshint-refs.patch
 BuildArch: noarch
 BuildRequires: php-cli
 BuildRequires: php-patchwork-jsqueeze
-%if %{clean_compat}
 BuildRequires: php(language) >= 7.2
-%else
-BuildRequires: php(language) >= 5.6.20
-%endif
 
 %if %{with_nginx}
 Requires: webserver
@@ -85,12 +76,8 @@ Requires: nginx-filesystem
 %else
 Requires: php
 %endif
-%if %{clean_compat}
 Requires: php(language) >= 7.2
 Requires: php-sodium
-%else
-Requires: php(language) >= 5.6.20
-%endif
 Requires: php-simplepie >= 1.3.1
 Requires: php-getid3
 Requires: php-ctype
@@ -142,12 +129,10 @@ rm -rf wp-includes/js/swfupload
 # remove .htaccess, protected by httpd config file
 rm wp-content/plugins/akismet/.htaccess
 
-%if %{clean_compat}
 # only for PHP < 7.0 without random_int
 rm -rf wp-includes/random_compat
 # only for PHP < 7.2 without sodium_crypto_box
 rm -rf wp-includes/sodium_compat
-%endif
 
 %patch0 -p1 -b .dolly
 #patch1 -p1 -b .rhbz522897
@@ -293,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 5.5.1-1
+- WordPress 5.5.1 Maintenance Release
+
 * Wed Aug 12 2020 Remi Collet <remi@remirepo.net> - 5.5-1
 - WordPress 5.5 “Eckstine”
 - requires php-phpmailer6 instead of old php-PHPMailer

From 34f6a449c59654cf65fede865af5ac627cc19b60 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 30 Oct 2020 07:31:46 +0100
Subject: [PATCH 10/11] WordPress 5.5.2 Security and Maintenance Release

(cherry picked from commit fee741ab9f23f895faac4d99381533cf6a4439dd)
(cherry picked from commit 46bbba1b5ac53f5131126040be133df495dfdfe4)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index ab1bf0f..9090b07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.5.1.tar.gz) = 11285e6e776756185814cde905986ce01f586d159fb06de5d16463cec544c8b3b85a695af51e9de71cbcd79f039ed8f6da233a8e82f5ee797d5124983b6ff0d3
+SHA512 (wordpress-5.5.2.tar.gz) = cfbae0e04f6c1a22bbeb94a0cb1617d586516806cda111005fc5a098a8b568b5904118414a40252c6cd73f995c22adbeaa30d4159156ccdebda04f61d08d3913
diff --git a/wordpress.spec b/wordpress.spec
index 7d747a7..b78ea05 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -13,7 +13,7 @@
 %else
 %global with_nginx 0
 %endif
-%global upstream_version 5.5.1
+%global upstream_version 5.5.2
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Fri Oct 30 2020 Remi Collet <remi@remirepo.net> - 5.5.2-1
+- WordPress 5.5.2 Security and Maintenance Release
+
 * Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 5.5.1-1
 - WordPress 5.5.1 Maintenance Release
 

From a91cbeccb0f7e3d0f6a9dca5cf549095c0b495aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Nov 2020 07:27:13 +0100
Subject: [PATCH 11/11] WordPress 5.5.3 Maintenance Release

(cherry picked from commit 5105b4124cf9bac96faf281c119f4563124dc54a)
---
 sources        | 2 +-
 wordpress.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 9090b07..db145d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.5.2.tar.gz) = cfbae0e04f6c1a22bbeb94a0cb1617d586516806cda111005fc5a098a8b568b5904118414a40252c6cd73f995c22adbeaa30d4159156ccdebda04f61d08d3913
+SHA512 (wordpress-5.5.3.tar.gz) = acc96987e792c85f1a1e4fbc434dc10e6c648ba51d0239354d8ee398604db90c6dfa075b565ddb4ab15cb36d9e06095c93ce30027b3cb61b04ffe5986069da03
diff --git a/wordpress.spec b/wordpress.spec
index b78ea05..467aafd 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -13,7 +13,7 @@
 %else
 %global with_nginx 0
 %endif
-%global upstream_version 5.5.2
+%global upstream_version 5.5.3
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Sat Oct 31 2020 Remi Collet <remi@remirepo.net> - 5.5.3-1
+- WordPress 5.5.3 Maintenance Release
+
 * Fri Oct 30 2020 Remi Collet <remi@remirepo.net> - 5.5.2-1
 - WordPress 5.5.2 Security and Maintenance Release