Page MenuHomeFreeBSD
Files F81971643

D11515.diff
No OneTemporary
Actions

D11515.diff
View Options

Index: head/devel/php70-readline/Makefile
===================================================================
--- head/devel/php70-readline/Makefile
+++ head/devel/php70-readline/Makefile
@@ -1,7 +1,6 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php70
Index: head/lang/php70/Makefile
===================================================================
--- head/lang/php70/Makefile
+++ head/lang/php70/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= php70
-PORTVERSION= 7.0.20
-PORTREVISION?= 1
+PORTVERSION= 7.0.21
+PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
@@ -118,20 +118,6 @@
PLIST_SUB+= SAPI_INC=""
.else
PLIST_SUB+= SAPI_INC="@comment "
-.endif
-
-.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
-CONFIGURE_ARGS+=--with-regex=php
-.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
-CONFIGURE_ARGS+=--with-regex=system
-.endif
-
-.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
-CONFIGURE_ARGS+=--with-zend-vm=CALL
-.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
-CONFIGURE_ARGS+=--with-zend-vm=SWITCH
-.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
-CONFIGURE_ARGS+=--with-zend-vm=GOTO
.endif
CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \
Index: head/lang/php70/distinfo
===================================================================
--- head/lang/php70/distinfo
+++ head/lang/php70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497260078
-SHA256 (php-7.0.20.tar.xz) = 31b9cf1fb83fe3cd82c2f6603a0ae81ae6abacb5286827e362d8f85e68908e0a
-SIZE (php-7.0.20.tar.xz) = 12604260
+TIMESTAMP = 1499416619
+SHA256 (php-7.0.21.tar.xz) = 6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3
+SIZE (php-7.0.21.tar.xz) = 12626276
Index: head/lang/php70/files/patch-main_php__ini.c
===================================================================
--- head/lang/php70/files/patch-main_php__ini.c
+++ head/lang/php70/files/patch-main_php__ini.c
@@ -1,31 +0,0 @@
---- main/php_ini.c.orig 2017-06-14 13:27:29 UTC
-+++ main/php_ini.c
-@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1
- size_t key_len;
-
- /* PATH sections */
-- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) {
-+ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) {
- key = Z_STRVAL_P(arg1);
- key = key + sizeof("PATH") - 1;
- key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1;
-@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1
- TRANSLATE_SLASHES_LOWER(key);
-
- /* HOST sections */
-- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) {
-+ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) {
- key = Z_STRVAL_P(arg1);
- key = key + sizeof("HOST") - 1;
- key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1;
-@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1
- zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1);
- entry = zend_hash_str_update(target_hash, key, key_len, &section_arr);
- }
-- active_ini_hash = Z_ARRVAL_P(entry);
-+ if (Z_TYPE_P(entry) == IS_ARRAY) {
-+ active_ini_hash = Z_ARRVAL_P(entry);
-+ }
- }
- }
- break;

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 16, 4:38 AM (21 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
9092342
Default Alt Text
D11515.diff (3 KB)

Event Timeline