Pullup ticket #5786 - requested by taca

www/wordpress: security fix

Revisions pulled up:
- www/wordpress/Makefile                                        1.79-1.80
- www/wordpress/distinfo                                        1.64

---
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Wed Jul  4 13:40:45 UTC 2018

   Modified Files:
   	pkgsrc/www/wordpress: Makefile

   Log Message:
   *: Move SUBST_STAGE from post-patch to pre-configure

   Performing substitutions during post-patch breaks tools such as mkpatches,
   making it very difficult to regenerate correct patches after making changes,
   and often leading to substituted string replacements being committed.

---
   Module Name:	pkgsrc
   Committed By:	wen
   Date:		Sat Jul  7 02:55:25 UTC 2018

   Modified Files:
   	pkgsrc/www/wordpress: Makefile distinfo

   Log Message:
   Update to 4.9.7

   Upstream changes:
   WordPress 4.9.7 is now available. This is a security and maintenance release for all versions since WordPress 3.7. We strongly encourage you to update your sites immediately.

   WordPress versions 4.9.6 and earlier are affected by a media issue that could potentially allow a user with certain capabilities to attempt to delete files outside the uploads directory.

   Thank you to Slavco for reporting the original issue and Matt Barry for reporting related issues.

   Seventeen other bugs were fixed in WordPress 4.9.7. Particularly of note were:

       Taxonomy: Improve cache handling for term queries.
       Posts, Post Types: Clear post password cookie when logging out.
       Widgets: Allow basic HTML tags in sidebar descriptions on Widgets admin screen.
       Community Events Dashboard: Always show the nearest WordCamp if one is coming up, even if there are multiple Meetups happening first.
       Privacy: Make sure default privacy policy content does not cause a fatal error when flushing rewrite rules outside of the admin context.

2 files changed, 8 insertions, 8 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 909708885a4..ce017bc76e1 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2018/05/18 14:22:40 jklos Exp $
+# $NetBSD: Makefile,v 1.78.2.1 2018/07/16 14:04:22 bsiegert Exp $
 
 DISTNAME=		wordpress-${VERSION}
-VERSION=		4.9.6
+VERSION=		4.9.7
 CATEGORIES=		www
 MASTER_SITES=		https://wordpress.org/
 
@@ -45,7 +45,7 @@ DEPENDS+=		${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib
 
 SUBST_CLASSES+=		conf
 SUBST_MESSAGE.conf=	Fixing pathnames in configuration file.
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	../wordpress.conf
 SUBST_SED.conf=		-e "s,@WPHOME@,${WPHOME},g"
 .if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24"
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index 44b29cdb643..635e6e8ff58 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.63 2018/05/18 14:22:40 jklos Exp $
+$NetBSD: distinfo,v 1.63.2.1 2018/07/16 14:04:22 bsiegert Exp $
 
-SHA1 (wordpress-4.9.6.tar.gz) = 40616b40d120c97205e5852c03096115c2fca537
-RMD160 (wordpress-4.9.6.tar.gz) = a434e74a3ce272b695b92074c96cd91c98c55428
-SHA512 (wordpress-4.9.6.tar.gz) = 93b5c6373968925f4773b79990ee73508c4994dc5ef4387c8d88dc7d39ae3688d4e066887870731e0b4e1d84a1c027cdc62239b3e042c133eb32a03229d48335
-Size (wordpress-4.9.6.tar.gz) = 8740389 bytes
+SHA1 (wordpress-4.9.7.tar.gz) = 7bf349133750618e388e7a447bc9cdc405967b7d
+RMD160 (wordpress-4.9.7.tar.gz) = c01fc9363f7fc9bc4534012ce849a382d3e37df5
+SHA512 (wordpress-4.9.7.tar.gz) = 0a9a132d48081ef253122bd207dbf859babfd021ef3db90d486c92cde03727a74c5170a9faf80d46e8899472a703cfe91b24c04c1ea21f261dbd156bd691ad12
+Size (wordpress-4.9.7.tar.gz) = 8742203 bytes