Fri Apr 27 19:53:52 2018 UTC ()
Pullup ticket #5738 - requested by morr
www/wordpress: security fix

Revisions pulled up:
- www/wordpress/Makefile                                        1.77
- www/wordpress/distinfo                                        1.62

---
   Module Name:    pkgsrc
   Committed By:   morr
   Date:           Mon Apr 16 10:22:10 UTC 2018

   Modified Files:
           pkgsrc/www/wordpress: Makefile distinfo

   Log Message:
   Update to version 4.9.5.

   This maintenance release fixes 28 bugs in 4.9, including fixes for Customizer, media library, error notices, and some security fixes. Twenty Seventeen bundled theme and Hello Dolly bundled plugin have also been updated.

   WordPress versions 4.9.4 and earlier are affected by three security issues.

   More changes at https://codex.wordpress.org/Version_4.9.5.


(bsiegert)
diff -r1.76 -r1.76.2.1 pkgsrc/www/wordpress/Makefile
diff -r1.61 -r1.61.2.1 pkgsrc/www/wordpress/distinfo
cvs diff -r1.76 -r1.76.2.1 pkgsrc/www/wordpress/Makefile (switch to unified diff)

--- pkgsrc/www/wordpress/Makefile 2018/02/12 08:33:19 1.76
+++ pkgsrc/www/wordpress/Makefile 2018/04/27 19:53:52 1.76.2.1
@@ -1,77 +1,77 @@ @@ -1,77 +1,77 @@
1# $NetBSD: Makefile,v 1.76 2018/02/12 08:33:19 jklos Exp $ 1# $NetBSD: Makefile,v 1.76.2.1 2018/04/27 19:53:52 bsiegert Exp $
2 2
3DISTNAME= wordpress-${VERSION} 3DISTNAME= wordpress-${VERSION}
4VERSION= 4.9.4 4VERSION= 4.9.5
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= https://wordpress.org/ 6MASTER_SITES= https://wordpress.org/
7 7
8MAINTAINER= morr@NetBSD.org 8MAINTAINER= morr@NetBSD.org
9HOMEPAGE= https://wordpress.org/ 9HOMEPAGE= https://wordpress.org/
10COMMENT= Blogging tool written in php 10COMMENT= Blogging tool written in php
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_TOOLS+= pax 13USE_TOOLS+= pax
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.include "../../lang/php/phpversion.mk" 16.include "../../lang/php/phpversion.mk"
17.include "options.mk" 17.include "options.mk"
18 18
19NO_BUILD= yes 19NO_BUILD= yes
20WRKSRC= ${WRKDIR}/wordpress 20WRKSRC= ${WRKDIR}/wordpress
21 21
22WWW_USER?= ${APACHE_USER} 22WWW_USER?= ${APACHE_USER}
23WWW_GROUP?= ${APACHE_GROUP} 23WWW_GROUP?= ${APACHE_GROUP}
24 24
25PKG_GROUPS_VARS= WWW_GROUP 25PKG_GROUPS_VARS= WWW_GROUP
26PKG_USERS_VARS= WWW_USER 26PKG_USERS_VARS= WWW_USER
27BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP 27BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
28EGDIR= ${PREFIX}/share/examples/wordpress 28EGDIR= ${PREFIX}/share/examples/wordpress
29DOCDIR= ${PREFIX}/share/doc/wordpress 29DOCDIR= ${PREFIX}/share/doc/wordpress
30WPHOME= ${PREFIX}/share/wordpress 30WPHOME= ${PREFIX}/share/wordpress
31FILES_SUBST+= WPHOME=${WPHOME} 31FILES_SUBST+= WPHOME=${WPHOME}
32MESSAGE_SUBST+= DOCDIR=${DOCDIR} 32MESSAGE_SUBST+= DOCDIR=${DOCDIR}
33 33
34CONF_FILES+= ${EGDIR}/wordpress.conf ${PKG_SYSCONFDIR}/wordpress.conf 34CONF_FILES+= ${EGDIR}/wordpress.conf ${PKG_SYSCONFDIR}/wordpress.conf
35OWN_DIRS_PERMS+= ${WPHOME}/wp-content/uploads \ 35OWN_DIRS_PERMS+= ${WPHOME}/wp-content/uploads \
36 ${WWW_USER} ${WWW_GROUP} 0750 36 ${WWW_USER} ${WWW_GROUP} 0750
37 37
38INSTALLATION_DIRS+= ${DOCDIR} ${WPHOME} ${EGDIR} 38INSTALLATION_DIRS+= ${DOCDIR} ${WPHOME} ${EGDIR}
39 39
40DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.6.0:../../databases/php-mysqli 40DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.6.0:../../databases/php-mysqli
41DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd 41DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd
42DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl 42DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl
43DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.6.0:../../archivers/php-zip 43DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.6.0:../../archivers/php-zip
44DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib 44DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib
45 45
46SUBST_CLASSES+= conf 46SUBST_CLASSES+= conf
47SUBST_MESSAGE.conf= Fixing pathnames in configuration file. 47SUBST_MESSAGE.conf= Fixing pathnames in configuration file.
48SUBST_STAGE.conf= post-patch 48SUBST_STAGE.conf= post-patch
49SUBST_FILES.conf= ../wordpress.conf 49SUBST_FILES.conf= ../wordpress.conf
50SUBST_SED.conf= -e "s,@WPHOME@,${WPHOME},g" 50SUBST_SED.conf= -e "s,@WPHOME@,${WPHOME},g"
51.if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24" 51.if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24"
52SUBST_SED.conf+= -e "/Order allow,deny/d" 52SUBST_SED.conf+= -e "/Order allow,deny/d"
53SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g" 53SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g"
54.endif 54.endif
55 55
56post-extract: 56post-extract:
57 ${CP} ${FILESDIR}/wordpress.conf ${WRKDIR}/wordpress.conf 57 ${CP} ${FILESDIR}/wordpress.conf ${WRKDIR}/wordpress.conf
58 58
59do-install: 59do-install:
60 ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR} 60 ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR}
61 ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${DOCDIR} 61 ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${DOCDIR}
62 62
63# ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR} 63# ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR}
64 ${INSTALL_DATA} ${WRKDIR}/wordpress.conf ${DESTDIR}${EGDIR} 64 ${INSTALL_DATA} ${WRKDIR}/wordpress.conf ${DESTDIR}${EGDIR}
65 65
66 ${RM} ${WRKSRC}/readme.html 66 ${RM} ${WRKSRC}/readme.html
67 ${RM} ${WRKSRC}/license.txt 67 ${RM} ${WRKSRC}/license.txt
68# ${RM} ${WRKSRC}/wp-config-sample.php 68# ${RM} ${WRKSRC}/wp-config-sample.php
69 69
70 cd ${WRKSRC} && pax -rw -pmp . ${DESTDIR}${WPHOME} 70 cd ${WRKSRC} && pax -rw -pmp . ${DESTDIR}${WPHOME}
71 ${TOUCH} ${DESTDIR}${WPHOME}/wp-content/plugins/index.html 71 ${TOUCH} ${DESTDIR}${WPHOME}/wp-content/plugins/index.html
72 ${FIND} ${DESTDIR}${WPHOME} \ 72 ${FIND} ${DESTDIR}${WPHOME} \
73 -type d -exec ${CHMOD} ${PKGDIRMODE} "{}" \; 73 -type d -exec ${CHMOD} ${PKGDIRMODE} "{}" \;
74 ${FIND} ${DESTDIR}${WPHOME} \ 74 ${FIND} ${DESTDIR}${WPHOME} \
75 -type f -exec ${CHMOD} ${SHAREMODE} "{}" \; 75 -type f -exec ${CHMOD} ${SHAREMODE} "{}" \;
76 76
77.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"
cvs diff -r1.61 -r1.61.2.1 pkgsrc/www/wordpress/distinfo (switch to unified diff)

--- pkgsrc/www/wordpress/distinfo 2018/02/12 08:33:19 1.61
+++ pkgsrc/www/wordpress/distinfo 2018/04/27 19:53:52 1.61.2.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.61 2018/02/12 08:33:19 jklos Exp $ 1$NetBSD: distinfo,v 1.61.2.1 2018/04/27 19:53:52 bsiegert Exp $
2 2
3SHA1 (wordpress-4.9.4.tar.gz) = 0e630bf940fd586b10e099cd9195b3e825fb194c 3SHA1 (wordpress-4.9.5.tar.gz) = 6992f19163e21720b5693bed71ffe1ab17a4533a
4RMD160 (wordpress-4.9.4.tar.gz) = de5ac34808c39de0b354c56c70414085842c1469 4RMD160 (wordpress-4.9.5.tar.gz) = bcdb1ecce6665516bec69744c25380ef719ca8f9
5SHA512 (wordpress-4.9.4.tar.gz) = 5cbfbb965bfaa071b91f942fd0bff7f7509fa022b700ce8473f0530bb701f4cd025da21c4de3184b3332c283a72d633d704157ebdf203da7a971642bf6fc0a32 5SHA512 (wordpress-4.9.5.tar.gz) = 958345a97429012dc17ee8223076539cbbe4a6f3daf057249be96b2b5be5ee97b5d2ad9031a748e22771eec3da890597fe2269fdc4c31d3389d7bdd79a904b80
6Size (wordpress-4.9.4.tar.gz) = 8565525 bytes 6Size (wordpress-4.9.5.tar.gz) = 8565154 bytes