Sun Aug 23 18:42:13 2020 UTC ()
Pullup ticket #6299 - requested by taca
lang/php74: security fix

Revisions pulled up:
- lang/php74/distinfo                                           1.10-1.11

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Jul 11 04:02:14 UTC 2020

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

   Log Message:
   lang/php74: update to 7.4.8

   Update php74 to 7.4.8.

   09 Jul 2020, PHP 7.4.8

   - Core:
     . Fixed bug #79649 (Altering disable_functions from module init corrupts
       memory). (Laruence)
     . Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita)
     . Fixed bug #79650 (php-win.exe 100% cpu lockup). (cmb)
     . Fixed bug #79668 (get_defined_functions(true) may miss functions). (cmb,
       Nikita)
     . Fixed bug #79657 ("yield from" hangs when invalid value encountered).
       (Nikita)
     . Fixed bug #79683 (Fake reflection scope affects __toString()). (Nikita)
     . Fixed possibly unsupported timercmp() usage. (cmb)

   - Exif:
     . Fixed bug #79687 (Sony picture - PHP Warning - Make, Model, MakerNotes).
       (cmb)

   - Fileinfo:
     . Fixed bug #79681 (mime_content_type/finfo returning incorrect mimetype).
       (cmb)

   - Filter:
     . Fixed bug #73527 (Invalid memory access in php_filter_strip). (cmb)

   - GD:
     . Fixed bug #79676 (imagescale adds black border with IMG_BICUBIC). (cmb)

   - OpenSSL:
     . Fixed bug #62890 (default_socket_timeout=-1 causes connection to timeout).
       (cmb)

   - PDO SQLite:
     . Fixed bug #79664 (PDOStatement::getColumnMeta fails on empty result set).
       (cmb)

   - phpdbg:
     . Fixed bug #73926 (phpdbg will not accept input on restart execution). (cmb)
     . Fixed bug #73927 (phpdbg fails with windows error prompt at "watch array").
       (cmb)
     . Fixed several mostly Windows related phpdbg bugs. (cmb)

   - SPL:
     . Fixed bug #79710 (Reproducible segfault in error_handler during GC
       involved an SplFileObject). (Nikita)

   - Standard:
     . Fixed bug #74267 (segfault with streams and invalid data). (cmb)
     . Fixed bug #79579 (ZTS build of PHP 7.3.17 doesn't handle ERANGE for
       posix_getgrgid and others). (B旦sz旦rm辿nyi Zolt叩n)

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Aug  8 13:31:19 UTC 2020

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

   Log Message:
   lang/php74: update to 7.4.9

   Update php74 to 7.4.9 (PHP 7.4.9).

   06 Aug 2020, PHP 7.4.9

   - Apache:
     . Fixed bug #79030 (Upgrade apache2handler's php_apache_sapi_get_request_time
       to return usec). (Herbert256)

   - COM:
     . Fixed bug #63208 (BSTR to PHP string conversion not binary safe). (cmb)
     . Fixed bug #63527 (DCOM does not work with Username, Password parameter).
       (cmb)

   - Core:
     . Fixed bug #79740 (serialize() and unserialize() methods can not be called
       statically). (Nikita)
     . Fixed bug #79783 (Segfault in php_str_replace_common). (Nikita)
     . Fixed bug #79778 (Assertion failure if dumping closure with unresolved
       static variable). (Nikita)
     . Fixed bug #79779 (Assertion failure when assigning property of string
       offset by reference). (Nikita)
     . Fixed bug #79792 (HT iterators not removed if empty array is destroyed).
       (Nikita)
     . Fixed bug #78598 (Changing array during undef index RW error segfaults).
       (Nikita)
     . Fixed bug #79784 (Use after free if changing array during undef var during
       array write fetch). (Nikita)
     . Fixed bug #79793 (Use after free if string used in undefined index warning
       is changed). (Nikita)
     . Fixed bug #79862 (Public non-static property in child should take priority
       over private static). (Nikita)
     . Fixed bug #79877 (getimagesize function silently truncates after a null
       byte) (cmb)

   - Fileinfo:
     . Fixed bug #79756 (finfo_file crash (FILEINFO_MIME)). (cmb)

   - FTP:
     . Fixed bug #55857 (ftp_size on large files). (cmb)

   - Mbstring:
     . Fixed bug #79787 (mb_strimwidth does not trim string). (XXiang)

   - Phar:
     . Fixed bug #79797 (Use of freed hash key in the phar_parse_zipfile
       function). (CVE-2020-7068) (cmb)

   - Reflection:
     . Fixed bug #79487 (::getStaticProperties() ignores property modifications).
       (cmb, Nikita)
     . Fixed bug #69804 (::getStaticPropertyValue() throws on protected props).
       (cmb, Nikita)
     . Fixed bug #79820 (Use after free when type duplicated into
       ReflectionProperty gets resolved). (Christopher Broadbent)

   - Standard:
     . Fixed bug #70362 (Can't copy() large 'data://' with open_basedir). (cmb)
     . Fixed bug #78008 (dns_check_record() always return true on Alpine).
       (Andy Postnikov)
     . Fixed bug #79839 (array_walk() does not respect property types). (Nikita)


(bsiegert)
diff -r1.300.2.1 -r1.300.2.2 pkgsrc/lang/php/phpversion.mk
diff -r1.9 -r1.9.2.1 pkgsrc/lang/php74/distinfo
cvs diff -r1.300.2.1 -r1.300.2.2 pkgsrc/lang/php/phpversion.mk (switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2020/08/14 19:33:28 1.300.2.1
+++ pkgsrc/lang/php/phpversion.mk 2020/08/23 18:42:13 1.300.2.2
@@ -1,239 +1,239 @@ @@ -1,239 +1,239 @@
1# $NetBSD: phpversion.mk,v 1.300.2.1 2020/08/14 19:33:28 bsiegert Exp $ 1# $NetBSD: phpversion.mk,v 1.300.2.2 2020/08/23 18:42:13 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 72 73 74 13# Possible: 56 72 73 74
14# Default: 73 14# Default: 73
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 72 73 74 30# Possible: 56 72 73 74
31# Default: 73 56 72 74 31# Default: 73 56 72 74
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 72 73 74 36# Possible: 56 72 73 74
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/php72, lang/php73 or lang/php74 only. 41# lang/php72, lang/php73 or lang/php74 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 72 73 74 51# Possible: 56 72 73 74
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/php73 70# Example: ../../lang/php73
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 php72 php73 php74 75# Example: php56 php72 php73 php74
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/20181200 81# Example: lib/php/20181200
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.40 90PHP56_VERSION= 5.6.40
91PHP72_VERSION= 7.2.31 91PHP72_VERSION= 7.2.31
92PHP73_VERSION= 7.3.21 92PHP73_VERSION= 7.3.21
93PHP74_VERSION= 7.4.7 93PHP74_VERSION= 7.4.9
94 94
95# Define initial release of major version. 95# Define initial release of major version.
96PHP56_RELDATE= 20140828 96PHP56_RELDATE= 20140828
97PHP72_RELDATE= 20170718 97PHP72_RELDATE= 20170718
98PHP73_RELDATE= 20181200 98PHP73_RELDATE= 20181200
99PHP74_RELDATE= 20191128 99PHP74_RELDATE= 20191128
100 100
101_VARGROUPS+= php 101_VARGROUPS+= php
102_USER_VARS.php= PHP_VERSION_DEFAULT 102_USER_VARS.php= PHP_VERSION_DEFAULT
103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
105 PKG_PHP_MAJOR_VERS 105 PKG_PHP_MAJOR_VERS
106 106
107.include "../../mk/bsd.prefs.mk" 107.include "../../mk/bsd.prefs.mk"
108 108
109PHP_VERSION_DEFAULT?= 73 109PHP_VERSION_DEFAULT?= 73
110PHP_VERSIONS_ACCEPTED?= 73 56 72 74 110PHP_VERSIONS_ACCEPTED?= 73 56 72 74
111.for pv in ${PHP_VERSIONS_ACCEPTED} 111.for pv in ${PHP_VERSIONS_ACCEPTED}
112. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 112. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
113_PHP_VERSIONS_ACCEPTED+= ${pv} 113_PHP_VERSIONS_ACCEPTED+= ${pv}
114. endif 114. endif
115.endfor 115.endfor
116 116
117# transform the list into individual variables 117# transform the list into individual variables
118.for pv in ${_PHP_VERSIONS_ACCEPTED} 118.for pv in ${_PHP_VERSIONS_ACCEPTED}
119_PHP_VERSION_${pv}_OK= yes 119_PHP_VERSION_${pv}_OK= yes
120.endfor 120.endfor
121 121
122# check what is installed 122# check what is installed
123.if exists(${LOCALBASE}/lib/php/${PHP74_RELDATE}) 123.if exists(${LOCALBASE}/lib/php/${PHP74_RELDATE})
124_PHP_VERSION_74_INSTALLED= yes 124_PHP_VERSION_74_INSTALLED= yes
125_PHP_INSTALLED= yes 125_PHP_INSTALLED= yes
126.elif exists(${LOCALBASE}/lib/php/${PHP73_RELDATE}) 126.elif exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
127_PHP_VERSION_73_INSTALLED= yes 127_PHP_VERSION_73_INSTALLED= yes
128_PHP_INSTALLED= yes 128_PHP_INSTALLED= yes
129.elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE}) 129.elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
130_PHP_VERSION_72_INSTALLED= yes 130_PHP_VERSION_72_INSTALLED= yes
131_PHP_INSTALLED= yes 131_PHP_INSTALLED= yes
132.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE}) 132.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
133_PHP_VERSION_56_INSTALLED= yes 133_PHP_VERSION_56_INSTALLED= yes
134_PHP_INSTALLED= yes 134_PHP_INSTALLED= yes
135.endif 135.endif
136 136
137# if a version is explicitely required, take it 137# if a version is explicitely required, take it
138.if defined(PHP_VERSION_REQD) 138.if defined(PHP_VERSION_REQD)
139_PHP_VERSION= ${PHP_VERSION_REQD} 139_PHP_VERSION= ${PHP_VERSION_REQD}
140.endif 140.endif
141# if the default is already installed, it is first choice 141# if the default is already installed, it is first choice
142.if !defined(_PHP_VERSION) 142.if !defined(_PHP_VERSION)
143.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 143.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
144.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 144.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
145_PHP_VERSION= ${PHP_VERSION_DEFAULT} 145_PHP_VERSION= ${PHP_VERSION_DEFAULT}
146.endif 146.endif
147.endif 147.endif
148.endif 148.endif
149# prefer an already installed version, in order of "accepted" 149# prefer an already installed version, in order of "accepted"
150.if !defined(_PHP_VERSION) 150.if !defined(_PHP_VERSION)
151.for pv in ${_PHP_VERSIONS_ACCEPTED} 151.for pv in ${_PHP_VERSIONS_ACCEPTED}
152.if defined(_PHP_VERSION_${pv}_INSTALLED) 152.if defined(_PHP_VERSION_${pv}_INSTALLED)
153_PHP_VERSION?= ${pv} 153_PHP_VERSION?= ${pv}
154.else 154.else
155# keep information as last resort - see below 155# keep information as last resort - see below
156_PHP_VERSION_FIRSTACCEPTED?= ${pv} 156_PHP_VERSION_FIRSTACCEPTED?= ${pv}
157.endif 157.endif
158.endfor 158.endfor
159.endif 159.endif
160# if the default is OK for the addon pkg, take this 160# if the default is OK for the addon pkg, take this
161.if !defined(_PHP_VERSION) 161.if !defined(_PHP_VERSION)
162.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 162.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
163_PHP_VERSION= ${PHP_VERSION_DEFAULT} 163_PHP_VERSION= ${PHP_VERSION_DEFAULT}
164.endif 164.endif
165.endif 165.endif
166# take the first one accepted by the package 166# take the first one accepted by the package
167.if !defined(_PHP_VERSION) 167.if !defined(_PHP_VERSION)
168_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} 168_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
169.endif 169.endif
170 170
171# 171#
172# Variable assignment for multi-PHP packages 172# Variable assignment for multi-PHP packages
173MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 173MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
174 174
175# export some of internal variables 175# export some of internal variables
176PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 176PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
177PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 177PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
178 178
179# Major version 179# Major version
180PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/} 180PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/}
181 181
182PHP_CHECK_INSTALLED?= Yes 182PHP_CHECK_INSTALLED?= Yes
183 183
184# if installed PHP isn't compatible with required PHP, bail out 184# if installed PHP isn't compatible with required PHP, bail out
185.if empty(PHP_CHECK_INSTALLED:M[nN][oO]) 185.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
186.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 186.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
187PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" 187PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed"
188.endif 188.endif
189.endif 189.endif
190 190
191MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 191MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
192 PKG_PHP=${PKG_PHP} 192 PKG_PHP=${PKG_PHP}
193PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 193PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
194 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 194 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
195 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 195 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
196 196
197# force the selected PHP version for recursive builds 197# force the selected PHP version for recursive builds
198PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 198PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
199 199
200# 200#
201# set variables for the version we decided to use: 201# set variables for the version we decided to use:
202# 202#
203.if ${_PHP_VERSION} == "56" 203.if ${_PHP_VERSION} == "56"
204PHP_VERSION= ${PHP56_VERSION} 204PHP_VERSION= ${PHP56_VERSION}
205PHP_INITIAL_TEENY= 3 205PHP_INITIAL_TEENY= 3
206PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 206PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
207.elif ${_PHP_VERSION} == "72" 207.elif ${_PHP_VERSION} == "72"
208PHP_VERSION= ${PHP72_VERSION} 208PHP_VERSION= ${PHP72_VERSION}
209PHP_EXTENSION_DIR= lib/php/${PHP72_RELDATE} 209PHP_EXTENSION_DIR= lib/php/${PHP72_RELDATE}
210.elif ${_PHP_VERSION} == "73" 210.elif ${_PHP_VERSION} == "73"
211PHP_VERSION= ${PHP73_VERSION} 211PHP_VERSION= ${PHP73_VERSION}
212PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE} 212PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE}
213.elif ${_PHP_VERSION} == "74" 213.elif ${_PHP_VERSION} == "74"
214PHP_VERSION= ${PHP74_VERSION} 214PHP_VERSION= ${PHP74_VERSION}
215PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE} 215PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE}
216.else 216.else
217# force an error 217# force an error
218PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 218PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
219.endif 219.endif
220 220
221PHP_INITIAL_TEENY?= 0 221PHP_INITIAL_TEENY?= 0
222PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION} 222PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION}
223PHP_PKG_PREFIX= php${PKG_PHP_VERSION} 223PHP_PKG_PREFIX= php${PKG_PHP_VERSION}
224 224
225_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 225_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
226_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 226_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
227 227
228PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 228PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
229 229
230# 230#
231# check installed version aginst required: 231# check installed version aginst required:
232# 232#
233.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 233.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
234.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 234.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
235PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 235PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
236.endif 236.endif
237.endif 237.endif
238 238
239.endif # PHPVERSION_MK 239.endif # PHPVERSION_MK
cvs diff -r1.9 -r1.9.2.1 pkgsrc/lang/php74/distinfo (switch to unified diff)

--- pkgsrc/lang/php74/distinfo 2020/06/14 05:59:17 1.9
+++ pkgsrc/lang/php74/distinfo 2020/08/23 18:42:13 1.9.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.9 2020/06/14 05:59:17 taca Exp $ 1$NetBSD: distinfo,v 1.9.2.1 2020/08/23 18:42:13 bsiegert Exp $
2 2
3SHA1 (php-7.4.7.tar.xz) = 81b2f89d3668b137514e94383b79957e19066caa 3SHA1 (php-7.4.9.tar.xz) = 6d8996e0e033745565eab8f4a8c67438c0f61ee0
4RMD160 (php-7.4.7.tar.xz) = 7690589df7a30612698e5931a7b4b16965538a9d 4RMD160 (php-7.4.9.tar.xz) = 5d9e8153926dcadd5a08ef36e2232998f3a613d0
5SHA512 (php-7.4.7.tar.xz) = 5b3ba690e610e0511675f06a10afe9edbcfa90b5b16956d22aab225cdf140b55e5a8a551e7b189d30404981c94c6921b8c4aed00102546cfa38784a719704b80 5SHA512 (php-7.4.9.tar.xz) = 6179c2d867d6775d7f41785003c36d06ce620e7746ea7e6a4d275264e814a66d465776b47b04e2926ed1228cf58f2c15cdda74faf10372435c74ede7aeb79e18
6Size (php-7.4.7.tar.xz) = 10286580 bytes 6Size (php-7.4.9.tar.xz) = 10289560 bytes
7SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108 7SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
8SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640 8SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
9SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd 9SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
10SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 10SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
11SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 11SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
12SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462 12SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
13SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d 13SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
14SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 14SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
15SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 15SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
16SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a 16SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
17SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 17SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0