CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php72

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php72
From: "S.P.Zeidler" <spz%netbsd.org@localhost>
Date: Sat, 3 Mar 2018 09:23:45 +0000

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Mar  3 09:23:45 UTC 2018

Modified Files:
        pkgsrc/lang/php72 [pkgsrc-2017Q4]: Makefile Makefile.common
            Makefile.php PLIST buildlink3.mk distinfo
        pkgsrc/lang/php72/patches [pkgsrc-2017Q4]: patch-configure
            patch-ext_imap_config.m4 patch-sapi_fpm_fpm_events_port.c
Removed Files:
        pkgsrc/lang/php72/patches [pkgsrc-2017Q4]: patch-ext_curl_config.m4
            patch-ext_pcre_pcrelib_config.h patch-ext_pdo__mysql_config.m4
            patch-ext_pdo_config.m4 patch-ext_sqlite3_libsqlite_sqlite3.c
            patch-makedist

Log Message:
Pullup ticket #5718 - requested by taca
lang/php72: security update

Revisions pulled up:
- lang/php72/Makefile                                           1.4-1.6
- lang/php72/Makefile.common                                    1.2
- lang/php72/Makefile.php                                       1.2-1.4
- lang/php72/PLIST                                              1.2
- lang/php72/buildlink3.mk                                      1.2-1.3
- lang/php72/distinfo                                           1.12-1.22
- lang/php72/patches/patch-configure                            1.5-1.10
- lang/php72/patches/patch-ext_curl_config.m4                   deleted
- lang/php72/patches/patch-ext_imap_config.m4                   deleted
- lang/php72/patches/patch-ext_pcre_pcrelib_config.h            deleted
- lang/php72/patches/patch-ext_pdo__mysql_config.m4             deleted
- lang/php72/patches/patch-ext_pdo_config.m4                    deleted
- lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c      deleted
- lang/php72/patches/patch-makedist                             deleted
- lang/php72/patches/patch-sapi_fpm_fpm_events_port.c           1.2

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Tue Jan 16 10:49:57 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure

   Log Message:
   php72: Don't automatically add libgcc on SunOS.

   To generate a diff of this commit:
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php72/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Wed Jan 31 21:10:18 UTC 2018

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

   Log Message:
   add new option argon2 to compile in the support for Argon2 password hashes
   (new in php 7.2.0)

   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php72/Makefile.php

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Fri Feb  2 12:50:38 UTC 2018

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure
   Removed Files:
        pkgsrc/lang/php72/patches: patch-ext_curl_config.m4
            patch-ext_pdo__mysql_config.m4 patch-ext_pdo_config.m4
            patch-makedist

   Log Message:
   Update php72 to php 7.2.2

   Changes since 7.2.1:

   Core:
   Fixed bug #75742 (potential memleak in internal classes's static members).
   Fixed bug #75679 (Path 260 character problem).
   Fixed bug #75614 (Some non-portable = in shell scripts).
   Fixed bug #75786 (segfault when using spread operator on generator passed by reference).
   Fixed bug #75799 (arg of get_defined_functions is optional).
   Fixed bug #75396 (Exit inside generator finally results in fatal error).

   FCGI:
   Fixed bug #75794 (getenv() crashes on Windows 7.2.1 when second parameter is false).

   IMAP:
   Fixed bug #75774 (imap_append HeapCorruction).

   Opcache:
   Fixed bug #75720 (File cache not populated after SHM runs full).
   Fixed bug #75687 (var 8 (TMP) has array key type but not value type).
   Fixed bug #75698 (Using @ crashes php7.2-fpm).
   Fixed bug #75579 (Interned strings buffer overflow may cause crash).

   PDO:
   Fixed bug #75616 (PDO extension doesn't allow to be built shared on Darwin).

   PDO MySQL:
   Fixed bug #75615 (PDO Mysql module can't be built as module).

   PGSQL:
   Fixed bug #75671 (pg_version() crashes when called on a connection to cockroach).
   Readline:
   Fixed bug #75775 (readline_read_history segfaults with empty file).

   SAPI:
   Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry).

   SOAP:
   Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is used).
   Fixed bug #75502 (Segmentation fault in zend_string_release).

   SPL:
   Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by reference).
   Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent class).
   Fixed bug #73209 (RecursiveArrayIterator does not iterate object properties).
   Standard:
   Fixed bug #75781 (substr_count incorrect result).
   Fixed bug #75653 (array_values don't work on empty array).

   Zip:
   Display headers (buildtime) and library (runtime) versions in phpinfo (with libzip >= 1.3.1).

   To generate a diff of this commit:
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php72/patches/patch-configure
   cvs rdiff -u -r1.2 -r0 pkgsrc/lang/php72/patches/patch-ext_curl_config.m4 \
       pkgsrc/lang/php72/patches/patch-ext_pdo_config.m4 \
       pkgsrc/lang/php72/patches/patch-makedist
   cvs rdiff -u -r1.3 -r0 \
       pkgsrc/lang/php72/patches/patch-ext_pdo__mysql_config.m4

-------------------------------------------------------------------
   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

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Sun Feb  4 16:19:00 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: Makefile Makefile.php distinfo
   Removed Files:
        pkgsrc/lang/php72/patches: patch-ext_sqlite3_libsqlite_sqlite3.c

   Log Message:
   Switch php72 to use pkgsrc sqlite3 library instead of the bundled one

   PHP bundles a sqlite3 lib, it's used when the build can't find
   system one. Switch to the pkgsrc-provided one, eliminating also
   need to maintain a local patch for it. While here make this into a
   tunable compile option 'sqlite3', by default on, same as before.

   To generate a diff of this commit:
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php72/Makefile
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php72/Makefile.php
   cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Mon Feb  5 08:51:25 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: Makefile Makefile.common Makefile.php PLIST
            buildlink3.mk distinfo
   Removed Files:
        pkgsrc/lang/php72/patches: patch-ext_pcre_pcrelib_config.h

   Log Message:
   Switch lang/php72 to use pkgsrc pcre library instead of the bundled one

   PHP bundles it's own copy of pcre 8.41 with the distribution, which
   is used when build doesn't find system one. Switch to the pkgsrc
   pcre, so that we don't need to maintain local PHP JIT patch here.
   Upcoming PHP 7.3 already switched to pcre2, so no value maintaining
   private PCRE patch any more (if there ever was).

   XXX devel/pcre doesn't seem to enable PCRE JIT, might be good to do so

   To generate a diff of this commit:
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php72/Makefile
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php72/Makefile.common \
       pkgsrc/lang/php72/PLIST pkgsrc/lang/php72/buildlink3.mk
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php72/Makefile.php
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/lang/php72/patches/patch-ext_pcre_pcrelib_config.h

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Mon Feb  5 11:21:56 UTC 2018

   Modified Files:
        pkgsrc/lang/php70: buildlink3.mk
        pkgsrc/lang/php71: buildlink3.mk
        pkgsrc/lang/php72: buildlink3.mk

   Log Message:
   php7*: Standardise on major.minor.99 usage in buildlink3.mk

   With the introduction of beta and rc releases of php7* into pkgsrc the pattern
   matching is often incorrect (for example the current version of php-7.1.0rc6
   breaks both <7.1.0 and >=7.1.0).  Using .99 is not ideal but does at least
   avoid the confusion developers seem to be having with the pmatch ordering.

   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php72/buildlink3.mk

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Thu Feb  8 20:55:42 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure

   Log Message:
   remove part of configure patch related to sqlite3

   the part of the patch is not needed anymore, we use external sqlite3 lib,
   and the patch was for the bundled sqlite3 build

   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/php72/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Thu Feb  8 21:23:04 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure

   Log Message:
   drop patch removing pthread checks for apache <2.4.1 module build

   the patch predates php56, doesn't seem to be necessary when building
   with apache22, and we want to reduce diffs against upstream; maybe
   that part was needed with distant past with apache 1.3 or whatnot,
   but that is not in pkgsrc any more

   To generate a diff of this commit:
   cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/php72/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Thu Feb  8 21:50:55 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure

   Log Message:
   note configure meta_ccld was reported upstream as #75940

   To generate a diff of this commit:
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php72/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Fri Feb  9 00:01:13 UTC 2018

   Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches: patch-configure

   Log Message:
   Add upstream bug report number for the libgcc part of patch too

   Thanks Jonathan for elaboration of why it's necessary.

   To generate a diff of this commit:
   cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php72/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Fri Feb 16 22:26:29 UTC 2018

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

   Log Message:
   remove patches/patch-ext_imap_config.m4, it's not needed any more

   mail/php-imap was changed to not use the option this patch adds; it was
   also entirely ineffective in what it was supposed to do

   To generate a diff of this commit:
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/php72/distinfo
   cvs rdiff -u -r1.2 -r0 pkgsrc/lang/php72/patches/patch-ext_imap_config.m4

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Mar  2 02:11:24 UTC 2018

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

   Log Message:
   lang/php72: update to 7.2.3

   01 Mar 2018, PHP 7.2.3

   - Core:
     . Fixed bug #75864 ("stream_isatty" returns wrong value on s390x). (Sam Ding)

   - Apache2Handler:
     . Fixed bug #75882 (a simple way for segfaults in threadsafe php just with
       configuration). (Anatol)

   - Date:
     . Fixed bug #75857 (Timezone gets truncated when formatted). (carusogabriel)
     . Fixed bug #75928 (Argument 2 for `DateTimeZone::listIdentifiers()` should
       accept `null`). (Pedro Lacerda)
     . Fixed bug #68406 (calling var_dump on a DateTimeZone object modifies it).
       (jhdxr)

   - LDAP:
     . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)

   - libxml2:
     . Fixed bug #75871 (use pkg-config where available). (pmmaga)

   - PGSQL:
     . Fixed bug #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)

   - Phar:
     . Fixed bug #54289 (Phar::extractTo() does not accept specific directories to
       be extracted). (bishop)
     . Fixed bug #65414 (deal with leading slash while adding files correctly).
       (bishopb)
     . Fixed bug #65414 (deal with leading slash when adding files correctly).
       (bishopb)

   - ODBC:
     . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)

   - Opcache:
     . Fixed bug #75729 (opcache segfault when installing Bitrix). (Nikita)
     . Fixed bug #75893 (file_get_contents $http_response_header variable bugged
       with opcache). (Nikita)
     . Fixed bug #75938 (Modulus value not stored in variable). (Nikita)

   - SPL:
     . Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)

   - Standard:
     . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
       Philip Sharp)
     . Fixed bug #75981 (Prevent reading beyond buffer start in http wrapper).
       (Stas)

   To generate a diff of this commit:
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php72/Makefile
   cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/php72/distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 pkgsrc/lang/php72/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 pkgsrc/lang/php72/Makefile.common \
    pkgsrc/lang/php72/Makefile.php pkgsrc/lang/php72/PLIST \
    pkgsrc/lang/php72/buildlink3.mk
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 pkgsrc/lang/php72/distinfo
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/lang/php72/patches/patch-configure
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/php72/patches/patch-ext_curl_config.m4 \
    pkgsrc/lang/php72/patches/patch-ext_pdo_config.m4 \
    pkgsrc/lang/php72/patches/patch-makedist
cvs rdiff -u -r1.1 -r1.1.2.1 \
    pkgsrc/lang/php72/patches/patch-ext_imap_config.m4 \
    pkgsrc/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/php72/patches/patch-ext_pcre_pcrelib_config.h \
    pkgsrc/lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/lang/php72/patches/patch-ext_pdo__mysql_config.m4

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/Makefile
diff -u pkgsrc/lang/php72/Makefile:1.3 pkgsrc/lang/php72/Makefile:1.3.2.1
--- pkgsrc/lang/php72/Makefile:1.3      Thu Nov 30 20:45:46 2017
+++ pkgsrc/lang/php72/Makefile  Sat Mar  3 09:23:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/11/30 20:45:46 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2018/03/03 09:23:45 spz Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -41,13 +41,6 @@ SUBST_SED.path+=     -e 's,@PREFIX@,${PREFIX
 
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# segfault generating phar.phar for i386 & SPARC
-# revisit this if builtin PCRE is updated beyond PCRE1 8.38
-# https://bugs.php.net/bug.php?id=73880
-.if ${MACHINE_ARCH} != "x86_64"
-CONFIGURE_ARGS+=       --without-pcre-jit
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes

Index: pkgsrc/lang/php72/Makefile.common
diff -u pkgsrc/lang/php72/Makefile.common:1.1 pkgsrc/lang/php72/Makefile.common:1.1.2.1
--- pkgsrc/lang/php72/Makefile.common:1.1       Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/Makefile.common   Sat Mar  3 09:23:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.1.2.1 2018/03/03 09:23:45 spz Exp $
 # used by lang/php72/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php72-extensions/Makefile
@@ -18,3 +18,10 @@ CONFIGURE_ENV+=              PHP_LIBXML_SHARED="1"
 # configure test gets confused by wrappers dropping -R /usr/lib
 CONFIGURE_ARGS+=       php_cv_cc_dashr=no
 .endif
+
+# not every extension actually depend on PCRE, and those which do
+# don't use internal pcre structures, so default to build-time
+# dependency only
+BUILDLINK_DEPMETHOD.pcre?=     build
+CONFIGURE_ARGS+=       --with-pcre-dir=${BUILDLINK_PREFIX.pcre}
+.include "../../devel/pcre/buildlink3.mk"
Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.1 pkgsrc/lang/php72/Makefile.php:1.1.2.1
--- pkgsrc/lang/php72/Makefile.php:1.1  Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/Makefile.php      Sat Mar  3 09:23:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.1.2.1 2018/03/03 09:23:45 spz Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -8,6 +8,9 @@
 GCC_REQD+=              4.9
 .endif
 
+# the binary actually needs full dep on PCRE
+BUILDLINK_DEPMETHOD.pcre=      full
+
 .include "../../lang/php72/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo
@@ -44,9 +47,11 @@ CONFIGURE_ARGS+=     --enable-xml
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-pcre-regex=${BUILDLINK_PREFIX.pcre}
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline
-PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 sqlite3
+PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline sqlite3
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=        dtrace
@@ -92,5 +97,17 @@ CONFIGURE_ARGS+=     --enable-dtrace
 INSTALL_MAKE_FLAGS+=   -r
 .endif
 
+.if !empty(PKG_OPTIONS:Margon2)
+CONFIGURE_ARGS+=       --with-password-argon2=${BUILDLINK_PREFIX.argon2}
+.include "../../security/argon2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=    --without-sqlite3
+.endif
+
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
Index: pkgsrc/lang/php72/PLIST
diff -u pkgsrc/lang/php72/PLIST:1.1 pkgsrc/lang/php72/PLIST:1.1.2.1
--- pkgsrc/lang/php72/PLIST:1.1 Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/PLIST     Sat Mar  3 09:23:45 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2018/03/03 09:23:45 spz Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -131,11 +131,6 @@ include/php/ext/mysqlnd/mysqlnd_structs.
 include/php/ext/mysqlnd/mysqlnd_vio.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcrelib/config.h
-include/php/ext/pcre/pcrelib/pcre.h
-include/php/ext/pcre/pcrelib/pcre_internal.h
-include/php/ext/pcre/pcrelib/pcreposix.h
-include/php/ext/pcre/pcrelib/ucp.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/phar/php_phar.h
 include/php/ext/session/mod_files.h
Index: pkgsrc/lang/php72/buildlink3.mk
diff -u pkgsrc/lang/php72/buildlink3.mk:1.1 pkgsrc/lang/php72/buildlink3.mk:1.1.2.1
--- pkgsrc/lang/php72/buildlink3.mk:1.1 Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/buildlink3.mk     Sat Mar  3 09:23:45 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.1.2.1 2018/03/03 09:23:45 spz Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.2.0rc1<7.3
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.2.0rc1<7.3
+BUILDLINK_API_DEPENDS.php+=    php>=7.1.99<7.2.99
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.1.99<7.2.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php72
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/php72/distinfo
diff -u pkgsrc/lang/php72/distinfo:1.10.2.1 pkgsrc/lang/php72/distinfo:1.10.2.2
--- pkgsrc/lang/php72/distinfo:1.10.2.1 Sun Jan  7 18:01:22 2018
+++ pkgsrc/lang/php72/distinfo  Sat Mar  3 09:23:45 2018
@@ -1,26 +1,19 @@
-$NetBSD: distinfo,v 1.10.2.1 2018/01/07 18:01:22 bsiegert Exp $
+$NetBSD: distinfo,v 1.10.2.2 2018/03/03 09:23:45 spz Exp $
 
-SHA1 (php-7.2.1.tar.bz2) = 3e5ad89b44fb83b9c356ba11c1c62b9ff3fad633
-RMD160 (php-7.2.1.tar.bz2) = 1959cd1fff0b222d20afd0aaf57f4c557ce72b51
-SHA512 (php-7.2.1.tar.bz2) = e9b6c013a06a771c2fa7581e49e6d6e019fe8fc6f8881a43905f7e87df5fc05420559fe40fb663d272ffc5cc188c4ef7c3ca835f5c542a28ca8de1cd42782865
-Size (php-7.2.1.tar.bz2) = 14980278 bytes
-SHA1 (patch-configure) = 71d2e8334bea48db1e65c82219f2a93cf8d46159
-SHA1 (patch-ext_curl_config.m4) = 86a293d57aafcd42d1feab4a6d0d4f88dbcfb5c8
+SHA1 (php-7.2.3.tar.bz2) = 6007a31a9b3665de7507ba24a67a3cc944a08f11
+RMD160 (php-7.2.3.tar.bz2) = 5c972d2c12c2fb2119ca4eb46f8961f2e95dff60
+SHA512 (php-7.2.3.tar.bz2) = 6b7e3e86ed42fb48762309a20c6a519202d2454fcb7be51e328ca47a3ca5fdbff8d21a435c31b4e73a9901b733cacd39d4a5287c16cced135799d2117a789e90
+Size (php-7.2.3.tar.bz2) = 15012465 bytes
+SHA1 (patch-configure) = 47f2ede97390cc7e46d04c2769dd97459b19450a
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
-SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
-SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
-SHA1 (patch-ext_pdo__mysql_config.m4) = f7026001b9c40ae92f13400bd8002e59d4c17311
-SHA1 (patch-ext_pdo_config.m4) = 95f3c1ccf696f6686da320e309b48cfcaadb5e43
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
-SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
-SHA1 (patch-makedist) = 3e796ab59bece3f762f41fd0c6f142c88c2d88a8
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
 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-configure
diff -u pkgsrc/lang/php72/patches/patch-configure:1.4 pkgsrc/lang/php72/patches/patch-configure:1.4.2.1
--- pkgsrc/lang/php72/patches/patch-configure:1.4       Sun Dec  3 12:54:34 2017
+++ pkgsrc/lang/php72/patches/patch-configure   Sat Mar  3 09:23:45 2018
@@ -1,54 +1,22 @@
-$NetBSD: patch-configure,v 1.4 2017/12/03 12:54:34 jdolecek Exp $
+$NetBSD: patch-configure,v 1.4.2.1 2018/03/03 09:23:45 spz Exp $
 
---- configure.orig     2017-11-07 11:57:02.000000000 +0000
+Don't automatically add libgcc on SunOS. Reported upstream as #75941.
+
+The meta_ccld removal reported upstream as #75940.
+
+--- configure.orig     2018-01-30 10:33:52.000000000 +0000
 +++ configure
-@@ -7007,27 +7007,6 @@ EOF
-     ;;
-   esac
- 
--  if test "$APACHE_VERSION" -lt 2004001; then
--    APXS_MPM=`$APXS -q MPM_NAME`
--    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
--
--  enable_maintainer_zts=yes
--  if test "$pthreads_working" != "yes"; then
--    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
--  fi
--
--    fi
--  else
--    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
--    if test -n "$APACHE_THREADED_MPM"; then
--
--  enable_maintainer_zts=yes
--  if test "$pthreads_working" != "yes"; then
--    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
--  fi
--
+@@ -5461,9 +5461,6 @@ fi
+ case $host_alias in
+   *solaris*)
+     CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+-    if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
+-      enable_libgcc=yes
 -    fi
--  fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
-@@ -21090,7 +21069,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
-     PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
- 
- 
--    for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
-+    for header_file; do
- 
- 
-   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -23626,7 +23605,7 @@ fi
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl.pc" >&5
- $as_echo_n "checking for libcurl.pc... " >&6; }
--    if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then
-+    if test "$PHP_CURL" = "yes" -o "$PHP_CURL" = "/usr"; then
-       PKNAME=libcurl
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default path" >&5
- $as_echo "using default path" >&6; }
-@@ -95975,12 +95954,7 @@ old_CC=$CC
+     ;;
+   *dgux*)
+     CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
+@@ -96116,12 +96113,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"

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.1.2.1
--- 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  Sat Mar  3 09:23:45 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.1.2.1 2018/03/03 09:23:45 spz 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.1.2.1
--- 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  Sat Mar  3 09:23:45 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.1.2.1 2018/03/03 09:23:45 spz 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

Prev by Date: CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php71
Next by Date: CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php
Previous by Thread: CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php71
Next by Thread: CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/php
Indexes:

Home | Main Index | Thread Index | Old Index