From 170d390d406049b2cb2de0ccb35fc04fd65138d5 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 1 Apr 2020 23:40:47 +0200
Subject: [PATCH] upgrading package: wordpress 5.3.2 -> 5.4

---
 wordpress/wordpress.patch | 26 +++++++++++++-------------
 wordpress/wordpress.spec  |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/wordpress/wordpress.patch b/wordpress/wordpress.patch
index 3301916caf..25ad85a728 100644
--- a/wordpress/wordpress.patch
+++ b/wordpress/wordpress.patch
@@ -1,9 +1,9 @@
 Index: wp-includes/canonical.php
---- wp-includes/canonical.php.orig	2017-10-24 16:18:48.000000000 +0200
-+++ wp-includes/canonical.php	2017-11-16 09:06:41.351374000 +0100
-@@ -383,6 +383,12 @@
- 	if ( empty($user_home['path']) )
+--- wp-includes/canonical.php.orig	2020-04-01 23:33:40.806846000 +0200
++++ wp-includes/canonical.php	2020-04-01 23:36:34.882852000 +0200
+@@ -437,6 +437,12 @@
  		$user_home['path'] = '/';
+ 	}
  
 +	// SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80
 +	// TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER! --rse
@@ -11,17 +11,17 @@ Index: wp-includes/canonical.php
 +	$redirect['port'] = 80;
 +	$original['port'] = 80;
 +
- 	// Handle ports
- 	if ( !empty($user_home['port']) )
+ 	// Handle ports.
+ 	if ( ! empty( $user_home['port'] ) ) {
  		$redirect['port'] = $user_home['port'];
 Index: wp-mail.php
---- wp-mail.php.orig	2017-01-11 06:13:43.000000000 +0100
-+++ wp-mail.php	2017-11-16 09:06:41.351966000 +0100
-@@ -152,6 +152,7 @@
- 		// Author not found in DB, set status to pending. Author already set to admin.
- 		$post_status = 'pending';
+--- wp-mail.php.orig	2020-02-06 07:33:11.000000000 +0100
++++ wp-mail.php	2020-04-01 23:33:40.807331000 +0200
+@@ -151,6 +151,7 @@
+ 			}
+ 		}
  	}
 +	$post_status = 'draft';
  
- 	$subject = trim($subject);
- 
+ 	// Set $post_status based on $author_found and on author's publish_posts capability.
+ 	if ( $author_found ) {
diff --git a/wordpress/wordpress.spec b/wordpress/wordpress.spec
index 13acbd512b..1470f4a364 100644
--- a/wordpress/wordpress.spec
+++ b/wordpress/wordpress.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        CMS
 License:      GPL
-Version:      5.3.2
-Release:      20191219
+Version:      5.4
+Release:      20200401
 
 #   list of sources
 Source0:      http://wordpress.org/wordpress-%{version}.tar.gz