Sat Mar 3 09:23:35 2018 UTC ()
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


(spz)
diff -r1.1 -r1.1.20.1 pkgsrc/lang/php70/DESCR
diff -r1.1 -r1.1.20.1 pkgsrc/lang/php70/MESSAGE
diff -r1.3 -r1.3.2.1 pkgsrc/lang/php70/buildlink3.mk
diff -r1.40.2.1 -r1.40.2.2 pkgsrc/lang/php70/distinfo
diff -r1.3 -r1.3.16.1 pkgsrc/lang/php70/patches/patch-configure

cvs diff -r1.1 -r1.1.20.1 pkgsrc/lang/php70/Attic/DESCR (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/DESCR 2015/12/06 15:17:31 1.1
+++ pkgsrc/lang/php70/Attic/DESCR 2018/03/03 09:23:35 1.1.20.1
@@ -11,13 +11,16 @@ and new features such as @@ -11,13 +11,16 @@ and new features such as
11 11
12* Improved performance: PHP 7 is up to twice as fast as PHP 5.6 12* Improved performance: PHP 7 is up to twice as fast as PHP 5.6
13* Significantly reduced memory usage 13* Significantly reduced memory usage
14* Abstract Syntax Tree 14* Abstract Syntax Tree
15* Consistent 64-bit support 15* Consistent 64-bit support
16* Improved Exception hierarchy 16* Improved Exception hierarchy
17* Many fatal errors converted to Exceptions 17* Many fatal errors converted to Exceptions
18* Secure random number generator 18* Secure random number generator
19* Removed old and unsupported SAPIs and extensions 19* Removed old and unsupported SAPIs and extensions
20* The null coalescing operator (??) 20* The null coalescing operator (??)
21* Return and Scalar Type Declarations 21* Return and Scalar Type Declarations
22* Anonymous Classes 22* Anonymous Classes
23* Zero cost asserts 23* Zero cost asserts
 24
 25NOTE: This version is on security support only, with planned End of Live
 26on December 3 2018. Update to PHP 7.1.x or 7.2.x is recommended.

cvs diff -r1.1 -r1.1.20.1 pkgsrc/lang/php70/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/MESSAGE 2015/12/06 15:17:31 1.1
+++ pkgsrc/lang/php70/Attic/MESSAGE 2018/03/03 09:23:35 1.1.20.1
@@ -1,11 +1,18 @@ @@ -1,11 +1,18 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1 2015/12/06 15:17:31 taca Exp $ 2$NetBSD: MESSAGE,v 1.1.20.1 2018/03/03 09:23:35 spz Exp $
 3
 4NOTE: This PHP version is on Security fixes only support, with End
 5of Live planned on December 3 2018. For details, see
 6
 7 http://php.net/supported-versions.php
 8
 9===========================================================================
3 10
4To process PHP scripts, you will need a PHP-enabled HTTP server. You may 11To process PHP scripts, you will need a PHP-enabled HTTP server. You may
5either configure the HTTP server to use the PHP CGI binary located in 12either configure the HTTP server to use the PHP CGI binary located in
6 13
7 ${CGIDIR}/php 14 ${CGIDIR}/php
8 15
9or you may install a PHP module for your HTTP server, e.g. www/ap-php. 16or you may install a PHP module for your HTTP server, e.g. www/ap-php.
10 17
11=========================================================================== 18===========================================================================

cvs diff -r1.3 -r1.3.2.1 pkgsrc/lang/php70/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/buildlink3.mk 2017/09/26 14:02:32 1.3
+++ pkgsrc/lang/php70/Attic/buildlink3.mk 2018/03/03 09:23:35 1.3.2.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.3 2017/09/26 14:02:32 roy Exp $ 1# $NetBSD: buildlink3.mk,v 1.3.2.1 2018/03/03 09:23:35 spz Exp $
2 2
3BUILDLINK_TREE+= php 3BUILDLINK_TREE+= php
4 4
5.if !defined(PHP_BUILDLINK3_MK) 5.if !defined(PHP_BUILDLINK3_MK)
6PHP_BUILDLINK3_MK:= 6PHP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.php+= php>=7.0.0<7.1.0 8BUILDLINK_API_DEPENDS.php+= php>=7.0.0<7.0.99
9BUILDLINK_ABI_DEPENDS.php+= php>=7.0.0<7.1.0 9BUILDLINK_ABI_DEPENDS.php+= php>=7.0.0<7.0.99
10BUILDLINK_PKGSRCDIR.php?= ../../lang/php70 10BUILDLINK_PKGSRCDIR.php?= ../../lang/php70
11 11
12.include "../../textproc/libxml2/buildlink3.mk" 12.include "../../textproc/libxml2/buildlink3.mk"
13.endif # PHP_BUILDLINK3_MK 13.endif # PHP_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -php 15BUILDLINK_TREE+= -php

cvs diff -r1.40.2.1 -r1.40.2.2 pkgsrc/lang/php70/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/distinfo 2018/01/07 17:36:23 1.40.2.1
+++ pkgsrc/lang/php70/Attic/distinfo 2018/03/03 09:23:35 1.40.2.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.40.2.1 2018/01/07 17:36:23 bsiegert Exp $ 1$NetBSD: distinfo,v 1.40.2.2 2018/03/03 09:23:35 spz Exp $
2 2
3SHA1 (php-7.0.27.tar.bz2) = 2fb93fca0e3a514286e90b91e165d3f3242bcd4c 3SHA1 (php-7.0.28.tar.bz2) = 172b4dabc116fe50ca27490c3b37e736034ebda9
4RMD160 (php-7.0.27.tar.bz2) = 48ea0689cdd8a9ec4f2f2d04ab8832d83fd6f07f 4RMD160 (php-7.0.28.tar.bz2) = dba2f5b29c08747ac1f10ce819bb0d18ff9d1fb0
5SHA512 (php-7.0.27.tar.bz2) = 652dbeb06e6b9e90f2fd48a2a6bba1d3de05d6ebac2774bdfffe403ec6197f532708d854452d84a14414918983fe813c4b4a3d438a807112923554d34e6eb6cc 5SHA512 (php-7.0.28.tar.bz2) = 3d93d06df4212894e2dfac8a50d6817c9ef837ffd89b7537c5a901097a02b49ba400d905558dfb38aa16645e9eb6ea21bead1db78381d0de37ad4c60497f3cc9
6Size (php-7.0.27.tar.bz2) = 14154690 bytes 6Size (php-7.0.28.tar.bz2) = 14153637 bytes
7SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56 7SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c 8SHA1 (patch-configure) = 68ca63d7623feee2f12c9e1abacf4a5d7827d96c
9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
11SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f 11SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f
12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
20SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84 20SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84
21SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 21SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627

cvs diff -r1.3 -r1.3.16.1 pkgsrc/lang/php70/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/php70/patches/Attic/patch-configure 2016/05/02 13:09:49 1.3
+++ pkgsrc/lang/php70/patches/Attic/patch-configure 2018/03/03 09:23:35 1.3.16.1
@@ -1,18 +1,30 @@ @@ -1,18 +1,30 @@
1$NetBSD: patch-configure,v 1.3 2016/05/02 13:09:49 taca Exp $ 1$NetBSD: patch-configure,v 1.3.16.1 2018/03/03 09:23:35 spz Exp $
2 2
3--- configure.orig 2016-04-28 18:12:26.000000000 +0000 3Don't automatically add libgcc on SunOS.
 4
 5--- configure.orig 2018-01-02 08:51:27.000000000 +0000
4+++ configure 6+++ configure
5@@ -6930,27 +6930,6 @@ EOF 7@@ -5435,9 +5435,6 @@ fi
 8 case $host_alias in
 9 *solaris*)
 10 CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
 11- if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
 12- enable_libgcc=yes
 13- fi
 14 ;;
 15 *dgux*)
 16 CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
 17@@ -6908,27 +6905,6 @@ EOF
6 ;; 18 ;;
7 esac 19 esac
8  20
9- if test "$APACHE_VERSION" -lt 2004001; then 21- if test "$APACHE_VERSION" -lt 2004001; then
10- APXS_MPM=`$APXS -q MPM_NAME` 22- APXS_MPM=`$APXS -q MPM_NAME`
11- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then 23- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
12- 24-
13- enable_maintainer_zts=yes 25- enable_maintainer_zts=yes
14- if test "$pthreads_working" != "yes"; then 26- if test "$pthreads_working" != "yes"; then
15- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 27- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
16- fi 28- fi
17- 29-
18- fi 30- fi
@@ -20,72 +32,72 @@ $NetBSD: patch-configure,v 1.3 2016/05/0 @@ -20,72 +32,72 @@ $NetBSD: patch-configure,v 1.3 2016/05/0
20- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` 32- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
21- if test -n "$APACHE_THREADED_MPM"; then 33- if test -n "$APACHE_THREADED_MPM"; then
22- 34-
23- enable_maintainer_zts=yes 35- enable_maintainer_zts=yes
24- if test "$pthreads_working" != "yes"; then 36- if test "$pthreads_working" != "yes"; then
25- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 37- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
26- fi 38- fi
27- 39-
28- fi 40- fi
29- fi 41- fi
30 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 42 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
31 $as_echo "yes" >&6; } 43 $as_echo "yes" >&6; }
32  44
33@@ -18408,7 +18387,7 @@ fi 45@@ -18390,7 +18366,7 @@ fi
34 if test "$found_openssl" = "no"; then 46 if test "$found_openssl" = "no"; then
35  47
36 if test "$PHP_OPENSSL_DIR" = "yes"; then 48 if test "$PHP_OPENSSL_DIR" = "yes"; then
37- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 49- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
38+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 50+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
39 fi 51 fi
40  52
41 for i in $PHP_OPENSSL_DIR; do 53 for i in $PHP_OPENSSL_DIR; do
42@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; } 54@@ -20744,7 +20720,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
43 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 55 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
44  56
45  57
46- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do 58- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
47+ for header_file; do 59+ for header_file; do
48  60
49  61
50 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 62 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
51@@ -31742,7 +31721,7 @@ fi 63@@ -31965,7 +31941,7 @@ fi
52 if test "$found_openssl" = "no"; then 64 if test "$found_openssl" = "no"; then
53  65
54 if test "$PHP_OPENSSL_DIR" = "yes"; then 66 if test "$PHP_OPENSSL_DIR" = "yes"; then
55- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 67- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
56+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 68+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
57 fi 69 fi
58  70
59 for i in $PHP_OPENSSL_DIR; do 71 for i in $PHP_OPENSSL_DIR; do
60@@ -42631,7 +42610,7 @@ fi 72@@ -42857,7 +42833,7 @@ fi
61 if test "$found_openssl" = "no"; then 73 if test "$found_openssl" = "no"; then
62  74
63 if test "$PHP_OPENSSL_DIR" = "yes"; then 75 if test "$PHP_OPENSSL_DIR" = "yes"; then
64- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 76- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
65+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 77+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
66 fi 78 fi
67  79
68 for i in $PHP_OPENSSL_DIR; do 80 for i in $PHP_OPENSSL_DIR; do
69@@ -92806,7 +92785,7 @@ fi 81@@ -93495,7 +93471,7 @@ fi
70 if test "$found_openssl" = "no"; then 82 if test "$found_openssl" = "no"; then
71  83
72 if test "$PHP_OPENSSL_DIR" = "yes"; then 84 if test "$PHP_OPENSSL_DIR" = "yes"; then
73- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 85- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
74+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 86+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
75 fi 87 fi
76  88
77 for i in $PHP_OPENSSL_DIR; do 89 for i in $PHP_OPENSSL_DIR; do
78@@ -96439,12 +96418,7 @@ old_CC=$CC 90@@ -97121,12 +97097,7 @@ old_CC=$CC
79 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 91 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
80 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 92 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
81 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 93 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
82- cat >meta_ccld<<EOF 94- cat >meta_ccld<<EOF
83-#! /bin/sh 95-#! /bin/sh
84-exec $CC $ac_cv_pthreads_cflags \$@ 96-exec $CC $ac_cv_pthreads_cflags \$@
85-EOF 97-EOF
86- CC="$abs_builddir/meta_ccld" 98- CC="$abs_builddir/meta_ccld"
87- chmod +x meta_ccld 99- chmod +x meta_ccld
88+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 100+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
89 fi 101 fi
90  102
91 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 103 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then