CVS commit: pkgsrc/lang

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Jun  4 13:56:31 UTC 2021

Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php80: distinfo
        pkgsrc/lang/php80/patches: patch-sapi_fpm_fpm_events_port.c

Log Message:
lang/php80: update to 8.0.7

03 Jun 2021, PHP 8.0.7

- Core:
  . Fixed bug #80960 (opendir() warning wrong info when failed on Windows).
    (cmb)
  . Fixed bug #67792 (HTTP Authorization schemes are treated as case-sensitive).
    (cmb)
  . Fixed bug #80972 (Memory exhaustion on invalid string offset). (girgias)

- FPM:
  . Fixed bug #65800 (Events port mechanism). (psumbera)

- FTP:
  . Fixed bug #80901 (Info leak in ftp extension). (cmb)
  . Fixed bug #79100 (Wrong FTP error messages). (cmb)

- GD:
  . Fixed bug #81032 (GD install is affected by external libgd installation).
    (Flavio Heleno, cmb)

- Intl:
  . Fixed bug #81019 (Unable to clone NumberFormatter after failed parse()).
    (Nikita)

- MBString:
  . Fixed bug #81011 (mb_convert_encoding removes references from arrays). (cmb)

- ODBC:
  . Fixed bug #80460 (ODBC doesn't account for SQL_NO_TOTAL indicator). (cmb)

- Opcache:
  . Fixed bug #81007 (JIT "not supported" on 32-bit x86 -- build problem?).
    (Nikita)
  . Fixed bug #81015 (Opcache optimization assumes wrong part of ternary
    operator in if-condition). (Nikita)
  . Fixed bug #81046 (Literal compaction merges non-equal related literals).
    (Nikita)

- PDO_MySQL:
  . Fixed bug #81037 (PDO discards error message text from prepared
    statement). (Kamil Tekiela)

- PDO_ODBC:
  . Fixed bug #44643 (bound parameters ignore explicit type definitions). (cmb)

- pgsql:
  . Fixed php_pgsql_fd_cast() wrt. php_stream_can_cast(). (cmb)

- SPL:
  . Fixed bug #80933 (SplFileObject::DROP_NEW_LINE is broken for NUL and CR).
    (cmb, Nikita)

- XMLReader:
  . Fixed bug #73246 (XMLReader: encoding length not checked). (cmb)

- Zip:
  . Fixed bug #80863 (ZipArchive::extractTo() ignores references). (cmb)


To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php80/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c

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.329 pkgsrc/lang/php/phpversion.mk:1.330
--- pkgsrc/lang/php/phpversion.mk:1.329 Thu Jun  3 15:30:25 2021
+++ pkgsrc/lang/php/phpversion.mk       Fri Jun  4 13:56:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.329 2021/06/03 15:30:25 taca Exp $
+# $NetBSD: phpversion.mk,v 1.330 2021/06/04 13:56:31 taca 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
@@ -90,7 +90,7 @@ PHPVERSION_MK=        defined
 PHP56_VERSION= 5.6.40
 PHP73_VERSION= 7.3.28
 PHP74_VERSION= 7.4.20
-PHP80_VERSION= 8.0.6
+PHP80_VERSION= 8.0.7
 
 # Define initial release of major version.
 PHP56_RELDATE= 20140828

Index: pkgsrc/lang/php80/distinfo
diff -u pkgsrc/lang/php80/distinfo:1.3 pkgsrc/lang/php80/distinfo:1.4
--- pkgsrc/lang/php80/distinfo:1.3      Fri May  7 14:46:52 2021
+++ pkgsrc/lang/php80/distinfo  Fri Jun  4 13:56:31 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2021/05/07 14:46:52 taca Exp $
+$NetBSD: distinfo,v 1.4 2021/06/04 13:56:31 taca Exp $
 
-SHA1 (php-8.0.6.tar.xz) = c9b215f2281bdc259b048d3748475b85eadb4818
-RMD160 (php-8.0.6.tar.xz) = a13e282969590054289e8e3e341a9bac2e040b71
-SHA512 (php-8.0.6.tar.xz) = 4915b9b5024ce1fb7bc3ba7c1a00831841bc970ebb68b6b1e6a00cbec4d8dcbbca3ca043882ffd9c4719a988d08275f77f9cee07ff3d45a71402dfc51bd31e04
-Size (php-8.0.6.tar.xz) = 10764932 bytes
+SHA1 (php-8.0.7.tar.xz) = 1c1af07d790a85103863e9818def633c737010e2
+RMD160 (php-8.0.7.tar.xz) = 577fe1acbfacf21cec91d42474d2b581dff356b8
+SHA512 (php-8.0.7.tar.xz) = 54d0355977a69c3c466054e9e277147874eaab192bc384a199eb98582f9fcccebc685b370dabeb65d2de3bad4d2e4b2490c0164d2ce406af76b0e972ea67bbd0
+Size (php-8.0.7.tar.xz) = 10769208 bytes
 SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
 SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
@@ -15,5 +15,5 @@ SHA1 (patch-php.ini-development) = e6815
 SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
-SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
+SHA1 (patch-sapi_fpm_fpm_events_port.c) = 30ecee10f6d34b7422972e1e275b4f73c7fd964d
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0

Index: pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c
diff -u pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c:1.1 pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c:1.2
--- pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c:1.1      Sun Mar  7 13:41:36 2021
+++ pkgsrc/lang/php80/patches/patch-sapi_fpm_fpm_events_port.c  Fri Jun  4 13:56:31 2021
@@ -1,28 +1,12 @@
-$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2021/03/07 13:41:36 taca Exp $
+$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2021/06/04 13:56:31 taca Exp $
 
 Similar to upstream bug #65800. We should resubmit this patch and
 get that bugfix intergrated, by changing port_associate() call to
 use the wrapper fpm_event_port_add().
 
---- sapi/fpm/fpm/events/port.c.orig    2015-06-23 17:33:33.000000000 +0000
+--- sapi/fpm/fpm/events/port.c.orig    2021-06-01 18:43:05.000000000 +0000
 +++ sapi/fpm/fpm/events/port.c
-@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp
-       t.tv_nsec = (timeout % 1000) * 1000 * 1000;
- 
-       /* wait for inconming event or timeout. We want at least one event or timeout */
-+again:
-       nget = 1;
-       ret = port_getn(pfd, events, nevents, &nget, &t);
-       if (ret < 0) {
-@@ -133,17 +134,31 @@ static int fpm_event_port_wait(struct fp
-                       zlog(ZLOG_WARNING, "poll() returns %d", errno);
-                       return -1;
-               }
-+
-+              if (errno == EINTR)
-+                      goto again;
-+
-+              return 0;
+@@ -145,14 +145,23 @@ static int fpm_event_port_wait(struct fp
        }
  
        for (i = 0; i < nget; i++) {