CVS commit: [pkgsrc-2019Q3] pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 25 13:02:39 UTC 2019

Modified Files:
        pkgsrc/lang/php [pkgsrc-2019Q3]: phpversion.mk
        pkgsrc/lang/php71 [pkgsrc-2019Q3]: Makefile Makefile.php distinfo

Log Message:
Pullup ticket #6077 - requested by taca
lang/php71: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.273
- lang/php71/Makefile                                           1.21
- lang/php71/Makefile.php                                       1.14
- lang/php71/distinfo                                           1.55

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Oct 25 02:58:33 UTC 2019

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php71: Makefile Makefile.php distinfo

   Log Message:
   lang/php71: update to 7.1.33

   Update php71 to 7.1.33.

   24 Oct 2019, PHP 7.1.33

   - FPM:
     . Fixed bug #78599 (env_path_info underflow in fpm_main.c can lead to RCE).
       (CVE-2019-11043) (Jakub Zelenka)


To generate a diff of this commit:
cvs rdiff -u -r1.268.2.2 -r1.268.2.3 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.20 -r1.20.2.1 pkgsrc/lang/php71/Makefile
cvs rdiff -u -r1.13 -r1.13.8.1 pkgsrc/lang/php71/Makefile.php
cvs rdiff -u -r1.54 -r1.54.2.1 pkgsrc/lang/php71/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.268.2.2 pkgsrc/lang/php/phpversion.mk:1.268.2.3
--- pkgsrc/lang/php/phpversion.mk:1.268.2.2     Fri Oct 25 11:59:44 2019
+++ pkgsrc/lang/php/phpversion.mk       Fri Oct 25 13:02:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.268.2.2 2019/10/25 11:59:44 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.268.2.3 2019/10/25 13:02:39 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.40
-PHP71_VERSION= 7.1.32
+PHP71_VERSION= 7.1.33
 PHP72_VERSION= 7.2.24
 PHP73_VERSION= 7.3.11
 

Index: pkgsrc/lang/php71/Makefile
diff -u pkgsrc/lang/php71/Makefile:1.20 pkgsrc/lang/php71/Makefile:1.20.2.1
--- pkgsrc/lang/php71/Makefile:1.20     Wed Jul  3 07:30:50 2019
+++ pkgsrc/lang/php71/Makefile  Fri Oct 25 13:02:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/07/03 07:30:50 nia Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2019/10/25 13:02:39 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -6,7 +6,6 @@
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
 CATEGORIES=            lang
 
-HOMEPAGE=              https://www.php.net/
 COMMENT=               PHP Hypertext Preprocessor version 7.1
 LICENSE=               php
 

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.13 pkgsrc/lang/php71/Makefile.php:1.13.8.1
--- pkgsrc/lang/php71/Makefile.php:1.13 Sun Dec  9 12:14:36 2018
+++ pkgsrc/lang/php71/Makefile.php      Fri Oct 25 13:02:39 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.php,v 1.13 2018/12/09 12:14:36 taca Exp $
+# $NetBSD: Makefile.php,v 1.13.8.1 2019/10/25 13:02:39 bsiegert Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
-# With --disable-gcc-global-regs, works around 
+# With --disable-gcc-global-regs, works around
 # https://bugs.php.net/bug.php?id=74527
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
@@ -80,7 +80,6 @@ CONFIGURE_ARGS+=      --enable-maintainer-zts
 .endif
 
 .if !empty(PKG_OPTIONS:Mreadline)
-USE_GNU_READLINE=      yes
 .include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
 .else

Index: pkgsrc/lang/php71/distinfo
diff -u pkgsrc/lang/php71/distinfo:1.54 pkgsrc/lang/php71/distinfo:1.54.2.1
--- pkgsrc/lang/php71/distinfo:1.54     Sun Sep  1 13:04:13 2019
+++ pkgsrc/lang/php71/distinfo  Fri Oct 25 13:02:39 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2019/09/01 13:04:13 taca Exp $
+$NetBSD: distinfo,v 1.54.2.1 2019/10/25 13:02:39 bsiegert Exp $
 
-SHA1 (php-7.1.32.tar.bz2) = 6c469fdec96ed7bef61bb94031aa7737ee4d9e25
-RMD160 (php-7.1.32.tar.bz2) = da6068c0df768040b7d4cc46e606f24711a969ec
-SHA512 (php-7.1.32.tar.bz2) = c13b13575a505d9a6498b1d5c208b75490fb567ca8aca515d79e569c1f0ca289816178511e616f2bbec5c8840ed273719ff5841de4e7ad91e261f9ca4d6baa92
-Size (php-7.1.32.tar.bz2) = 15332345 bytes
+SHA1 (php-7.1.33.tar.bz2) = 2a2961b949f6b88e743bce06b86055c05747b6c8
+RMD160 (php-7.1.33.tar.bz2) = e3802bac9fcabb4e844e3c5e86337749112ef545
+SHA512 (php-7.1.33.tar.bz2) = 60ecf04a5fcb77ad839f5c5514f0d83e16aa9d3cc5250a428ff6cb43defc9d1626bdb5b5ea2671261cc273c51c18387d6267307e28c25d18ca98b212cec7cc99
+Size (php-7.1.33.tar.bz2) = 15332144 bytes
 SHA1 (patch-acinclude.m4) = c232e68dbcd58bbfdf6800e491eb46812df15f65
 SHA1 (patch-configure) = 862707ff3fd8b8d7312104bb44a48fe8379951bd
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c