Sat Jan 19 21:44:08 2019 UTC ()
Pullup ticket #5897 - requested by taca
lang/php72: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.243
- lang/php72/Makefile                                           1.16
- lang/php72/distinfo                                           1.35

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Jan 12 14:59:03 UTC 2019

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php72: Makefile distinfo

   Log Message:
   lang/php72: update to 7.2.14

   10 Jan 2019, PHP 7.2.14

   - Core:
     . Fixed bug #77369 (memcpy with negative length via crafted DNS response). (Stas)
     . Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
       (Valentin V. Bartenev)
     . Fixed bug #76046 (PHP generates "FE_FREE" opcode on the wrong line).
       (Nikita)

   - COM:
     . Fixed bug #77177 (Serializing or unserializing COM objects crashes). (cmb)

   - Date:
     . Fixed bug #77097 (DateTime::diff gives wrong diff when the actual diff is
       less than 1 second). (Derick)

   - Exif:
     . Fixed bug #77184 (Unsigned rational numbers are written out as signed
       rationals). (Colin Basnett)

   - GD:
     . Fixed bug #77269 (efree() on uninitialized Heap data in imagescale leads to
       use-after-free). (cmb)
     . Fixed bug #77270 (imagecolormatch Out Of Bounds Write on Heap). (cmb)
     . Fixed bug #77195 (Incorrect error handling of imagecreatefromjpeg()). (cmb)
     . Fixed bug #77198 (auto cropping has insufficient precision). (cmb)
     . Fixed bug #77200 (imagecropauto(…, GD_CROP_SIDES) crops left but not right).
       (cmb)

   - IMAP:
     . Fixed bug #77020 (null pointer dereference in imap_mail). (cmb)

   - Mbstring:
     . Fixed bug #77370 (Buffer overflow on mb regex functions - fetch_token). (Stas)
     . Fixed bug #77371 (heap buffer overflow in mb regex functions
       - compile_string_node). (Stas)
     . Fixed bug #77381 (heap buffer overflow in multibyte match_at). (Stas)
     . Fixed bug #77382 (heap buffer overflow due to incorrect length in
       expand_case_fold_string). (Stas)
     . Fixed bug #77385 (buffer overflow in fetch_token). (Stas)
     . Fixed bug #77394 (Buffer overflow in multibyte case folding - unicode). (Stas)
     . Fixed bug #77418 (Heap overflow in utf32be_mbc_to_code). (Stas)

   - OCI8:
     . Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
     . Added oci_set_call_timeout() for call timeouts.
     . Added oci_set_db_operation() for the DBOP end-to-end-tracing attribute.

   - Opcache:
     . Fixed bug #77215 (CFG assertion failure on multiple finalizing switch
       frees in one block). (Nikita)

   - PDO:
     . Handle invalid index passed to PDOStatement::fetchColumn() as error. (Sergei
       Morozov)

   - Phar:
     . Fixed bug #77247 (heap buffer overflow in phar_detect_phar_fname_ext). (Stas)

   - Sockets:
     . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
       (Mizunashi Mana)

   - SQLite3:
     . Fixed bug #77051 (Issue with re-binding on SQLite3). (BohwaZ)

   - Xmlrpc:
     . Fixed bug #77242 (heap out of bounds read in xmlrpc_decode()). (cmb)
     . Fixed bug #77380 (Global out of bounds read in xmlrpc base64 code). (Stas)


(bsiegert)
diff -r1.241.2.1 -r1.241.2.2 pkgsrc/lang/php/phpversion.mk
diff -r1.15 -r1.15.2.1 pkgsrc/lang/php72/Makefile
diff -r1.34 -r1.34.2.1 pkgsrc/lang/php72/distinfo
cvs diff -r1.241.2.1 -r1.241.2.2 pkgsrc/lang/php/phpversion.mk (switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2019/01/19 21:30:21 1.241.2.1
+++ pkgsrc/lang/php/phpversion.mk 2019/01/19 21:44:08 1.241.2.2
@@ -1,257 +1,257 @@ @@ -1,257 +1,257 @@
1# $NetBSD: phpversion.mk,v 1.241.2.1 2019/01/19 21:30:21 bsiegert Exp $ 1# $NetBSD: phpversion.mk,v 1.241.2.2 2019/01/19 21:44:08 bsiegert 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: 56 70 71 72 73 13# Possible: 56 70 71 72 73
14# Default: 71 14# Default: 71
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: 56 70 71 72 73 30# Possible: 56 70 71 72 73
31# Default: 71 31# Default: 71
32# 32#
33# PHP_VERSIONS_INCOMPATIBLE 33# PHP_VERSIONS_INCOMPATIBLE
34# The PHP versions that are not supported by the package. 34# The PHP versions that are not supported by the package.
35# 35#
36# Possible: 56 70 71 72 73 36# Possible: 56 70 71 72 73
37# Default: (empty) 37# Default: (empty)
38# 38#
39# PHP_CHECK_INSTALLED 39# PHP_CHECK_INSTALLED
40# Check installed version of PHP. Should be used by lang/php56, 40# Check installed version of PHP. Should be used by lang/php56,
41# lang/php70, or lang/php71 only. 41# lang/php70, or lang/php71 only.
42# 42#
43# Possible: Yes No 43# Possible: Yes No
44# Default: Yes 44# Default: Yes
45# 45#
46# === Variables defined by this file === 46# === Variables defined by this file ===
47# 47#
48# PKG_PHP_VERSION 48# PKG_PHP_VERSION
49# The selected PHP version. 49# The selected PHP version.
50# 50#
51# Possible: 56 70 71 72 73 51# Possible: 56 70 71 72 73
52# Default: ${PHP_VERSION_DEFAULT} 52# Default: ${PHP_VERSION_DEFAULT}
53# 53#
54# PHP_BASE_VERS 54# PHP_BASE_VERS
55# The selected PHP's full version depends on PKG_PHP_VERSION 55# The selected PHP's full version depends on PKG_PHP_VERSION
56# 56#
57# PKG_PHP_MAJOR_VERS 57# PKG_PHP_MAJOR_VERS
58# The selected PHP's major version. 58# The selected PHP's major version.
59# 59#
60# Possible: 5 7 60# Possible: 5 7
61# Default: 7 61# Default: 7
62# 62#
63# PKG_PHP 63# PKG_PHP
64# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 64# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
65# 65#
66# PHPPKGSRCDIR 66# PHPPKGSRCDIR
67# The directory of the PHP implementation, relative to the 67# The directory of the PHP implementation, relative to the
68# package directory. 68# package directory.
69# 69#
70# Example: ../../lang/php71 70# Example: ../../lang/php71
71# 71#
72# PHP_PKG_PREFIX 72# PHP_PKG_PREFIX
73# The prefix that is prepended to the package name. 73# The prefix that is prepended to the package name.
74# 74#
75# Example: php56 php70 php71 php72 php73 75# Example: php56 php70 php71 php72 php73
76# 76#
77# PHP_EXTENSION_DIR 77# PHP_EXTENSION_DIR
78# Relative path to ${PREFIX} for PHP's extensions. It is derived from 78# Relative path to ${PREFIX} for PHP's extensions. It is derived from
79# initial release of major version. 79# initial release of major version.
80# 80#
81# Example: lib/php/20140828 81# Example: lib/php/20140828
82# 82#
83# Keywords: php 83# Keywords: php
84# 84#
85 85
86.if !defined(PHPVERSION_MK) 86.if !defined(PHPVERSION_MK)
87PHPVERSION_MK= defined 87PHPVERSION_MK= defined
88 88
89# Define each PHP's version. 89# Define each PHP's version.
90PHP56_VERSION= 5.6.39 90PHP56_VERSION= 5.6.39
91PHP70_VERSION= 7.0.33 91PHP70_VERSION= 7.0.33
92PHP71_VERSION= 7.1.26 92PHP71_VERSION= 7.1.26
93PHP72_VERSION= 7.2.13 93PHP72_VERSION= 7.2.14
94PHP73_VERSION= 7.3.0 94PHP73_VERSION= 7.3.0
95 95
96# Define initial release of major version. 96# Define initial release of major version.
97PHP56_RELDATE= 20140828 97PHP56_RELDATE= 20140828
98PHP70_RELDATE= 20151203 98PHP70_RELDATE= 20151203
99PHP71_RELDATE= 20160303 99PHP71_RELDATE= 20160303
100PHP72_RELDATE= 20170718 100PHP72_RELDATE= 20170718
101PHP73_RELDATE= 20181200 101PHP73_RELDATE= 20181200
102 102
103_VARGROUPS+= php 103_VARGROUPS+= php
104_USER_VARS.php= PHP_VERSION_DEFAULT 104_USER_VARS.php= PHP_VERSION_DEFAULT
105_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 105_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
106_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 106_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
107 PKG_PHP_MAJOR_VERS 107 PKG_PHP_MAJOR_VERS
108 108
109.include "../../mk/bsd.prefs.mk" 109.include "../../mk/bsd.prefs.mk"
110 110
111PHP_VERSION_DEFAULT?= 71 111PHP_VERSION_DEFAULT?= 71
112PHP_VERSIONS_ACCEPTED?= 56 70 71 72 73 112PHP_VERSIONS_ACCEPTED?= 56 70 71 72 73
113.for pv in ${PHP_VERSIONS_ACCEPTED} 113.for pv in ${PHP_VERSIONS_ACCEPTED}
114. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 114. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
115_PHP_VERSIONS_ACCEPTED+= ${pv} 115_PHP_VERSIONS_ACCEPTED+= ${pv}
116. endif 116. endif
117.endfor 117.endfor
118 118
119# transform the list into individual variables 119# transform the list into individual variables
120.for pv in ${_PHP_VERSIONS_ACCEPTED} 120.for pv in ${_PHP_VERSIONS_ACCEPTED}
121_PHP_VERSION_${pv}_OK= yes 121_PHP_VERSION_${pv}_OK= yes
122.endfor 122.endfor
123 123
124# check what is installed 124# check what is installed
125.if exists(${LOCALBASE}/lib/php/${PHP73_RELDATE}) 125.if exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
126_PHP_VERSION_73_INSTALLED= yes 126_PHP_VERSION_73_INSTALLED= yes
127_PHP_INSTALLED= yes 127_PHP_INSTALLED= yes
128.elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE}) 128.elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
129_PHP_VERSION_72_INSTALLED= yes 129_PHP_VERSION_72_INSTALLED= yes
130_PHP_INSTALLED= yes 130_PHP_INSTALLED= yes
131.elif exists(${LOCALBASE}/lib/php/${PHP71_RELDATE}) 131.elif exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
132_PHP_VERSION_71_INSTALLED= yes 132_PHP_VERSION_71_INSTALLED= yes
133_PHP_INSTALLED= yes 133_PHP_INSTALLED= yes
134.elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE}) 134.elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE})
135_PHP_VERSION_70_INSTALLED= yes 135_PHP_VERSION_70_INSTALLED= yes
136_PHP_INSTALLED= yes 136_PHP_INSTALLED= yes
137.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE}) 137.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
138_PHP_VERSION_56_INSTALLED= yes 138_PHP_VERSION_56_INSTALLED= yes
139_PHP_INSTALLED= yes 139_PHP_INSTALLED= yes
140.endif 140.endif
141 141
142# if a version is explicitely required, take it 142# if a version is explicitely required, take it
143.if defined(PHP_VERSION_REQD) 143.if defined(PHP_VERSION_REQD)
144_PHP_VERSION= ${PHP_VERSION_REQD} 144_PHP_VERSION= ${PHP_VERSION_REQD}
145.endif 145.endif
146# if the default is already installed, it is first choice 146# if the default is already installed, it is first choice
147.if !defined(_PHP_VERSION) 147.if !defined(_PHP_VERSION)
148.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 148.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
149.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 149.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
150_PHP_VERSION= ${PHP_VERSION_DEFAULT} 150_PHP_VERSION= ${PHP_VERSION_DEFAULT}
151.endif 151.endif
152.endif 152.endif
153.endif 153.endif
154# prefer an already installed version, in order of "accepted" 154# prefer an already installed version, in order of "accepted"
155.if !defined(_PHP_VERSION) 155.if !defined(_PHP_VERSION)
156.for pv in ${_PHP_VERSIONS_ACCEPTED} 156.for pv in ${_PHP_VERSIONS_ACCEPTED}
157.if defined(_PHP_VERSION_${pv}_INSTALLED) 157.if defined(_PHP_VERSION_${pv}_INSTALLED)
158_PHP_VERSION?= ${pv} 158_PHP_VERSION?= ${pv}
159.else 159.else
160# keep information as last resort - see below 160# keep information as last resort - see below
161_PHP_VERSION_FIRSTACCEPTED?= ${pv} 161_PHP_VERSION_FIRSTACCEPTED?= ${pv}
162.endif 162.endif
163.endfor 163.endfor
164.endif 164.endif
165# if the default is OK for the addon pkg, take this 165# if the default is OK for the addon pkg, take this
166.if !defined(_PHP_VERSION) 166.if !defined(_PHP_VERSION)
167.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 167.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
168_PHP_VERSION= ${PHP_VERSION_DEFAULT} 168_PHP_VERSION= ${PHP_VERSION_DEFAULT}
169.endif 169.endif
170.endif 170.endif
171# take the first one accepted by the package 171# take the first one accepted by the package
172.if !defined(_PHP_VERSION) 172.if !defined(_PHP_VERSION)
173_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} 173_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
174.endif 174.endif
175 175
176# 176#
177# Variable assignment for multi-PHP packages 177# Variable assignment for multi-PHP packages
178MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 178MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
179 179
180# export some of internal variables 180# export some of internal variables
181PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 181PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
182PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 182PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
183 183
184# Major version 184# Major version
185PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/} 185PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/}
186 186
187PHP_CHECK_INSTALLED?= Yes 187PHP_CHECK_INSTALLED?= Yes
188 188
189# if installed PHP isn't compatible with required PHP, bail out 189# if installed PHP isn't compatible with required PHP, bail out
190.if empty(PHP_CHECK_INSTALLED:M[nN][oO]) 190.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
191.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 191.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
192PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" 192PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed"
193.endif 193.endif
194.endif 194.endif
195 195
196MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 196MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
197 PKG_PHP=${PKG_PHP} 197 PKG_PHP=${PKG_PHP}
198PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 198PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
199 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 199 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
200 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 200 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
201 201
202# force the selected PHP version for recursive builds 202# force the selected PHP version for recursive builds
203PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 203PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
204 204
205# 205#
206# set variables for the version we decided to use: 206# set variables for the version we decided to use:
207# 207#
208.if ${_PHP_VERSION} == "56" 208.if ${_PHP_VERSION} == "56"
209PHPPKGSRCDIR= ../../lang/php56 209PHPPKGSRCDIR= ../../lang/php56
210PHP_VERSION= ${PHP56_VERSION} 210PHP_VERSION= ${PHP56_VERSION}
211PHP_INITIAL_TEENY= 3 211PHP_INITIAL_TEENY= 3
212PHP_PKG_PREFIX= php56 212PHP_PKG_PREFIX= php56
213PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 213PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
214.elif ${_PHP_VERSION} == "70" 214.elif ${_PHP_VERSION} == "70"
215PHPPKGSRCDIR= ../../lang/php70 215PHPPKGSRCDIR= ../../lang/php70
216PHP_VERSION= ${PHP70_VERSION} 216PHP_VERSION= ${PHP70_VERSION}
217PHP_INITIAL_TEENY= 0 217PHP_INITIAL_TEENY= 0
218PHP_PKG_PREFIX= php70 218PHP_PKG_PREFIX= php70
219PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE} 219PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE}
220.elif ${_PHP_VERSION} == "71" 220.elif ${_PHP_VERSION} == "71"
221PHPPKGSRCDIR= ../../lang/php71 221PHPPKGSRCDIR= ../../lang/php71
222PHP_VERSION= ${PHP71_VERSION} 222PHP_VERSION= ${PHP71_VERSION}
223PHP_INITIAL_TEENY= 0 223PHP_INITIAL_TEENY= 0
224PHP_PKG_PREFIX= php71 224PHP_PKG_PREFIX= php71
225PHP_EXTENSION_DIR= lib/php/${PHP71_RELDATE} 225PHP_EXTENSION_DIR= lib/php/${PHP71_RELDATE}
226.elif ${_PHP_VERSION} == "72" 226.elif ${_PHP_VERSION} == "72"
227PHPPKGSRCDIR= ../../lang/php72 227PHPPKGSRCDIR= ../../lang/php72
228PHP_VERSION= ${PHP72_VERSION} 228PHP_VERSION= ${PHP72_VERSION}
229PHP_INITIAL_TEENY= 0 229PHP_INITIAL_TEENY= 0
230PHP_PKG_PREFIX= php72 230PHP_PKG_PREFIX= php72
231PHP_EXTENSION_DIR= lib/php/${PHP72_RELDATE} 231PHP_EXTENSION_DIR= lib/php/${PHP72_RELDATE}
232.elif ${_PHP_VERSION} == "73" 232.elif ${_PHP_VERSION} == "73"
233PHPPKGSRCDIR= ../../lang/php73 233PHPPKGSRCDIR= ../../lang/php73
234PHP_VERSION= ${PHP73_VERSION} 234PHP_VERSION= ${PHP73_VERSION}
235PHP_INITIAL_TEENY= 0 235PHP_INITIAL_TEENY= 0
236PHP_PKG_PREFIX= php73 236PHP_PKG_PREFIX= php73
237PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE} 237PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE}
238.else 238.else
239# force an error 239# force an error
240PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 240PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
241.endif 241.endif
242 242
243_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 243_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
244_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 244_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
245 245
246PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 246PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
247 247
248# 248#
249# check installed version aginst required: 249# check installed version aginst required:
250# 250#
251.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 251.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
252.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 252.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
253PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 253PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
254.endif 254.endif
255.endif 255.endif
256 256
257.endif # PHPVERSION_MK 257.endif # PHPVERSION_MK
cvs diff -r1.15 -r1.15.2.1 pkgsrc/lang/php72/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/php72/Attic/Makefile 2018/12/09 18:52:34 1.15
+++ pkgsrc/lang/php72/Attic/Makefile 2019/01/19 21:44:08 1.15.2.1
@@ -1,64 +1,63 @@ @@ -1,64 +1,63 @@
1# $NetBSD: Makefile,v 1.15 2018/12/09 18:52:34 adam Exp $ 1# $NetBSD: Makefile,v 1.15.2.1 2019/01/19 21:44:08 bsiegert 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:S/RC/rc/} 6PKGNAME= php-${PHP_VERSION:S/RC/rc/}
7PKGREVISION= 2 
8 7
9HOMEPAGE= http://www.php.net/ 8HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.2 9COMMENT= PHP Hypertext Preprocessor version 7.2
11LICENSE= php 10LICENSE= php
12 11
13TEST_TARGET= test 12TEST_TARGET= test
14 13
15USE_TOOLS+= gmake lex pkg-config 14USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 15LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 16PHP_CHECK_INSTALLED= No
18 17
19PHP_VERSIONS_ACCEPTED= 72 18PHP_VERSIONS_ACCEPTED= 72
20 19
21.include "Makefile.php" 20.include "Makefile.php"
22 21
23CGIDIR= ${PREFIX}/libexec/cgi-bin 22CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 23EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 24MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 25
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 26CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 27MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 28
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 29CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 30PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 31
33SUBST_CLASSES+= path 32SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 33SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 34SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 35SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 36SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 37SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 38SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 39SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 40
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 41INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 42
44# Make sure modules can link correctly 43# Make sure modules can link correctly
45.if ${OPSYS} == "Darwin" 44.if ${OPSYS} == "Darwin"
46INSTALL_UNSTRIPPED= yes 45INSTALL_UNSTRIPPED= yes
47.endif 46.endif
48 47
49# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 48# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
50# and lacks the zone memory allocator 49# and lacks the zone memory allocator
51.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 50.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
52CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 51CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
53.endif 52.endif
54 53
55post-install: 54post-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 55 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
57 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 56 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 57 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
59 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 58 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
60 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 59 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
61 ${DESTDIR}${EGDIR} 60 ${DESTDIR}${EGDIR}
62 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 61 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
63 62
64.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.34.2.1 pkgsrc/lang/php72/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/php72/Attic/distinfo 2018/12/07 17:12:48 1.34
+++ pkgsrc/lang/php72/Attic/distinfo 2019/01/19 21:44:08 1.34.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.34 2018/12/07 17:12:48 taca Exp $ 1$NetBSD: distinfo,v 1.34.2.1 2019/01/19 21:44:08 bsiegert Exp $
2 2
3SHA1 (php-7.2.13.tar.bz2) = eb74e4b52013fef8a349b2193605d344ed425503 3SHA1 (php-7.2.14.tar.bz2) = 97d0bfc6f75d82e8ef9425189ca5c544866f927e
4RMD160 (php-7.2.13.tar.bz2) = 1f362e20ce739e34d7e5c3f282e1842f1873aa73 4RMD160 (php-7.2.14.tar.bz2) = 886704673d55837144946731f6137549d4f963ac
5SHA512 (php-7.2.13.tar.bz2) = 95b9d09fec4af7df38736fabd291af5635a2caab9611c82a9a4988a849888f9847052ed69192c0f0b0103cf9d2888d5dd763471e1419d6e8da33ab77c9f95dbd 5SHA512 (php-7.2.14.tar.bz2) = 1a3db5937c826a1dea39db24fcf122b931ecda89c5c8ca96f337fb696c48c39f81c540bfae40e0cc8837b5d378288da4f91dfa07435801517d75202e5c925453
6Size (php-7.2.13.tar.bz2) = 15051814 bytes 6Size (php-7.2.14.tar.bz2) = 15039077 bytes
7SHA1 (patch-configure) = 47f2ede97390cc7e46d04c2769dd97459b19450a 7SHA1 (patch-configure) = 47f2ede97390cc7e46d04c2769dd97459b19450a
8SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c 8SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
9SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335 9SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
10SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 10SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
11SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 11SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
12SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb 12SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
13SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 13SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
14SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd 14SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
15SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 15SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
16SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb 16SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
17SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 17SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
18SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 18SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
19SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a 19SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
20SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 20SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7