[pkgsrc/pkgsrc-2017Q4]: pkgsrc/lang/php71 Pullup ticket #5717 - requested by ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2017Q4]: pkgsrc/lang/php71 Pullup ticket #5717 - requested by ...
From: spz <spz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:28:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2d74f1381ae
branches:  pkgsrc-2017Q4
changeset: 373153:e2d74f1381ae
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Mar 03 09:23:40 2018 +0000

description:
Pullup ticket #5717 - requested by taca
lang/php71: security update

Revisions pulled up:
- lang/php71/buildlink3.mk                                      1.5
- lang/php71/distinfo                                           1.32-1.33,1.33-1.34
- lang/php71/patches/patch-configure                            1.4
- lang/php71/patches/patch-ext_standard_uniqid.c                1.3

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Tue Jan 16 11:04:54 UTC 2018

   Modified Files:
        pkgsrc/lang/php71: distinfo
        pkgsrc/lang/php71/patches: patch-configure patch-ext_standard_uniqid.c

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/php71/distinfo
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php71/patches/patch-configure
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/lang/php71/patches/patch-ext_standard_uniqid.c

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Fri Feb  2 12:53:39 UTC 2018

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php71: distinfo

   Log Message:
   Update lang/php71 to php 7.1.14

   Changes since 7.1.13:

   Core:
   Fixed bug #75679 (Path 260 character problem).
   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).
   Fixed bug #75079 (self keyword leads to incorrectly generated TypeError when in closure in trait).

   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 #75579 (Interned strings buffer overflow may cause crash).

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/php71/distinfo

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Fri Feb  2 12:53:39 UTC 2018

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php71: distinfo

   Log Message:
   Update lang/php71 to php 7.1.14

   Changes since 7.1.13:

   Core:
   Fixed bug #75679 (Path 260 character problem).
   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).
   Fixed bug #75079 (self keyword leads to incorrectly generated TypeError when in closure in trait).

   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 #75579 (Interned strings buffer overflow may cause crash).

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/php71/distinfo

-------------------------------------------------------------------
   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.4 -r1.5 pkgsrc/lang/php71/buildlink3.mk

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Mar  2 02:09:48 UTC 2018

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php71: distinfo

   Log Message:
   lang/php71: update to 7.1.15

   01 Mar 2018, PHP 7.1.15

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

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

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

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

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

   - Phar:
     . Fixed bug #65414 (deal with leading slash when adding files correctly).
       (bishopb)

   - 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 (stack-buffer-overflow while parsing HTTP response). (Stas)


   To generate a diff of this commit:
   cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/php71/distinfo

diffstat:

 lang/php71/buildlink3.mk                       |   6 ++--
 lang/php71/distinfo                            |  14 ++++++------
 lang/php71/patches/patch-configure             |  30 ++++++++++++++++++-------
 lang/php71/patches/patch-ext_standard_uniqid.c |  10 +++-----
 4 files changed, 35 insertions(+), 25 deletions(-)

diffs (158 lines):

diff -r 719fc0bd9890 -r e2d74f1381ae lang/php71/buildlink3.mk
--- a/lang/php71/buildlink3.mk  Sat Mar 03 09:23:35 2018 +0000
+++ b/lang/php71/buildlink3.mk  Sat Mar 03 09:23:40 2018 +0000
@@ -1,12 +1,12 @@
-# $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_ABI_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.0.99<7.1.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php71
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 719fc0bd9890 -r e2d74f1381ae lang/php71/distinfo
--- a/lang/php71/distinfo       Sat Mar 03 09:23:35 2018 +0000
+++ b/lang/php71/distinfo       Sat Mar 03 09:23:40 2018 +0000
@@ -1,11 +1,11 @@
-$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
-RMD160 (php-7.1.13.tar.bz2) = a8851a06c7e86bd4ad3f2c39de7337b271c429fe
-SHA512 (php-7.1.13.tar.bz2) = dbab037b5e7c60877f46a201e1712000ba14ae2a984d4f4d4e752c6e1b2797b0f67fbb0b10c69fea77e27cc64c27222459a26772c9a51e8c760ceab1433dc60a
-Size (php-7.1.13.tar.bz2) = 14960544 bytes
+SHA1 (php-7.1.15.tar.bz2) = 857aad496a14505ad5f61617621a2e35100a3758
+RMD160 (php-7.1.15.tar.bz2) = 5b84646a2cbfd3cc90dfa1709aa94df3a1b3f1b9
+SHA512 (php-7.1.15.tar.bz2) = db10c0138a74165c6373f0d6cc7f5ca1f6b1ae26359cc2e2a9dec8895a491b8adccee59601cb9325e54768e9cca643e9f73858fef5cbe6502c683131f9cc8ccf
+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
@@ -17,7 +17,7 @@
 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
diff -r 719fc0bd9890 -r e2d74f1381ae lang/php71/patches/patch-configure
--- a/lang/php71/patches/patch-configure        Sat Mar 03 09:23:35 2018 +0000
+++ b/lang/php71/patches/patch-configure        Sat Mar 03 09:23:40 2018 +0000
@@ -1,8 +1,20 @@
-$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 $
+
+Don't automatically add libgcc on SunOS.
 
---- configure.orig     2016-04-28 18:12:26.000000000 +0000
+--- 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
  
@@ -30,7 +42,7 @@
    { $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
@@ -39,7 +51,7 @@
      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"
  
  
@@ -48,7 +60,7 @@
  
  
    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
@@ -57,7 +69,7 @@
      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
@@ -66,7 +78,7 @@
      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
@@ -75,7 +87,7 @@
      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"
diff -r 719fc0bd9890 -r e2d74f1381ae lang/php71/patches/patch-ext_standard_uniqid.c
--- a/lang/php71/patches/patch-ext_standard_uniqid.c    Sat Mar 03 09:23:35 2018 +0000
+++ b/lang/php71/patches/patch-ext_standard_uniqid.c    Sat Mar 03 09:23:40 2018 +0000
@@ -1,4 +1,4 @@
-$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
@@ -17,10 +17,9 @@
 
 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      2017-07-08 08:24:24.000000000 +0200
-@@ -52,25 +52,31 @@
-       zend_string *uniqid;
+--- ext/standard/uniqid.c.orig 2018-01-03 02:32:25.000000000 +0000
++++ ext/standard/uniqid.c
+@@ -53,23 +53,29 @@ PHP_FUNCTION(uniqid)
        int sec, usec;
        size_t prefix_len = 0;
        struct timeval tv;
@@ -59,4 +58,3 @@
        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
Prev by Date: [pkgsrc/pkgsrc-2017Q4]: pkgsrc/lang/php70 Pullup ticket #5716 - requested by ...
Next by Date: [pkgsrc/pkgsrc-2017Q4]: pkgsrc/doc #5719
Previous by Thread: [pkgsrc/pkgsrc-2017Q4]: pkgsrc/lang/php70 Pullup ticket #5716 - requested by ...
Next by Thread: [pkgsrc/pkgsrc-2017Q4]: pkgsrc/doc #5719
Indexes:
Home | Main Index | Thread Index | Old Index