CVS commit: pkgsrc/lang/php80

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat May 21 16:00:11 UTC 2022

Modified Files:
        pkgsrc/lang/php80: Makefile distinfo
Added Files:
        pkgsrc/lang/php80/patches: patch-main_streams_streams.c

Log Message:
php80: allow copying files with size zero

Allow copying files with size zero.  This behavior differ from PHP 7.4
and break a pear package which contains files with size zero.

Bump PKGREVISION.

XXX: pullup-2022Q1


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/php80/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/php80/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php80/patches/patch-main_streams_streams.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/php80/Makefile
diff -u pkgsrc/lang/php80/Makefile:1.7 pkgsrc/lang/php80/Makefile:1.8
--- pkgsrc/lang/php80/Makefile:1.7      Thu May 12 14:03:25 2022
+++ pkgsrc/lang/php80/Makefile  Sat May 21 16:00:11 2022
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2022/05/12 14:03:25 taca Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/21 16:00:11 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
+PKGREVISION=           1
 
 COMMENT=               PHP Hypertext Preprocessor version 8.0
 LICENSE=               php

Index: pkgsrc/lang/php80/distinfo
diff -u pkgsrc/lang/php80/distinfo:1.19 pkgsrc/lang/php80/distinfo:1.20
--- pkgsrc/lang/php80/distinfo:1.19     Thu May 12 14:03:25 2022
+++ pkgsrc/lang/php80/distinfo  Sat May 21 16:00:11 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2022/05/12 14:03:25 taca Exp $
+$NetBSD: distinfo,v 1.20 2022/05/21 16:00:11 taca Exp $
 
 BLAKE2s (php-8.0.19.tar.xz) = 9c2620a24bcf565f825e3153268f18bc7527c09f0e918210a2b526a7f4ffe832
 SHA512 (php-8.0.19.tar.xz) = 106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8
@@ -11,6 +11,7 @@ SHA1 (patch-ext_openssl_openssl.c) = 6d8
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
+SHA1 (patch-main_streams_streams.c) = e70cfc7f7ef096d9705c1f7dafd9e90d435d5150
 SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
 SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8

Added files:

Index: pkgsrc/lang/php80/patches/patch-main_streams_streams.c
diff -u /dev/null pkgsrc/lang/php80/patches/patch-main_streams_streams.c:1.1
--- /dev/null   Sat May 21 16:00:11 2022
+++ pkgsrc/lang/php80/patches/patch-main_streams_streams.c      Sat May 21 16:00:11 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-main_streams_streams.c,v 1.1 2022/05/21 16:00:11 taca Exp $
+
+* Allow copying files with size zero.
+
+--- main/streams/streams.c.orig        2022-05-10 08:07:35.000000000 +0000
++++ main/streams/streams.c
+@@ -1575,10 +1575,8 @@ PHPAPI int _php_stream_copy_to_stream_ex
+ 
+                               *len = haveread += didwrite;
+ 
+-                              /* we've got at least 1 byte to read
+-                               * less than 1 is an error
+-                               * AND read bytes match written */
+-                              if (mapped == 0 || mapped != didwrite) {
++                              /* read bytes match written */
++                              if (mapped != didwrite) {
+                                       return FAILURE;
+                               }
+                               if (mapped < chunk_size) {