Pullup ticket #5613 - requested by taca lang/php56: security update Revisions pulled up: - lang/php56/Makefile 1.15 - lang/php56/distinfo 1.43 - lang/php/phpversion.mk patch ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Fri Oct 27 08:45:06 UTC 2017 Modified Files: pkgsrc/lang/php: phpversion.mk pkgsrc/lang/php56: Makefile distinfo Log Message: lang/php56: Update to 5.6.32 * pkgsrc change: remove post-extract which is not required any more. * including securiy fixes. 26 Sep 2017, PHP 5.6.32 - Date: . Fixed bug #75055 (Out-Of-Bounds Read in timelib_meridian()). (Derick) - mcrypt: . Fixed bug #72535 (arcfour encryption stream filter crashes php). (Leigh) - PCRE: . Fixed bug #75207 (applied upstream patch for CVE-2016-1283). (Anatol) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/php56/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/php56/distinfodiff -r1.188 -r1.188.4.1 pkgsrc/lang/php/phpversion.mk
(spz)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: phpversion.mk,v 1.188 2017/09/01 10:50:38 taca Exp $ | 1 | # $NetBSD: phpversion.mk,v 1.188.4.1 2017/10/31 18:13:26 spz 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 | 13 | # Possible: 56 70 71 | |
14 | # Default: 56 | 14 | # Default: 56 | |
@@ -77,29 +77,29 @@ | @@ -77,29 +77,29 @@ | |||
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) | |
87 | PHPVERSION_MK= defined | 87 | PHPVERSION_MK= defined | |
88 | 88 | |||
89 | # Define each PHP's version. | 89 | # Define each PHP's version. | |
90 | PHP56_VERSION= 5.6.31 | 90 | PHP56_VERSION= 5.6.32 | |
91 | PHP70_VERSION= 7.0.23 | 91 | PHP70_VERSION= 7.0.25 | |
92 | PHP71_VERSION= 7.1.9 | 92 | PHP71_VERSION= 7.1.11 | |
93 | 93 | |||
94 | # Define initial release of major version. | 94 | # Define initial release of major version. | |
95 | PHP56_RELDATE= 20140828 | 95 | PHP56_RELDATE= 20140828 | |
96 | PHP70_RELDATE= 20151203 | 96 | PHP70_RELDATE= 20151203 | |
97 | PHP71_RELDATE= 20160303 | 97 | PHP71_RELDATE= 20160303 | |
98 | 98 | |||
99 | _VARGROUPS+= php | 99 | _VARGROUPS+= php | |
100 | _USER_VARS.php= PHP_VERSION_DEFAULT | 100 | _USER_VARS.php= PHP_VERSION_DEFAULT | |
101 | _PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD | 101 | _PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD | |
102 | _SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ | 102 | _SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ | |
103 | PKG_PHP_MAJOR_VERS | 103 | PKG_PHP_MAJOR_VERS | |
104 | 104 | |||
105 | .include "../../mk/bsd.prefs.mk" | 105 | .include "../../mk/bsd.prefs.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.14 2017/07/07 03:13:48 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.14.4.1 2017/10/31 18:13:26 spz 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 | # | |
6 | PKGNAME= php-${PHP_VERSION} | 6 | PKGNAME= php-${PHP_VERSION} | |
7 | CATEGORIES= lang | 7 | CATEGORIES= lang | |
8 | 8 | |||
9 | HOMEPAGE= http://www.php.net/ | 9 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 5.6 | 10 | COMMENT= PHP Hypertext Preprocessor version 5.6 | |
11 | LICENSE= php | 11 | LICENSE= php | |
12 | 12 | |||
13 | TEST_TARGET= test | 13 | TEST_TARGET= test | |
14 | 14 | |||
@@ -43,27 +43,23 @@ INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTE | @@ -43,27 +43,23 @@ INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTE | |||
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].*-*) | |
47 | CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC | 47 | CFLAGS+= -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" | |
53 | CONFIGURE_ARGS+= --disable-libgcc | 53 | CONFIGURE_ARGS+= --disable-libgcc | |
54 | .endif | 54 | .endif | |
55 | 55 | |||
56 | post-extract: | |||
57 | cd ${WRKSRC} && \ | |||
58 | ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; | |||
59 | ||||
60 | post-install: | 56 | post-install: | |
61 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | 57 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | |
62 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | 58 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | |
63 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | 59 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | |
64 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | 60 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | |
65 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | 61 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | |
66 | ${DESTDIR}${EGDIR} | 62 | ${DESTDIR}${EGDIR} | |
67 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | 63 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | |
68 | 64 | |||
69 | .include "../../mk/bsd.pkg.mk" | 65 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.42 2017/07/07 03:13:48 taca Exp $ | 1 | $NetBSD: distinfo,v 1.42.4.1 2017/10/31 18:13:26 spz Exp $ | |
2 | 2 | |||
3 | SHA1 (php-5.6.31.tar.bz2) = a4ea2b095c60d61958a43ca4151acfaf4ac82e4c | 3 | SHA1 (php-5.6.32.tar.bz2) = c3166285c6d1f7cc04c45716052ec67b256838a1 | |
4 | RMD160 (php-5.6.31.tar.bz2) = e1512f94a9d1054ef136921787a47359d9cdd9bf | 4 | RMD160 (php-5.6.32.tar.bz2) = 481cb89ba907550adc40dda58f7f16d914367098 | |
5 | SHA512 (php-5.6.31.tar.bz2) = fe0a0572917287a89910cc4d1bca7a8be17fb09d0459d68fea7b32f4b9fd94efbf36d90f8d7d34baee60efc6b0aeac1414a658fc0b451c5eb2f8e3864e20e3c0 | 5 | SHA512 (php-5.6.32.tar.bz2) = d3f53a9c14e05726ec80785ee2db482d73cfd9bfca751041150da63e5e9273a2ea9a0027d3d9c80434ae8c1f93e7a4556b050969c271e696a841ec785efbeedc | |
6 | Size (php-5.6.31.tar.bz2) = 15028813 bytes | 6 | Size (php-5.6.32.tar.bz2) = 15055569 bytes | |
7 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 | 7 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 | |
8 | SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c | 8 | SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c | |
9 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 | 9 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 | |
10 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 | 10 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 | |
11 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c | 11 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c | |
12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 | 12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 | |
13 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 | 13 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 | |
14 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 | 14 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 | |
15 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 | 15 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 | |
16 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 | 16 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 | |
17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | 17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | |
18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f | 18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f | |
19 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 | 19 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 |