Fri Jun 24 15:25:21 2016 UTC ()
Update php56 to 5.6.23 (PHP 5.6.23), including security fixes.

pkgsrc change: remove confiugre from SUBST_FILES.path.

23 Jun 2016, PHP 5.6.23

- Core:
  . Fixed bug #72275 (Integer Overflow in json_encode()/json_decode()/
    json_utf8_to_utf16()). (Stas)
  . Fixed bug #72400 (Integer Overflow in addcslashes/addslashes). (Stas)
  . Fixed bug #72403 (Integer Overflow in Length of String-typed ZVAL). (Stas)

- GD:
  . Fixed bug #72298 (pass2_no_dither out-of-bounds access). (Stas)
  . Fixed bug #72337 (invalid dimensions can lead to crash) (Pierre)
  . Fixed bug #72339 (Integer Overflow in _gd2GetHeader() resulting in
    heap overflow). (Pierre)
  . Fixed bug #72407 (NULL Pointer Dereference at _gdScaleVert). (Stas)
  . Fixed bug #72446 (Integer Overflow in gdImagePaletteToTrueColor() resulting
    in heap overflow). (Pierre)

- Intl:
  . Fixed bug #70484 (selectordinal doesn't work with named parameters).
    (Anatol)

- mbstring:
   . Fixed bug #72402 (_php_mb_regex_ereg_replace_exec - double free). (Stas)

- mcrypt:
   . Fixed bug #72455 (Heap Overflow due to integer overflows). (Stas)

- Phar:
  . Fixed bug #72321 (invalid free in phar_extract_file()).
    (hji at dyntopia dot com)

- SPL:
  . Fixed bug #72262 (int/size_t confusion in SplFileObject::fread). (Stas)
  . Fixed bug #72433 (Use After Free Vulnerability in PHP's GC algorithm and
    unserialize). (Dmitry)

- OpenSSL:
  . Fixed bug #72140 (segfault after calling ERR_free_strings()).
    (Jakub Zelenka)

- WDDX:
  . Fixed bug #72340 (Double Free Courruption in wddx_deserialize). (Stas)

- zip:
  . Fixed bug #72434 (ZipArchive class Use After Free Vulnerability in PHP's GC
    algorithm and unserialize). (Dmitry)


(taca)
diff -r1.139 -r1.140 pkgsrc/lang/php/phpversion.mk
diff -r1.11 -r1.12 pkgsrc/lang/php56/Makefile
diff -r1.27 -r1.28 pkgsrc/lang/php56/distinfo
cvs diff -r1.139 -r1.140 pkgsrc/lang/php/phpversion.mk (switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2016/06/24 15:23:00 1.139
+++ pkgsrc/lang/php/phpversion.mk 2016/06/24 15:25:20 1.140
@@ -1,224 +1,224 @@ @@ -1,224 +1,224 @@
1# $NetBSD: phpversion.mk,v 1.139 2016/06/24 15:23:00 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.140 2016/06/24 15:25:20 taca Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 55 56 70 13# Possible: 55 56 70
14# Default: 55 14# Default: 55
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# PHP_VERSION_REQD 18# PHP_VERSION_REQD
19# PHP version to use. This variable should not be set in 19# PHP version to use. This variable should not be set in
20# packages. Normally it is used by bulk build tools. 20# packages. Normally it is used by bulk build tools.
21# 21#
22# Possible: ${PHP_VERSIONS_ACCEPTED} 22# Possible: ${PHP_VERSIONS_ACCEPTED}
23# Default: ${PHP_VERSION_DEFAULT} 23# Default: ${PHP_VERSION_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# PHP_VERSIONS_ACCEPTED 27# PHP_VERSIONS_ACCEPTED
28# The PHP versions that are accepted by the package. 28# The PHP versions that are accepted by the package.
29# 29#
30# Possible: 55 56 70 30# Possible: 55 56 70
31# Default: 55 56 31# Default: 55 56
32# 32#
33# PHP_CHECK_INSTALLED 33# PHP_CHECK_INSTALLED
34# Check installed version of PHP. Should be used by lang/php55, 34# Check installed version of PHP. Should be used by lang/php55,
35# lang/php56 and lang/php70 only. 35# lang/php56 and lang/php70 only.
36# 36#
37# Possible: Yes No 37# Possible: Yes No
38# Default: Yes 38# Default: Yes
39# 39#
40# === Variables defined by this file === 40# === Variables defined by this file ===
41# 41#
42# PKG_PHP_VERSION 42# PKG_PHP_VERSION
43# The selected PHP version. 43# The selected PHP version.
44# 44#
45# Possible: 55 56 70 45# Possible: 55 56 70
46# Default: ${PHP_VERSION_DEFAULT} 46# Default: ${PHP_VERSION_DEFAULT}
47# 47#
48# PHP_BASE_VERS 48# PHP_BASE_VERS
49# The selected PHP's full version depends on PKG_PHP_VERSION 49# The selected PHP's full version depends on PKG_PHP_VERSION
50# 50#
51# PKG_PHP_MAJOR_VERS 51# PKG_PHP_MAJOR_VERS
52# The selected PHP's major version. 52# The selected PHP's major version.
53# 53#
54# Possible: 5 7 54# Possible: 5 7
55# Default: 5 55# Default: 5
56# 56#
57# PKG_PHP 57# PKG_PHP
58# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 58# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
59# 59#
60# PHPPKGSRCDIR 60# PHPPKGSRCDIR
61# The directory of the PHP implementation, relative to the 61# The directory of the PHP implementation, relative to the
62# package directory. 62# package directory.
63# 63#
64# Example: ../../lang/php55 64# Example: ../../lang/php55
65# 65#
66# PHP_PKG_PREFIX 66# PHP_PKG_PREFIX
67# The prefix that is prepended to the package name. 67# The prefix that is prepended to the package name.
68# 68#
69# Example: php55 php56 php70 69# Example: php55 php56 php70
70# 70#
71# PHP_EXTENSION_DIR 71# PHP_EXTENSION_DIR
72# Relative path to ${PREFIX} for PHP's extensions. It is derived from 72# Relative path to ${PREFIX} for PHP's extensions. It is derived from
73# initial release of major version. 73# initial release of major version.
74# 74#
75# Example: lib/php/20090630 75# Example: lib/php/20090630
76# 76#
77# Keywords: php 77# Keywords: php
78# 78#
79 79
80.if !defined(PHPVERSION_MK) 80.if !defined(PHPVERSION_MK)
81PHPVERSION_MK= defined 81PHPVERSION_MK= defined
82 82
83# Define each PHP's version. 83# Define each PHP's version.
84PHP55_VERSION= 5.5.37 84PHP55_VERSION= 5.5.37
85PHP56_VERSION= 5.6.22 85PHP56_VERSION= 5.6.23
86PHP70_VERSION= 7.0.7 86PHP70_VERSION= 7.0.7
87 87
88# Define initial release of major version. 88# Define initial release of major version.
89PHP55_RELDATE= 20130620 89PHP55_RELDATE= 20130620
90PHP56_RELDATE= 20140828 90PHP56_RELDATE= 20140828
91PHP70_RELDATE= 20151203 91PHP70_RELDATE= 20151203
92 92
93_VARGROUPS+= php 93_VARGROUPS+= php
94_USER_VARS.php= PHP_VERSION_DEFAULT 94_USER_VARS.php= PHP_VERSION_DEFAULT
95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
97 PKG_PHP_MAJOR_VERS 97 PKG_PHP_MAJOR_VERS
98 98
99.include "../../mk/bsd.prefs.mk" 99.include "../../mk/bsd.prefs.mk"
100 100
101PHP_VERSION_DEFAULT?= 55 101PHP_VERSION_DEFAULT?= 55
102PHP_VERSIONS_ACCEPTED?= 55 56 70 102PHP_VERSIONS_ACCEPTED?= 55 56 70
103 103
104# transform the list into individual variables 104# transform the list into individual variables
105.for pv in ${PHP_VERSIONS_ACCEPTED} 105.for pv in ${PHP_VERSIONS_ACCEPTED}
106_PHP_VERSION_${pv}_OK= yes 106_PHP_VERSION_${pv}_OK= yes
107.endfor 107.endfor
108 108
109# check what is installed 109# check what is installed
110.if exists(${LOCALBASE}/lib/php/20151203) 110.if exists(${LOCALBASE}/lib/php/20151203)
111_PHP_VERSION_70_INSTALLED= yes 111_PHP_VERSION_70_INSTALLED= yes
112_PHP_INSTALLED= yes 112_PHP_INSTALLED= yes
113.elif exists(${LOCALBASE}/lib/php/20140828) 113.elif exists(${LOCALBASE}/lib/php/20140828)
114_PHP_VERSION_56_INSTALLED= yes 114_PHP_VERSION_56_INSTALLED= yes
115_PHP_INSTALLED= yes 115_PHP_INSTALLED= yes
116.elif exists(${LOCALBASE}/lib/php/20130620) 116.elif exists(${LOCALBASE}/lib/php/20130620)
117_PHP_VERSION_55_INSTALLED= yes 117_PHP_VERSION_55_INSTALLED= yes
118_PHP_INSTALLED= yes 118_PHP_INSTALLED= yes
119.endif 119.endif
120 120
121# if a version is explicitely required, take it 121# if a version is explicitely required, take it
122.if defined(PHP_VERSION_REQD) 122.if defined(PHP_VERSION_REQD)
123_PHP_VERSION= ${PHP_VERSION_REQD} 123_PHP_VERSION= ${PHP_VERSION_REQD}
124.endif 124.endif
125# if the default is already installed, it is first choice 125# if the default is already installed, it is first choice
126.if !defined(_PHP_VERSION) 126.if !defined(_PHP_VERSION)
127.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 127.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
128.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 128.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
129_PHP_VERSION= ${PHP_VERSION_DEFAULT} 129_PHP_VERSION= ${PHP_VERSION_DEFAULT}
130.endif 130.endif
131.endif 131.endif
132.endif 132.endif
133# prefer an already installed version, in order of "accepted" 133# prefer an already installed version, in order of "accepted"
134.if !defined(_PHP_VERSION) 134.if !defined(_PHP_VERSION)
135.for pv in ${PHP_VERSIONS_ACCEPTED} 135.for pv in ${PHP_VERSIONS_ACCEPTED}
136.if defined(_PHP_VERSION_${pv}_INSTALLED) 136.if defined(_PHP_VERSION_${pv}_INSTALLED)
137_PHP_VERSION?= ${pv} 137_PHP_VERSION?= ${pv}
138.else 138.else
139# keep information as last resort - see below 139# keep information as last resort - see below
140_PHP_VERSION_FIRSTACCEPTED?= ${pv} 140_PHP_VERSION_FIRSTACCEPTED?= ${pv}
141.endif 141.endif
142.endfor 142.endfor
143.endif 143.endif
144# if the default is OK for the addon pkg, take this 144# if the default is OK for the addon pkg, take this
145.if !defined(_PHP_VERSION) 145.if !defined(_PHP_VERSION)
146.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 146.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
147_PHP_VERSION= ${PHP_VERSION_DEFAULT} 147_PHP_VERSION= ${PHP_VERSION_DEFAULT}
148.endif 148.endif
149.endif 149.endif
150# take the first one accepted by the package 150# take the first one accepted by the package
151.if !defined(_PHP_VERSION) 151.if !defined(_PHP_VERSION)
152_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} 152_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
153.endif 153.endif
154 154
155# 155#
156# Variable assignment for multi-PHP packages 156# Variable assignment for multi-PHP packages
157MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 157MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
158 158
159# export some of internal variables 159# export some of internal variables
160PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 160PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
161PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 161PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
162 162
163# Major version 163# Major version
164PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/} 164PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/}
165 165
166PHP_CHECK_INSTALLED?= Yes 166PHP_CHECK_INSTALLED?= Yes
167 167
168# if installed PHP isn't compatible with required PHP, bail out 168# if installed PHP isn't compatible with required PHP, bail out
169.if empty(PHP_CHECK_INSTALLED:M[nN][oO]) 169.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
170.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 170.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
171PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" 171PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed"
172.endif 172.endif
173.endif 173.endif
174 174
175MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 175MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
176 PKG_PHP=${PKG_PHP} 176 PKG_PHP=${PKG_PHP}
177PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 177PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
178 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 178 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
179 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 179 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
180 180
181# force the selected PHP version for recursive builds 181# force the selected PHP version for recursive builds
182PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 182PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
183 183
184# 184#
185# set variables for the version we decided to use: 185# set variables for the version we decided to use:
186# 186#
187.if ${_PHP_VERSION} == "55" 187.if ${_PHP_VERSION} == "55"
188PHPPKGSRCDIR= ../../lang/php55 188PHPPKGSRCDIR= ../../lang/php55
189PHP_VERSION= ${PHP55_VERSION} 189PHP_VERSION= ${PHP55_VERSION}
190PHP_INITIAL_TEENY= 1 190PHP_INITIAL_TEENY= 1
191PHP_PKG_PREFIX= php55 191PHP_PKG_PREFIX= php55
192PHP_EXTENSION_DIR= lib/php/${PHP55_RELDATE} 192PHP_EXTENSION_DIR= lib/php/${PHP55_RELDATE}
193.elif ${_PHP_VERSION} == "56" 193.elif ${_PHP_VERSION} == "56"
194PHPPKGSRCDIR= ../../lang/php56 194PHPPKGSRCDIR= ../../lang/php56
195PHP_VERSION= ${PHP56_VERSION} 195PHP_VERSION= ${PHP56_VERSION}
196PHP_INITIAL_TEENY= 3 196PHP_INITIAL_TEENY= 3
197PHP_PKG_PREFIX= php56 197PHP_PKG_PREFIX= php56
198PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 198PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
199.elif ${_PHP_VERSION} == "70" 199.elif ${_PHP_VERSION} == "70"
200PHPPKGSRCDIR= ../../lang/php70 200PHPPKGSRCDIR= ../../lang/php70
201PHP_VERSION= ${PHP70_VERSION} 201PHP_VERSION= ${PHP70_VERSION}
202PHP_INITIAL_TEENY= 0 202PHP_INITIAL_TEENY= 0
203PHP_PKG_PREFIX= php70 203PHP_PKG_PREFIX= php70
204PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE} 204PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE}
205.else 205.else
206# force an error 206# force an error
207PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 207PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
208.endif 208.endif
209 209
210_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 210_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
211_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 211_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
212 212
213PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 213PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
214 214
215# 215#
216# check installed version aginst required: 216# check installed version aginst required:
217# 217#
218.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 218.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
219.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 219.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
220PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 220PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
221.endif 221.endif
222.endif 222.endif
223 223
224.endif # PHPVERSION_MK 224.endif # PHPVERSION_MK
cvs diff -r1.11 -r1.12 pkgsrc/lang/php56/Makefile (switch to unified diff)

--- pkgsrc/lang/php56/Makefile 2016/04/02 09:00:25 1.11
+++ pkgsrc/lang/php56/Makefile 2016/06/24 15:25:21 1.12
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1# $NetBSD: Makefile,v 1.11 2016/04/02 09:00:25 taca Exp $ 1# $NetBSD: Makefile,v 1.12 2016/06/24 15:25:21 taca Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION} 6PKGNAME= php-${PHP_VERSION}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 5.6 10COMMENT= PHP Hypertext Preprocessor version 5.6
11LICENSE= php 11LICENSE= php
12 12
13TEST_TARGET= test 13TEST_TARGET= test
14 14
15USE_TOOLS+= gmake lex pkg-config 15USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 16LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 17PHP_CHECK_INSTALLED= No
18 18
19PHP_VERSIONS_ACCEPTED= 56 19PHP_VERSIONS_ACCEPTED= 56
20 20
21.include "Makefile.php" 21.include "Makefile.php"
22 22
23CGIDIR= ${PREFIX}/libexec/cgi-bin 23CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 24EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 25MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 26
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 28MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 29
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 32
33SUBST_CLASSES+= path 33SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 34SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 35SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= configure ext/phar/phar/phar.php 36SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 38SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 41
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 43
44# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 44# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
45# and lacks the zone memory allocator 45# and lacks the zone memory allocator
46.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 46.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
47CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 47CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
48.endif 48.endif
49 49
50.include "../../mk/compiler.mk" 50.include "../../mk/compiler.mk"
51 51
52.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "clang" 52.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "clang"
53CONFIGURE_ARGS+= --disable-libgcc 53CONFIGURE_ARGS+= --disable-libgcc
54.endif 54.endif
55 55
56post-extract: 56post-extract:
57 cd ${WRKSRC} && \ 57 cd ${WRKSRC} && \
58 ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; 58 ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;
59 59
60post-install: 60post-install:
61 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 61 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
62 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 62 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
64 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 64 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
65 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 65 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
66 ${DESTDIR}${EGDIR} 66 ${DESTDIR}${EGDIR}
67 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 67 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
68 68
69.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/lang/php56/distinfo (switch to unified diff)

--- pkgsrc/lang/php56/distinfo 2016/05/27 13:28:07 1.27
+++ pkgsrc/lang/php56/distinfo 2016/06/24 15:25:21 1.28
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.27 2016/05/27 13:28:07 taca Exp $ 1$NetBSD: distinfo,v 1.28 2016/06/24 15:25:21 taca Exp $
2 2
3SHA1 (php-5.6.22.tar.bz2) = c51c80e56659467c2bcee4a6a2ad217760dda177 3SHA1 (php-5.6.23.tar.bz2) = 27a5b59f28e92cf8b7961ac400d1fa7e3e7e191c
4RMD160 (php-5.6.22.tar.bz2) = 0862fb4703c73e82c5c8e13538994756fd8a5cce 4RMD160 (php-5.6.23.tar.bz2) = 9907d4f13917c3aa1e015baf299ddb8220ec92f0
5SHA512 (php-5.6.22.tar.bz2) = 9d21104832a1053a350ff31196e2c41cef713a9dfe207491236219954cf2eea216049b2f40313fb2a8e9ef641aad0af3f69456bbcebdf8fee312b0dd4a7df320 5SHA512 (php-5.6.23.tar.bz2) = 92be3685926f302223465e9673496971f0ee1b05c7b3a09682d4ef93a27b4c17e5c53c36acab15d26f38508f6d65bebe11a6f0f0fc98b27eafe95b02b4d9897d
6Size (php-5.6.22.tar.bz2) = 14170522 bytes 6Size (php-5.6.23.tar.bz2) = 14178077 bytes
7SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8 7SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
8SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c 8SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
9SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd 9SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd
10SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 10SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
11SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c 11SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
12SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 12SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
13SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 13SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
14SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 14SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
15SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 15SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
16SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 16SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f 17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
18SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 18SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
19SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda 19SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
20SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 20SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
21SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f 21SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
22SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d 22SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
23SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807 23SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807
24SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f 24SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f
25SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a 25SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a
26SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0 26SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0
27SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354 27SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354