From ef3a22d1f44d723ba6e3ef11174995aaf2f52f0b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 21 Feb 2019 15:22:08 +0100
Subject: [PATCH 01/13] =?UTF-8?q?WordPress=205.1=20=E2=80=9CBetty=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 10 ----
 sources                                       |  2 +-
 strip.sh                                      | 33 -----------
 wordpress-4.4-systemlibs.patch                | 20 -------
 wordpress-4.9-tinymce_noflash.patch           | 36 ------------
 wordpress-4.9.4-remove-jshint-refs.patch      | 19 -------
 ...config.patch => wordpress-5.1-config.patch | 16 +++---
 ....patch => wordpress-5.1-no_swfupload.patch | 10 ++--
 ...date.patch => wordpress-5.1-noupdate.patch | 57 ++++++++++---------
 wordpress-5.1-remove-jshint-refs.patch        | 11 ++++
 wordpress-5.1-systemlibs.patch                | 21 +++++++
 wordpress-5.1-tinymce_noflash.patch           | 35 ++++++++++++
 wordpress.spec                                | 26 +++++----
 13 files changed, 124 insertions(+), 172 deletions(-)
 delete mode 100755 strip.sh
 delete mode 100644 wordpress-4.4-systemlibs.patch
 delete mode 100644 wordpress-4.9-tinymce_noflash.patch
 delete mode 100644 wordpress-4.9.4-remove-jshint-refs.patch
 rename wordpress-4.0-config.patch => wordpress-5.1-config.patch (68%)
 rename wordpress-4.9-no_swfupload.patch => wordpress-5.1-no_swfupload.patch (71%)
 rename wordpress-4.9-noupdate.patch => wordpress-5.1-noupdate.patch (61%)
 create mode 100644 wordpress-5.1-remove-jshint-refs.patch
 create mode 100644 wordpress-5.1-systemlibs.patch
 create mode 100644 wordpress-5.1-tinymce_noflash.patch

diff --git a/.gitignore b/.gitignore
index 563cf68..75c7dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
 clog
 /wordpress-*.tar.gz
-/wordpress-4.9.2-strip.tar.xz
-/wordpress-4.9.4-strip.tar.xz
-/wordpress-4.9.5-strip.tar.xz
-/wordpress-4.9.6-strip.tar.xz
-/wordpress-4.9.7-strip.tar.xz
-/wordpress-4.9.8-strip.tar.xz
-/wordpress-5.0-strip.tar.xz
-/wordpress-5.0.1-strip.tar.xz
-/wordpress-5.0.2-strip.tar.xz
-/wordpress-5.0.3-strip.tar.xz
diff --git a/sources b/sources
index 94297ed..8312a1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.0.3-strip.tar.xz) = 1091f6607ca1eb93873b918ff0212824174330bd4d775f2a34480a79dc5cd3e7788f245e9fc27f365f6e54b48255e97c66463bd7589608edcae61e2eb85fbe6f
+SHA512 (wordpress-5.1.tar.gz) = e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99
diff --git a/strip.sh b/strip.sh
deleted file mode 100755
index 443e973..0000000
--- a/strip.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
-  echo usage $0 version
-  exit 1
-fi
-
-srce=wordpress-$1.tar.gz
-dest=wordpress-$1-strip.tar.xz
-
-if [ ! -f $srce ]; then
-  echo Download...
-  wget https://wordpress.org/$srce || exit 1
-fi
-
-if [ ! -f $dest ]; then
-  echo Cleanup...
-  [ -d wordpress ] && rm -r wordpress
-  
-  echo Unpack...
-  tar xf $srce
-
-  echo Strip non free file
-  rm wordpress/wp-includes/js/codemirror/jshint.js
-
-  echo Pack...
-  tar cJf $dest wordpress
-
-  echo Cleanup...
-  rm -r wordpress  
-
-  echo Done.
-fi
diff --git a/wordpress-4.4-systemlibs.patch b/wordpress-4.4-systemlibs.patch
deleted file mode 100644
index 13d36b5..0000000
--- a/wordpress-4.4-systemlibs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- wordpress/wp-admin/includes/media.php.orig	2015-12-09 17:01:52.453306607 +0100
-+++ wordpress/wp-admin/includes/media.php	2015-12-09 17:05:31.477379833 +0100
-@@ -2989,7 +2989,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 );
-@@ -3050,7 +3050,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-4.9-tinymce_noflash.patch b/wordpress-4.9-tinymce_noflash.patch
deleted file mode 100644
index 6dee5ae..0000000
--- a/wordpress-4.9-tinymce_noflash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js wordpress/wp-includes/js/tinymce/plugins/media/plugin.js
---- wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js	2018-05-01 15:31:24.000000000 -0700
-+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js	2018-05-18 11:22:34.648500557 -0700
-@@ -166,7 +166,6 @@
-       mp4: 'video/mp4',
-       webm: 'video/webm',
-       ogg: 'video/ogg',
--      swf: 'application/x-shockwave-flash'
-     };
-     var fileEnd = url.toLowerCase().split('.').pop();
-     var mime = mimes[fileEnd];
-@@ -424,14 +423,6 @@
-     var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
-     return '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"' + allowFullscreen + '></iframe>';
-   };
--  var getFlashHtml = function (data) {
--    var html = '<object data="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '" type="application/x-shockwave-flash">';
--    if (data.poster) {
--      html += '<img src="' + data.poster + '" width="' + data.width + '" height="' + data.height + '" />';
--    }
--    html += '</object>';
--    return html;
--  };
-   var getAudioHtml = function (data, audioTemplateCallback) {
-     if (audioTemplateCallback) {
-       return audioTemplateCallback(data);
-@@ -494,8 +485,6 @@
-       });
-       if (data.type === 'iframe') {
-         return getIframeHtml(data);
--      } else if (data.source1mime === 'application/x-shockwave-flash') {
--        return getFlashHtml(data);
-       } else if (data.source1mime.indexOf('audio') !== -1) {
-         return getAudioHtml(data, audioTemplateCallback);
-       } else if (data.type === 'script') {
-Binary files wordpress.orig/wp-includes/js/tinymce/wp-tinymce.js.gz and wordpress/wp-includes/js/tinymce/wp-tinymce.js.gz differ
diff --git a/wordpress-4.9.4-remove-jshint-refs.patch b/wordpress-4.9.4-remove-jshint-refs.patch
deleted file mode 100644
index 41b59ae..0000000
--- a/wordpress-4.9.4-remove-jshint-refs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove references to jshint
- The file jshint.js uses a non-free license. It is removed as part of the upstream
- tarball rebuild but this patch removes the things that reference it. Luckily the
- script handler does a NOP for a non-existent script
-Author: Craig Small <csmall@debian.org>
-Origin: Debian
-Bug: https://core.trac.wordpress.org/ticket/42850
-Reviewed-by: Craig Small <csmall@debian.org>
-Last-Update: 2017-12-09
---- a/wp-includes/script-loader.php
-+++ b/wp-includes/script-loader.php
-@@ -461,7 +461,6 @@
- 
- 	$scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' );
- 	$scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' );
--	$scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' );
- 	$scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' );
- 	$scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' );
- 	$scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );
diff --git a/wordpress-4.0-config.patch b/wordpress-5.1-config.patch
similarity index 68%
rename from wordpress-4.0-config.patch
rename to wordpress-5.1-config.patch
index 0505de0..a10109e 100644
--- a/wordpress-4.0-config.patch
+++ b/wordpress-5.1-config.patch
@@ -1,8 +1,8 @@
 diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
---- wordpress/wp-config.php.orig	2014-09-08 13:12:36.525908423 +0200
-+++ wordpress/wp-config.php	2014-09-08 13:14:33.583402525 +0200
-@@ -66,6 +66,19 @@ define('NONCE_SALT',       'put your uni
- $table_prefix  = 'wp_';
+--- 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
+@@ -66,6 +66,19 @@ define( 'NONCE_SALT',       'put your un
+ $table_prefix = 'wp_';
  
  /**
 + * See http://make.wordpress.org/core/2013/10/25/the-definitive-guide-to-disabling-auto-updates-in-wordpress-3-7
@@ -21,12 +21,12 @@ diff -up wordpress/wp-config.php.orig 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 +96,7 @@ define( 'WP_DEBUG', false );
  
  /** Absolute path to the WordPress directory. */
- if ( !defined('ABSPATH') )
--	define('ABSPATH', dirname(__FILE__) . '/');
+ if ( ! defined( 'ABSPATH' ) ) {
+-	define( 'ABSPATH', dirname( __FILE__ ) . '/' );
 +	define('ABSPATH', '/usr/share/wordpress');
+ }
  
  /** Sets up WordPress vars and included files. */
- require_once(ABSPATH . 'wp-settings.php');
diff --git a/wordpress-4.9-no_swfupload.patch b/wordpress-5.1-no_swfupload.patch
similarity index 71%
rename from wordpress-4.9-no_swfupload.patch
rename to wordpress-5.1-no_swfupload.patch
index f3c68d8..932ddee 100644
--- a/wordpress-4.9-no_swfupload.patch
+++ b/wordpress-5.1-no_swfupload.patch
@@ -1,14 +1,14 @@
 diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php
---- wordpress/wp-includes/script-loader.php.orig	2017-11-16 08:43:42.069856252 +0100
-+++ wordpress/wp-includes/script-loader.php	2017-11-16 08:44:03.872963818 +0100
-@@ -323,12 +323,6 @@ function wp_default_scripts( &$scripts )
+--- 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 )
  	$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', '/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');
+-	$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 );
diff --git a/wordpress-4.9-noupdate.patch b/wordpress-5.1-noupdate.patch
similarity index 61%
rename from wordpress-4.9-noupdate.patch
rename to wordpress-5.1-noupdate.patch
index 40e3678..70350e7 100644
--- a/wordpress-4.9-noupdate.patch
+++ b/wordpress-5.1-noupdate.patch
@@ -1,18 +1,18 @@
 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	2017-10-04 20:25:46.000000000 +0200
-+++ wordpress/wp-admin/includes/admin-filters.php	2017-11-16 08:46:52.340794957 +0100
-@@ -115,7 +115,6 @@ add_action( 'personal_options_update', '
+--- wordpress/wp-admin/includes/admin-filters.php.rpm	2019-02-21 15:14:36.864022775 +0100
++++ wordpress/wp-admin/includes/admin-filters.php	2019-02-21 15:14:46.729070707 +0100
+@@ -116,7 +116,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', 'update_nag', 3 );
  add_action( 'admin_notices', 'maintenance_nag', 10 );
  
  add_filter( 'update_footer', 'core_update_footer' );
 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	2017-10-18 19:15:47.000000000 +0200
-+++ wordpress/wp-admin/includes/class-core-upgrader.php	2017-11-16 08:46:52.340794957 +0100
-@@ -234,6 +234,9 @@ class Core_Upgrader extends WP_Upgrader
+--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm	2019-02-21 15:14:36.864022775 +0100
++++ wordpress/wp-admin/includes/class-core-upgrader.php	2019-02-21 15:14:46.729070707 +0100
+@@ -250,6 +250,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 ) {
@@ -21,12 +21,12 @@ 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
+ 		$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	2017-10-18 19:48:49.000000000 +0200
-+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2017-11-16 08:46:52.340794957 +0100
-@@ -36,7 +36,7 @@ class WP_Automatic_Updater {
- 			return true;
+--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm	2019-02-21 15:14:36.864022775 +0100
++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2019-02-21 15:14:46.729070707 +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;
@@ -35,21 +35,21 @@ 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	2017-08-22 13:52:48.000000000 +0200
-+++ wordpress/wp-admin/includes/update.php	2017-11-16 08:46:52.340794957 +0100
-@@ -279,7 +279,7 @@ function update_right_now_message() {
+--- wordpress/wp-admin/includes/update.php.rpm	2019-02-21 15:14:36.865022780 +0100
++++ wordpress/wp-admin/includes/update.php	2019-02-21 15:14:46.729070707 +0100
+@@ -301,7 +301,7 @@ function update_right_now_message() {
  		$cur = get_preferred_from_update_core();
  
- 		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
+ 		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 .= '';
+ 		}
  	}
  
- 	/* translators: 1: version number, 2: theme name */
 diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
---- wordpress/wp-includes/load.php.rpm	2017-11-16 08:46:52.340794957 +0100
-+++ wordpress/wp-includes/load.php	2017-11-16 08:47:47.535067259 +0100
-@@ -1112,7 +1112,7 @@ function wp_is_file_mod_allowed( $contex
+--- wordpress/wp-includes/load.php.rpm	2019-01-30 12:01:52.000000000 +0100
++++ wordpress/wp-includes/load.php	2019-02-21 15:14:36.865022780 +0100
+@@ -1259,7 +1259,7 @@ function wp_is_file_mod_allowed( $contex
  	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
  	 * @param string $context          The usage context.
  	 */
@@ -59,15 +59,16 @@ 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	2017-10-22 00:42:51.000000000 +0200
-+++ wordpress/wp-includes/update.php	2017-11-16 08:46:52.340794957 +0100
-@@ -707,9 +707,6 @@ function _maybe_update_themes() {
+--- wordpress/wp-includes/update.php.rpm	2019-02-21 15:14:36.865022780 +0100
++++ wordpress/wp-includes/update.php	2019-02-21 15:16:50.428671765 +0100
+@@ -770,10 +770,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_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');
- 
+ 	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-5.1-remove-jshint-refs.patch
new file mode 100644
index 0000000..fff7368
--- /dev/null
+++ b/wordpress-5.1-remove-jshint-refs.patch
@@ -0,0 +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' );
+ 	$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( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );
diff --git a/wordpress-5.1-systemlibs.patch b/wordpress-5.1-systemlibs.patch
new file mode 100644
index 0000000..6819e34
--- /dev/null
+++ b/wordpress-5.1-systemlibs.patch
@@ -0,0 +1,21 @@
+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.1-tinymce_noflash.patch b/wordpress-5.1-tinymce_noflash.patch
new file mode 100644
index 0000000..0d0e79c
--- /dev/null
+++ b/wordpress-5.1-tinymce_noflash.patch
@@ -0,0 +1,35 @@
+diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.orig wordpress/wp-includes/js/tinymce/plugins/media/plugin.js
+--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.orig	2019-02-21 14:59:28.793415420 +0100
++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js	2019-02-21 15:00:14.319647286 +0100
+@@ -166,7 +166,6 @@ var media = (function () {
+         mp4: 'video/mp4',
+         webm: 'video/webm',
+         ogg: 'video/ogg',
+-        swf: 'application/x-shockwave-flash'
+       };
+       var fileEnd = url.toLowerCase().split('.').pop();
+       var mime = mimes[fileEnd];
+@@ -424,14 +423,6 @@ var media = (function () {
+       var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
+       return '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"' + allowFullscreen + '></iframe>';
+     };
+-    var getFlashHtml = function (data) {
+-      var html = '<object data="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '" type="application/x-shockwave-flash">';
+-      if (data.poster) {
+-        html += '<img src="' + data.poster + '" width="' + data.width + '" height="' + data.height + '" />';
+-      }
+-      html += '</object>';
+-      return html;
+-    };
+     var getAudioHtml = function (data, audioTemplateCallback) {
+       if (audioTemplateCallback) {
+         return audioTemplateCallback(data);
+@@ -494,8 +485,6 @@ var media = (function () {
+         });
+         if (data.type === 'iframe') {
+           return getIframeHtml(data);
+-        } else if (data.source1mime === 'application/x-shockwave-flash') {
+-          return getFlashHtml(data);
+         } else if (data.source1mime.indexOf('audio') !== -1) {
+           return getAudioHtml(data, audioTemplateCallback);
+         } else if (data.type === 'script') {
diff --git a/wordpress.spec b/wordpress.spec
index 3ecdb90..48af395 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -14,24 +14,23 @@
 %global with_nginx 0
 %endif
 
-#global prever RC1
+%global upstream_version 5.1
+#global upstream_prever  RC2
 
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
-Version:    5.0.3
-Release:    2%{?dist}
+Version:    %{upstream_version}%{?upstream_prever:~%upstream_prever}
+Release:    1%{?dist}
 License:    GPLv2
 
-Source0:    %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz
+Source0:    https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
 Source1:    wordpress-httpd-conf
 Source2:    README.fedora.wordpress
 Source3:    README.fedora.wordpress-mu
 Source4:    wordpress-nginx-conf
 # To minify JS assets
 Source5:    wordpress-minify.php
-# To generate the tarball without non-free files
-Source6:    strip.sh
 
 # Patch out copyrighted text of Hello, Dolly
 # (and replace it with Free Software Song)
@@ -40,26 +39,26 @@ Patch0: wordpress-debian_patches_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-4.9-no_swfupload.patch
+Patch2: wordpress-5.1-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'
-Patch3: wordpress-4.9-tinymce_noflash.patch
+Patch3: wordpress-5.1-tinymce_noflash.patch
 # We drop the SWF files from mediaelement
 Patch4: wordpress-4.9-mediaelement_no_swf.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
-Patch5: wordpress-4.0-config.patch
+Patch5: wordpress-5.1-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-4.9-noupdate.patch
+Patch6: wordpress-5.1-noupdate.patch
 # Use system libraries
-Patch7: wordpress-4.4-systemlibs.patch
+Patch7: wordpress-5.1-systemlibs.patch
 # Debian patch for jshint
-Patch8: wordpress-4.9.4-remove-jshint-refs.patch
+Patch8: wordpress-5.1-remove-jshint-refs.patch
 
 
 BuildArch: noarch
@@ -272,6 +271,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Fri Feb 22 2019 Remi Collet <remi@remirepo.net> - 5.1-1
+- WordPress 5.1 “Betty”
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 2004fd8039be08353b272335ce3309d63946b6e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 22 Mar 2019 09:23:40 +0100
Subject: [PATCH 02/13] fix wp-tinymce.js.gz is empty #1691524

(cherry picked from commit a036eddc5f684fcd9481aaffcac531f87f37c141)
---
 wordpress.spec | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/wordpress.spec b/wordpress.spec
index f8fdfbc..6357f8b 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -21,7 +21,7 @@ Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
 Version:    %{upstream_version}%{?upstream_prever:~%upstream_prever}
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2
 
 Source0:    https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
@@ -148,22 +148,6 @@ php %{SOURCE5} \
   wp-includes/js/mediaelement/mediaelement.js \
   wp-includes/js/mediaelement/mediaelement.min.js
 
-# Re-Generated the archive
-arc=wp-includes/js/tinymce/wp-tinymce.js
-gunzip -dc $arc.gz | \
-  grep "^// Source" | \
-  while read a b c
-do
-  if [ -f $c ]; then
-    echo -e "\n$a $b $c"
-    cat $c
-  else
-    exit 1
-  fi
-done >$arc
-gzip --force $arc
-ls -l $arc.gz
-
 # Create RPM configuration
 sed -e 's/\r//' wp-config-sample.php >wp-config.php
 %patch5 -p1
@@ -271,6 +255,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-2
+- fix wp-tinymce.js.gz is empty #1691524
+
 * Wed Mar 13 2019 Remi Collet <remi@remirepo.net> - 5.1.1-1
 - WordPress 5.1.1 Security and Maintenance Release
 

From f072843229959cb403c65b1f1532f92911c9a272 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 22 Mar 2019 09:55:59 +0100
Subject: [PATCH 03/13] fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty
 #1691524

(cherry picked from commit 56508b8b2164d451e77216c9f3df6e3dedf29ff8)
---
 wordpress.spec | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/wordpress.spec b/wordpress.spec
index 6357f8b..cd74b8e 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -21,7 +21,7 @@ Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
 Version:    %{upstream_version}%{?upstream_prever:~%upstream_prever}
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPLv2
 
 Source0:    https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
@@ -148,6 +148,24 @@ php %{SOURCE5} \
   wp-includes/js/mediaelement/mediaelement.js \
   wp-includes/js/mediaelement/mediaelement.min.js
 
+# Re-Generated the archive
+arc=wp-includes/js/tinymce/wp-tinymce.js
+grep "^// Source" $arc | while read a b c
+do
+  if [ -f $c ]; then
+    echo -e "\n$a $b $c"
+    cat $c
+  else
+    exit 1
+  fi
+done >$arc.tmp
+if [ -s $arc.tmp ]; then
+  ls -l $arc*
+  mv $arc.tmp $arc
+else
+  exit 1
+fi
+
 # Create RPM configuration
 sed -e 's/\r//' wp-config-sample.php >wp-config.php
 %patch5 -p1
@@ -255,8 +273,8 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
-* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-2
-- fix wp-tinymce.js.gz is empty #1691524
+* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-3
+- fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524
 
 * Wed Mar 13 2019 Remi Collet <remi@remirepo.net> - 5.1.1-1
 - WordPress 5.1.1 Security and Maintenance Release

From a01b7a34de08f3b03e60d3d7320c1ba328162186 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 22 Mar 2019 10:03:35 +0100
Subject: [PATCH 04/13] also add wp-tinymce.js.gz

(cherry picked from commit dec03d96ab4c62b9ce5e0ef8f988560e0c571328)
(cherry picked from commit b91aee8a754f3e1f3a203a83912511196bf5202f)
---
 wordpress.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wordpress.spec b/wordpress.spec
index cd74b8e..bd01e80 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -160,6 +160,7 @@ do
   fi
 done >$arc.tmp
 if [ -s $arc.tmp ]; then
+  gzip -c $arc > $arc.gz
   ls -l $arc*
   mv $arc.tmp $arc
 else

From 8da71c43430332a26c2fd5b31d6914f62b4ab252 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 22 Mar 2019 10:06:22 +0100
Subject: [PATCH 05/13] bump release

(cherry picked from commit 6005fbcc0c00bf44e541381f9c8d369cb9fce540)
---
 wordpress.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wordpress.spec b/wordpress.spec
index bd01e80..d1c9b24 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -21,7 +21,7 @@ Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
 Version:    %{upstream_version}%{?upstream_prever:~%upstream_prever}
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPLv2
 
 Source0:    https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
@@ -274,7 +274,7 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
-* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-3
+* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-4
 - fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524
 
 * Wed Mar 13 2019 Remi Collet <remi@remirepo.net> - 5.1.1-1

From fcdd8269548dda4facaf6bdc8a75e6599df6a289 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 22 May 2019 07:08:21 +0200
Subject: [PATCH 06/13] WordPress 5.2.1 Maintenance Release

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

diff --git a/sources b/sources
index 86563e7..df665d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.2.tar.gz) = 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824
+SHA512 (wordpress-5.2.1.tar.gz) = b49368ba7a3f0cf101b2ad2c78d609050f371a4c7f6dca7d5966cc167ae20ca78df9a3144e1b91c4044d0a9a12163911d66c8faedc9c4a1e2978d2b54ef54855
diff --git a/wordpress.spec b/wordpress.spec
index 27e63a0..7fee218 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.2
+%global upstream_version 5.2.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
+* Wed May  22 2019 Remi Collet <remi@remirepo.net> - 5.2.1-1
+- WordPress 5.2.1 Maintenance Release
+
 * Wed May   8 2019 Remi Collet <remi@remirepo.net> - 5.2.0-1
 - WordPress 5.2 “Jaco”
 - raise dependency on PHP 7.2

From 1d3cec1c8f67f86583619bf0423dc499466f8e39 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 5 Sep 2019 07:53:49 +0200
Subject: [PATCH 07/13] WordPress 5.2.3 Security and Maintenance Release

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

diff --git a/sources b/sources
index 51c80ae..b2a0b3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-5.2.2.tar.gz) = 4aac96d9ec0f6d3ae0d6b2438599e5e76442580e56d56c1e10d199435336bbc5f0869db2f742ead55815abf1f6428f4f325946d30b2a93ca39ded8d27024f38a
+SHA512 (wordpress-5.2.3.tar.gz) = 4fb37cb5b5bafbbb556910a69bbe3c83163c660e0186b1a30e095c1fc5950b8474592f17b743f0fb8a4f23f0f0080d3c92f0c45a2a1388911e69994d9c8a2194
diff --git a/wordpress.spec b/wordpress.spec
index 18412a1..a191108 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.2.2
+%global upstream_version 5.2.3
 #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 Sep  5 2019 Remi Collet <remi@remirepo.net> - 5.2.3-1
+- WordPress 5.2.3 Security and Maintenance Release
+
 * Wed Jun 19 2019 Remi Collet <remi@remirepo.net> - 5.2.2-1
 - WordPress 5.2.2 Maintenance Release
 

From 1eb20f8d57624cb7a063a4ef7b3c0f90c04154d7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 15 Oct 2019 08:00:07 +0200
Subject: [PATCH 08/13] 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 a191108..ff47bbe 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 f9fa40a52f0080d99efeb366c48b456d81bf8661 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 13 Nov 2019 08:14:19 +0100
Subject: [PATCH 09/13] =?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 ff47bbe..af2858b 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 449c019a55bb5e22c1f0e245022e1ba3de2bc630 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 13 Dec 2019 08:27:19 +0100
Subject: [PATCH 10/13] 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 af2858b..28ec081 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 0920cdbb25ed05eaf40058cd25ace584a9905782 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 19 Dec 2019 07:27:07 +0100
Subject: [PATCH 11/13] 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 28ec081..49d9c88 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 a994f5c3bacdb96a67d8530a9243b5829a545a1e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 26 Mar 2020 08:09:43 +0100
Subject: [PATCH 12/13] =?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)
(cherry picked from commit 0fe52ca036ea5d0f8abf90aec4a4fe4045e246fd)
---
 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 49d9c88..3bd4d63 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 35124356549fd9dd19a12d64aa5a8dd3365976fa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 30 Apr 2020 07:58:01 +0200
Subject: [PATCH 13/13] 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 3bd4d63..4f34269 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”