CVS commit: pkgsrc/lang/php72

["Jaromir Dolecek" <jdolecek%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Sun Feb  4 15:38:41 UTC 2018

Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-ext_imap_config.m4
            patch-sapi_fpm_fpm_events_port.c

Log Message:
note upstream bug report numbers for two more patches


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php72/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php72/patches/patch-ext_imap_config.m4 \
    pkgsrc/lang/php72/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/php72/distinfo
diff -u pkgsrc/lang/php72/distinfo:1.13 pkgsrc/lang/php72/distinfo:1.14
--- pkgsrc/lang/php72/distinfo:1.13     Fri Feb  2 12:50:38 2018
+++ pkgsrc/lang/php72/distinfo  Sun Feb  4 15:38:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2018/02/02 12:50:38 jdolecek Exp $
+$NetBSD: distinfo,v 1.14 2018/02/04 15:38:41 jdolecek Exp $
 
 SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066
 RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca
@@ -6,7 +6,7 @@ SHA512 (php-7.2.2.tar.bz2) = d2bc3725b51
 Size (php-7.2.2.tar.bz2) = 14618006 bytes
 SHA1 (patch-configure) = 5dad0ba760f5fb6aa55dc3136655b78c29e23bca
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
-SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
+SHA1 (patch-ext_imap_config.m4) = 6a667b2580901dccfd0174aec56dad629689d7bd
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
@@ -18,5 +18,5 @@ SHA1 (patch-php.ini-production) = ae61df
 SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
 SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
-SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
+SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7

Index: pkgsrc/lang/php72/patches/patch-ext_imap_config.m4
diff -u pkgsrc/lang/php72/patches/patch-ext_imap_config.m4:1.1 pkgsrc/lang/php72/patches/patch-ext_imap_config.m4:1.2
--- pkgsrc/lang/php72/patches/patch-ext_imap_config.m4:1.1      Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/patches/patch-ext_imap_config.m4  Sun Feb  4 15:38:41 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_imap_config.m4,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+$NetBSD: patch-ext_imap_config.m4,v 1.2 2018/02/04 15:38:41 jdolecek Exp $
+
+Reported upstream as #26936
 
 --- ext/imap/config.m4.orig    2015-06-23 17:33:33.000000000 +0000
 +++ ext/imap/config.m4
Index: pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c
diff -u pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c:1.1 pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c:1.2
--- pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c:1.1      Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c  Sun Feb  4 15:38:41 2018
@@ -1,4 +1,8 @@
-$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2018/02/04 15:38:41 jdolecek 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