 @@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.30.2.1 2018/01/07 17:39:56 bsiegert Exp $
+$NetBSD: distinfo,v 1.30.2.2 2018/03/03 09:23:40 spz Exp $
-SHA1 (php-7.1.13.tar.bz2) = 117306b9e66db0e651c3f7a77c60c3b9cfe3b111
+SHA1 (php-7.1.15.tar.bz2) = 857aad496a14505ad5f61617621a2e35100a3758
-RMD160 (php-7.1.13.tar.bz2) = a8851a06c7e86bd4ad3f2c39de7337b271c429fe
+RMD160 (php-7.1.15.tar.bz2) = 5b84646a2cbfd3cc90dfa1709aa94df3a1b3f1b9
-SHA512 (php-7.1.13.tar.bz2) = dbab037b5e7c60877f46a201e1712000ba14ae2a984d4f4d4e752c6e1b2797b0f67fbb0b10c69fea77e27cc64c27222459a26772c9a51e8c760ceab1433dc60a
+SHA512 (php-7.1.15.tar.bz2) = db10c0138a74165c6373f0d6cc7f5ca1f6b1ae26359cc2e2a9dec8895a491b8adccee59601cb9325e54768e9cca643e9f73858fef5cbe6502c683131f9cc8ccf
-Size (php-7.1.13.tar.bz2) = 14960544 bytes
+Size (php-7.1.15.tar.bz2) = 15116603 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
+SHA1 (patch-configure) = 862707ff3fd8b8d7312104bb44a48fe8379951bd
 SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
-SHA1 (patch-ext_standard_uniqid.c) = 154ed6e6d4796a52c6664b52994d6cad4ed22f30
+SHA1 (patch-ext_standard_uniqid.c) = a13b951cef823172bc61a1d1f964fc8725188a2c
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
 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_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7

 @@ -1,18 +1,30 @@
-$NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
+$NetBSD: patch-configure,v 1.3.8.1 2018/03/03 09:23:40 spz Exp $
---- configure.orig	2016-04-28 18:12:26.000000000 +0000
+Don't automatically add libgcc on SunOS.
 --- configure.orig	2018-01-03 02:32:21.000000000 +0000
 +++ configure
-@@ -6930,27 +6930,6 @@ EOF
+@@ -5436,9 +5436,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
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
@@ -6909,27 +6906,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
 @@ -20,72 +32,72 @@ $NetBSD: patch-configure,v 1.3 2017/05/0
 -    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
+-
 -    fi
 -  fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -18408,7 +18387,7 @@ fi
+@@ -18391,7 +18367,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
-@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
+@@ -20745,7 +20721,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'`
-@@ -31742,7 +31721,7 @@ fi
+@@ -31966,7 +31942,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
-@@ -42631,7 +42610,7 @@ fi
+@@ -42858,7 +42834,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
-@@ -92806,7 +92785,7 @@ fi
+@@ -93979,7 +93955,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
-@@ -96439,12 +96418,7 @@ old_CC=$CC
+@@ -97605,12 +97581,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"
 -  cat >meta_ccld<<EOF
 -#! /bin/sh
 -exec $CC $ac_cv_pthreads_cflags \$@
 -EOF
 -  CC="$abs_builddir/meta_ccld"
 -  chmod +x meta_ccld
 +  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
  fi
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then

 @@ -1,36 +1,35 @@
-$NetBSD: patch-ext_standard_uniqid.c,v 1.2 2017/07/19 02:44:45 manu Exp $
+$NetBSD: patch-ext_standard_uniqid.c,v 1.2.6.1 2018/03/03 09:23:40 spz Exp $
 PHP uniqid() relies on microsecond-precise system clock to produce an
 unique identifier. In order to avoid  using the same value, it first
 calls usleep(1) to wait for the next microsecond.
 Unfortunately, usleep() specification says "The suspension time may be
 longer than requested due to the scheduling of other activity by the
 system." Indeed, the pause may as as long as an entire execution slice,
 causing a uniqid() call to last more than 10 ms.
 This is fixed by replacing the usleep() call by time polling using
 gettimeofday() until the microscecond change. Since the getttimeoday()
 system call lasts around a microsecond, only a small time is wasted
 calling  multiple gettimeofday. On the benefit side, uniqid() performance
 in increased 10000 fold without changing its behavior.
 Submitted upstream as https://bugs.php.net/bug.php?id=74851
---- ext/standard/uniqid.c.orig	2017-06-07 10:09:31.000000000 +0200
+--- ext/standard/uniqid.c.orig	2018-01-03 02:32:25.000000000 +0000
-+++ ext/standard/uniqid.c	2017-07-08 08:24:24.000000000 +0200
++++ ext/standard/uniqid.c
-@@ -52,25 +52,31 @@
+@@ -53,23 +53,29 @@ PHP_FUNCTION(uniqid)
  	zend_string *uniqid;
  	int sec, usec;
  	size_t prefix_len = 0;
  	struct timeval tv;
 +	ZEND_TLS struct timeval prev_tv = { 0, 0 };
  	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sb", &prefix, &prefix_len,
  							  &more_entropy)) {
  		return;
+ 	}
 -#if HAVE_USLEEP && !defined(PHP_WIN32)
  	if (!more_entropy) {
 -#if defined(__CYGWIN__)
 @@ -49,14 +48,13 @@ Submitted upstream as https://bugs.php.n
 +					   (struct timezone *) NULL);
 +		} while (tv.tv_sec == prev_tv.tv_sec &&
 +			 tv.tv_usec == prev_tv.tv_usec);
++
 +		prev_tv.tv_sec = tv.tv_sec;
 +		prev_tv.tv_usec = tv.tv_usec;
+ 	}
 -#endif
 -	gettimeofday((struct timeval *) &tv, (struct timezone *) NULL);
++
  	sec = (int) tv.tv_sec;
  	usec = (int) (tv.tv_usec % 0x100000);
  	/* The max value usec can have is 0xF423F, so we use only five hex

 @@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/11/26 19:14:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4.2.1 2018/03/03 09:23:40 spz Exp $
 BUILDLINK_TREE+=	php
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.php+=	php>=7.1.0<7.1.99
+BUILDLINK_API_DEPENDS.php+=	php>=7.0.99<7.1.99
-BUILDLINK_ABI_DEPENDS.php+=	php>=7.1.0<7.1.99
+BUILDLINK_ABI_DEPENDS.php+=	php>=7.0.99<7.1.99
 BUILDLINK_PKGSRCDIR.php?=	../../lang/php71
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # PHP_BUILDLINK3_MK
 BUILDLINK_TREE+=	-php