[pkgsrc/pkgsrc-2018Q2]: pkgsrc/lang Pullup ticket #5832 - requested by taca

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2018Q2]: pkgsrc/lang Pullup ticket #5832 - requested by taca
From: bsiegert <bsiegert%pkgsrc.org@localhost>
Date: Sun, 14 Oct 2018 23:27:08 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b02b6ac63fcd
branches:  pkgsrc-2018Q2
changeset: 313987:b02b6ac63fcd
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Sep 18 18:15:50 2018 +0000

description:
Pullup ticket #5832 - requested by taca
lang/php71: security fix

Revisions pulled up:
- lang/php71/Makefile                                           1.16
- lang/php71/Makefile.php                                       1.9-1.10
- lang/php71/distinfo                                           1.41-1.42

---
   Module Name: pkgsrc
   Committed By:        manu
   Date:                Mon Jul 30 07:17:16 UTC 2018

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

   Log Message:
   Fix PHP buidl on i386

   The --disable-gcc-global-regs fix is not enough, we really need
   GCC 6 to avoid php crashing during www/ap-ph build.

---
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Tue Jul 31 01:17:56 UTC 2018

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

   Log Message:
   move --disable-gcc-global-regs to Makefile.php.
   Seems to make a previously segfaulting netbsd-8/i386's build not segfau=
   lt.
   ap-php runs PHP's configure and builds some of its code, so it needs th=
   e
   same flag.

   Now we can stop requiring an arbitrary GCC version. The test case in th=
   e
   GCC bugzilla fails on all GCC versions I tested, but magically some
   versions of GCC manage to build a working PHP.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Aug 19 13:55:24 UTC 2018

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

   Log Message:
   lang/php71: Update to 7.1.21

   PHP                                                                    =
       NEWS
   |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||=
   ||||||||
   16 Aug 2018, PHP 7.1.21

   - Calendar:
     . Fixed bug #52974 (jewish.c: compile error under Windows with GBK ch=
   arset).
       (cmb)

   - Filter:
     . Fixed bug #76366 (References in sub-array for filtering breaks the =
   filter).
       (ZiHang Gao)

   - PDO_Firebird:
     . Fixed bug #76488 (Memory leak when fetching a BLOB field). (Simonov=
    Denis)

   - PDO_PgSQL:
     . Fixed bug #75402 (Possible Memory Leak using PDO::CURSOR_SCROLL opt=
   ion).
       (Anatol)

   - SQLite3:
     . Fixed #76665 (SQLite3Stmt::bindValue() with SQLITE3_FLOAT doesn't j=
   uggle).
       (cmb)

   - Standard:
     . Fixed bug #68553 (array_column: null values in $index_key become in=
   crementing
       keys in result). (Laruence)
     . Fixed bug #73817 (Incorrect entries in get_html_translation_table).=
    (cmb)
     . Fixed bug #76643 (Segmentation fault when using `output_add_rewrite=
   _var`).
       (cmb)

   - Zip:
     . Fixed bug #76524 (ZipArchive memory leak (OVERWRITE flag and empty =
   archive)).
       (Timur Ibragimov)

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Sep 13 15:44:06 UTC 2018

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

   Log Message:
   lang/php71: Update to 7.1.22

   13 Sep 2018, PHP 7.1.22

   - Core:
     . Fixed bug #76754 (parent private constant in extends class memory l=
   eak).
       (Laruence)
     . Fixed bug #72443 (Generate enabled extension). (petk)

   - Apache2:
     . Fixed bug #76582 (Apache bucket brigade sometimes becomes invalid).=
    (stas)

   - Bz2:
     . Fixed arginfo for bzcompress. (Tyson Andre)

   - gettext:
     . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)

   - iconv:
     . Fixed bug #68180 (iconv_mime_decode can return extra characters in =
   a
       header). (cmb)
     . Fixed bug #63839 (iconv_mime_decode_headers function is skipping he=
   aders).
       (cmb)
     . Fixed bug #60494 (iconv_mime_decode does ignore special characters)=
   . (cmb)
     . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). =
   (cmb)

   - intl:
     . Fixed bug #74484 (MessageFormatter::formatMessage memory corruption=
    with
       11+ named placeholders). (Anatol)

   - libxml:
     . Fixed bug #76777 ("public id" parameter of libxml_set_external_enti=
   ty_loader
       callback undefined). (Ville Hukkam=E4ki)

   - mbstring:
     . Fixed bug #76704 (mb_detect_order return value varies based on argu=
   ment
       type). (cmb)

   - Opcache:
     . Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" =
   as a phar
       file). (Laruence)

   - OpenSSL:
     . Fixed bug #76705 (unusable ssl =3D> peer_fingerprint in
       stream_context_create()). (Jakub Zelenka)

   - phpdbg:
     . Fixed bug #76595 (phpdbg man page contains outdated information).
       (Kevin Abel)

   - SPL:
     . Fixed bug #68825 (Exception in DirectoryIterator::getLinkTarget()).=
    (cmb)
     . Fixed bug #68175 (RegexIterator pregFlags are NULL instead of 0). (=
   Tim
       Siebels)

   - Standard:
     . Fixed bug #76778 (array_reduce leaks memory if callback throws exce=
   ption).
       (cmb)

   - zlib:
     . Fixed bug #65988 (Zlib version check fails when an include/zlib/ st=
   yle dir
       is passed to the --with-zlib configure option). (Jay Bonci)
     . Fixed bug #76709 (Minimal required zlib library is 1.2.0.4). (petk)=

diffstat:

 lang/php/phpversion.mk  |   4 ++--
 lang/php71/Makefile     |   8 +-------
 lang/php71/Makefile.php |   9 ++++++++-
 lang/php71/distinfo     |  10 +++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs (78 lines):

diff -r c48db5063763 -r b02b6ac63fcd lang/php/phpversion.mk
--- a/lang/php/phpversion.mk    Mon Sep 17 19:42:10 2018 +0000
+++ b/lang/php/phpversion.mk    Tue Sep 18 18:15:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.221.2.4 2018/08/17 17:39:36 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.221.2.5 2018/09/18 18:15:50 bsiegert Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -89,7 +89,7 @@
 # Define each PHP's version.
 PHP56_VERSION= 5.6.37
 PHP70_VERSION= 7.0.31
-PHP71_VERSION= 7.1.20
+PHP71_VERSION= 7.1.22
 PHP72_VERSION= 7.2.8
 
 # Define initial release of major version.
diff -r c48db5063763 -r b02b6ac63fcd lang/php71/Makefile
--- a/lang/php71/Makefile       Mon Sep 17 19:42:10 2018 +0000
+++ b/lang/php71/Makefile       Tue Sep 18 18:15:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13.6.1 2018/08/17 16:04:00 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13.6.2 2018/09/18 18:15:50 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -48,12 +48,6 @@
 CONFIGURE_ARGS+=       --without-pcre-jit
 .endif
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=       --disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes
diff -r c48db5063763 -r b02b6ac63fcd lang/php71/Makefile.php
--- a/lang/php71/Makefile.php   Mon Sep 17 19:42:10 2018 +0000
+++ b/lang/php71/Makefile.php   Tue Sep 18 18:15:50 2018 +0000
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile.php,v 1.6.10.1 2018/08/17 16:04:00 bsiegert Exp $
+# $NetBSD: Makefile.php,v 1.6.10.2 2018/09/18 18:15:50 bsiegert Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# With --disable-gcc-global-regs, works around 
+# https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+=       --disable-gcc-global-regs
+.endif
+
 .include "../../lang/php71/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo
diff -r c48db5063763 -r b02b6ac63fcd lang/php71/distinfo
--- a/lang/php71/distinfo       Mon Sep 17 19:42:10 2018 +0000
+++ b/lang/php71/distinfo       Tue Sep 18 18:15:50 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38.2.1 2018/08/17 16:04:00 bsiegert Exp $
+$NetBSD: distinfo,v 1.38.2.2 2018/09/18 18:15:50 bsiegert Exp $
 
-SHA1 (php-7.1.20.tar.bz2) = 1ea8720fdea3a5212196b0f6a6f11a0eff26fc83
-RMD160 (php-7.1.20.tar.bz2) = 059ffa8a1e5026167511e2695f7f6ec60278ea9f
-SHA512 (php-7.1.20.tar.bz2) = c29a20e018c0066fb42ef2e08cd7be5f071bb0f6288f461fd6591b63b5ea2d8a5e06a94905319fb971e60e4e91ea496519206efb4e78b06c730e2ea82eeaf02f
-Size (php-7.1.20.tar.bz2) = 15166442 bytes
+SHA1 (php-7.1.22.tar.bz2) = b91ef7f8f7f6987339ab888c5723384c78416e25
+RMD160 (php-7.1.22.tar.bz2) = f1db44e4e4e09d24e04c8033e0c6a6b19f2c7859
+SHA512 (php-7.1.22.tar.bz2) = b966c1aa85ca9159e3608a42310fe442550dc9224254aed1199bf7733e4e66fa8e5a68b0ce37d6b8a21eb4f1f34c7dd3db4c28e3b67392860456d040e3585327
+Size (php-7.1.22.tar.bz2) = 15059870 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
 SHA1 (patch-configure) = 862707ff3fd8b8d7312104bb44a48fe8379951bd
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
Prev by Date: [pkgsrc/pkgsrc-2018Q2]: pkgsrc/doc ticket 5831
Next by Date: [pkgsrc/pkgsrc-2018Q2]: pkgsrc/lang Pullup ticket #5834 - requested by taca
Previous by Thread: [pkgsrc/pkgsrc-2018Q2]: pkgsrc/doc ticket 5831
Next by Thread: [pkgsrc/pkgsrc-2018Q2]: pkgsrc/lang Pullup ticket #5834 - requested by taca
Indexes:
Home | Main Index | Thread Index | Old Index