CVS commit: [pkgsrc-2018Q2] pkgsrc/lang

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Sep 18 18:42:14 UTC 2018

Modified Files:
        pkgsrc/lang/php [pkgsrc-2018Q2]: phpversion.mk
        pkgsrc/lang/php70 [pkgsrc-2018Q2]: Makefile.php distinfo

Log Message:
Pullup ticket #5834 - requested by taca
lang/php70: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.230
- lang/php70/Makefile.php                                       1.10
- lang/php70/distinfo                                           1.48

---
   Module Name: pkgsrc
   Committed By:        manu
   Date:                Mon Jul 30 07:17:16 UTC 2018

   Modified Files:
        pkgsrc/lang/php70: Makefile.php
        pkgsrc/lang/php71: Makefile.php
        pkgsrc/lang/php72: Makefile.php

   Log Message:
   Fix PHP buidl on i386

   The --disable-gcc-global-regs fix is not enough, we really need
   GCC 6 to avoid php crashing during www/ap-ph build.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Sep 13 15:46:38 UTC 2018

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php70: distinfo

   Log Message:
   lang/php70: Update to 7.0.32

   13 Sep 2018 PHP 7.0.32

   - Apache2
     . Fixed bug #76582 (XSS due to the header Transfer-Encoding: chunked). (Stas)


To generate a diff of this commit:
cvs rdiff -u -r1.221.2.6 -r1.221.2.7 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.7.10.1 -r1.7.10.2 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.45.2.1 -r1.45.2.2 pkgsrc/lang/php70/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.221.2.6 pkgsrc/lang/php/phpversion.mk:1.221.2.7
--- pkgsrc/lang/php/phpversion.mk:1.221.2.6     Tue Sep 18 18:34:08 2018
+++ pkgsrc/lang/php/phpversion.mk       Tue Sep 18 18:42:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.221.2.6 2018/09/18 18:34:08 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.221.2.7 2018/09/18 18:42:13 bsiegert Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -88,7 +88,7 @@ PHPVERSION_MK=        defined
 
 # Define each PHP's version.
 PHP56_VERSION= 5.6.37
-PHP70_VERSION= 7.0.31
+PHP70_VERSION= 7.0.32
 PHP71_VERSION= 7.1.22
 PHP72_VERSION= 7.2.10
 

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.7.10.1 pkgsrc/lang/php70/Makefile.php:1.7.10.2
--- pkgsrc/lang/php70/Makefile.php:1.7.10.1     Fri Aug 17 17:37:22 2018
+++ pkgsrc/lang/php70/Makefile.php      Tue Sep 18 18:42:13 2018
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile.php,v 1.7.10.1 2018/08/17 17:37:22 bsiegert Exp $
+# $NetBSD: Makefile.php,v 1.7.10.2 2018/09/18 18:42:13 bsiegert Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# With --disable-gcc-global-regs, works around
+# https://bugs.php.net/bug.php?id=74527
+.if ${MACHINE_ARCH} == "i386"
+GCC_REQD+=             6.4
+.endif
+
 .include "../../lang/php70/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo

Index: pkgsrc/lang/php70/distinfo
diff -u pkgsrc/lang/php70/distinfo:1.45.2.1 pkgsrc/lang/php70/distinfo:1.45.2.2
--- pkgsrc/lang/php70/distinfo:1.45.2.1 Fri Aug 17 17:37:22 2018
+++ pkgsrc/lang/php70/distinfo  Tue Sep 18 18:42:13 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45.2.1 2018/08/17 17:37:22 bsiegert Exp $
+$NetBSD: distinfo,v 1.45.2.2 2018/09/18 18:42:13 bsiegert Exp $
 
-SHA1 (php-7.0.31.tar.bz2) = 4da4e41b37445b0f5166df37583d23c78ca8e358
-RMD160 (php-7.0.31.tar.bz2) = f34a43e8809a25b0b8af78a62ab92d8f3012825e
-SHA512 (php-7.0.31.tar.bz2) = f496ca871245c0ddbbc848ad2c46d24e789c8cc3f1be489b87d25d353c5773ea9c54c2a54dfb2c4e9fc6b08cdf812305fa6bd0d80615f33f0db9d21edee3636b
-Size (php-7.0.31.tar.bz2) = 14641488 bytes
+SHA1 (php-7.0.32.tar.bz2) = b323e00d91bfdfae087a025b9233527e48d99772
+RMD160 (php-7.0.32.tar.bz2) = f26eb5d3e82555502ddf749bc7b08d9d2a72db22
+SHA512 (php-7.0.32.tar.bz2) = 4a87df7e9af6cfbf348a7fccb13d0dbf8c19a5f35d1061fde077f657429b15bebcbbd864b83d886bd397b98ff69ec38cf21cb90219bd05a5b57afeb18af47f87
+Size (php-7.0.32.tar.bz2) = 14643727 bytes
 SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
 SHA1 (patch-configure) = 68ca63d7623feee2f12c9e1abacf4a5d7827d96c
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c