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

["S.P.Zeidler" <spz%netbsd.org@localhost>]

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

Modified Files:
        pkgsrc/lang/php70 [pkgsrc-2017Q4]: DESCR MESSAGE buildlink3.mk distinfo
        pkgsrc/lang/php70/patches [pkgsrc-2017Q4]: patch-configure

Log Message:
Pullup ticket #5716 - requested by taca
lang/php70: security update

Revisions pulled up:
- lang/php70/DESCR                                              1.2
- lang/php70/MESSAGE                                            1.2-1.3
- lang/php70/buildlink3.mk                                      1.4
- lang/php70/distinfo                                           1.42-1.43
- lang/php70/patches/patch-configure                            1.4

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Tue Jan 16 11:26:18 UTC 2018

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

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

   To generate a diff of this commit:
   cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/php70/distinfo
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php70/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Sun Feb  4 11:35:39 UTC 2018

   Modified Files:
        pkgsrc/lang/php56: DESCR MESSAGE
        pkgsrc/lang/php70: DESCR MESSAGE

   Log Message:
   note a planned End of Life for support of PHP 5.6.x and PHP 7.0.x

   Those releases will stop getting official support on Dec 31 2018 and
   Dec 3 2018 respectively, and they should be removed from pkgsrc by then.

   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php70/DESCR pkgsrc/lang/php70/MESSAGE

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Sun Feb  4 11:37:54 UTC 2018

   Modified Files:
        pkgsrc/lang/php70: MESSAGE

   Log Message:
   adjust wording - php70 is actually on regular security fixes only support

   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php70/MESSAGE

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

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Mar  2 02:12:27 UTC 2018

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

   Log Message:
   lang/php70: update to 7.0.28

   01 Mar 2018 PHP 7.0.28

   - Standard:
     . Fixed bug #75981 (stack-buffer-overflow while parsing HTTP response). (Stas)

   To generate a diff of this commit:
   cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/php70/distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.20.1 pkgsrc/lang/php70/DESCR \
    pkgsrc/lang/php70/MESSAGE
cvs rdiff -u -r1.3 -r1.3.2.1 pkgsrc/lang/php70/buildlink3.mk
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 pkgsrc/lang/php70/distinfo
cvs rdiff -u -r1.3 -r1.3.16.1 pkgsrc/lang/php70/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/DESCR
diff -u pkgsrc/lang/php70/DESCR:1.1 pkgsrc/lang/php70/DESCR:1.1.20.1
--- pkgsrc/lang/php70/DESCR:1.1 Sun Dec  6 15:17:31 2015
+++ pkgsrc/lang/php70/DESCR     Sat Mar  3 09:23:35 2018
@@ -21,3 +21,6 @@ and new features such as
 * Return and Scalar Type Declarations
 * Anonymous Classes
 * Zero cost asserts
+
+NOTE: This version is on security support only, with planned End of Live
+on December 3 2018. Update to PHP 7.1.x or 7.2.x is recommended.
Index: pkgsrc/lang/php70/MESSAGE
diff -u pkgsrc/lang/php70/MESSAGE:1.1 pkgsrc/lang/php70/MESSAGE:1.1.20.1
--- pkgsrc/lang/php70/MESSAGE:1.1       Sun Dec  6 15:17:31 2015
+++ pkgsrc/lang/php70/MESSAGE   Sat Mar  3 09:23:35 2018
@@ -1,5 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/12/06 15:17:31 taca Exp $
+$NetBSD: MESSAGE,v 1.1.20.1 2018/03/03 09:23:35 spz Exp $
+
+NOTE: This PHP version is on Security fixes only support, with End
+of Live planned on December 3 2018. For details, see
+
+        http://php.net/supported-versions.php
+
+===========================================================================
 
 To process PHP scripts, you will need a PHP-enabled HTTP server.  You may
 either configure the HTTP server to use the PHP CGI binary located in

Index: pkgsrc/lang/php70/buildlink3.mk
diff -u pkgsrc/lang/php70/buildlink3.mk:1.3 pkgsrc/lang/php70/buildlink3.mk:1.3.2.1
--- pkgsrc/lang/php70/buildlink3.mk:1.3 Tue Sep 26 14:02:32 2017
+++ pkgsrc/lang/php70/buildlink3.mk     Sat Mar  3 09:23:35 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/09/26 14:02:32 roy Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2018/03/03 09:23:35 spz Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.0.0<7.1.0
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.0.0<7.1.0
+BUILDLINK_API_DEPENDS.php+=    php>=7.0.0<7.0.99
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.0.0<7.0.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php70
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/php70/distinfo
diff -u pkgsrc/lang/php70/distinfo:1.40.2.1 pkgsrc/lang/php70/distinfo:1.40.2.2
--- pkgsrc/lang/php70/distinfo:1.40.2.1 Sun Jan  7 17:36:23 2018
+++ pkgsrc/lang/php70/distinfo  Sat Mar  3 09:23:35 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40.2.1 2018/01/07 17:36:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.40.2.2 2018/03/03 09:23:35 spz Exp $
 
-SHA1 (php-7.0.27.tar.bz2) = 2fb93fca0e3a514286e90b91e165d3f3242bcd4c
-RMD160 (php-7.0.27.tar.bz2) = 48ea0689cdd8a9ec4f2f2d04ab8832d83fd6f07f
-SHA512 (php-7.0.27.tar.bz2) = 652dbeb06e6b9e90f2fd48a2a6bba1d3de05d6ebac2774bdfffe403ec6197f532708d854452d84a14414918983fe813c4b4a3d438a807112923554d34e6eb6cc
-Size (php-7.0.27.tar.bz2) = 14154690 bytes
+SHA1 (php-7.0.28.tar.bz2) = 172b4dabc116fe50ca27490c3b37e736034ebda9
+RMD160 (php-7.0.28.tar.bz2) = dba2f5b29c08747ac1f10ce819bb0d18ff9d1fb0
+SHA512 (php-7.0.28.tar.bz2) = 3d93d06df4212894e2dfac8a50d6817c9ef837ffd89b7537c5a901097a02b49ba400d905558dfb38aa16645e9eb6ea21bead1db78381d0de37ad4c60497f3cc9
+Size (php-7.0.28.tar.bz2) = 14153637 bytes
 SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
-SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
+SHA1 (patch-configure) = 68ca63d7623feee2f12c9e1abacf4a5d7827d96c
 SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f

Index: pkgsrc/lang/php70/patches/patch-configure
diff -u pkgsrc/lang/php70/patches/patch-configure:1.3 pkgsrc/lang/php70/patches/patch-configure:1.3.16.1
--- pkgsrc/lang/php70/patches/patch-configure:1.3       Mon May  2 13:09:49 2016
+++ pkgsrc/lang/php70/patches/patch-configure   Sat Mar  3 09:23:35 2018
@@ -1,8 +1,20 @@
-$NetBSD: patch-configure,v 1.3 2016/05/02 13:09:49 taca Exp $
+$NetBSD: patch-configure,v 1.3.16.1 2018/03/03 09:23:35 spz Exp $
 
---- configure.orig     2016-04-28 18:12:26.000000000 +0000
+Don't automatically add libgcc on SunOS.
+
+--- configure.orig     2018-01-02 08:51:27.000000000 +0000
 +++ configure
-@@ -6930,27 +6930,6 @@ EOF
+@@ -5435,9 +5435,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"
+@@ -6908,27 +6905,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +42,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18408,7 +18387,7 @@ fi
+@@ -18390,7 +18366,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -39,7 +51,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
+@@ -20744,7 +20720,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 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -31742,7 +31721,7 @@ fi
+@@ -31965,7 +31941,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -57,7 +69,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -42631,7 +42610,7 @@ fi
+@@ -42857,7 +42833,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -66,7 +78,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -92806,7 +92785,7 @@ fi
+@@ -93495,7 +93471,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -75,7 +87,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -96439,12 +96418,7 @@ old_CC=$CC
+@@ -97121,12 +97097,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"