Attachment 181600 Details for Bug 218493 – phalcon 3.1.2 update

[patch] phalcon 3.1.2 update

phalcon.patch (text/plain), 3.13 KB, created by Franco Fichtner on 2017-04-08 15:28:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2017-04-08 15:28:57 UTC

Size: 3.13 KB

patch

obsolete

>diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
>index 5666862b4a04..73f6cd87dfa7 100644
>--- a/www/phalcon/Makefile
>+++ b/www/phalcon/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	phalcon
>-PORTVERSION=	3.1.1
>+PORTVERSION=	3.1.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>@@ -13,7 +13,6 @@ LICENSE=	BSD3CLAUSE
> 
> USES=		php:ext
> USE_PHP=	hash:build json:build pdo:build
>-IGNORE_WITH_PHP=71
> 
> ONLY_FOR_ARCHS=	amd64 armv6 i386
> 
>@@ -29,7 +28,7 @@ CONFIGURE_ARGS=	--enable-phalcon
> PBITS=		${ARCH:S/amd64/64/:S/armv6/32/:S/i386/32/:S/x86_64/64/}
> WRKSRC_SUBDIR=	build/php${PHP_VER:C/.$//}/${PBITS}bits
> 
>-.if ${PHP_VER} == 70 && ${PBITS} == 32
>+.if ${PHP_VER:C/.$//} == 7 && ${PBITS} == 32
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-phalcon.zep.c
> .endif
> 
>diff --git a/www/phalcon/distinfo b/www/phalcon/distinfo
>index 423b46448fc0..e5a27feea334 100644
>--- a/www/phalcon/distinfo
>+++ b/www/phalcon/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1490587322
>-SHA256 (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 430359e0103ac926861976815d5f1d1373c6b1d7317e128359409aafd4285f84
>-SIZE (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 6467096
>+TIMESTAMP = 1491663656
>+SHA256 (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = da619cab5979b3592b5e880a5e286e8d59841e911000be944fcddb030a7af587
>+SIZE (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = 6436291
>diff --git a/www/phalcon/files/extra-patch-phalcon.zep.c b/www/phalcon/files/extra-patch-phalcon.zep.c
>index f7fcb2c74700..80ffa4384a8b 100644
>--- a/www/phalcon/files/extra-patch-phalcon.zep.c
>+++ b/www/phalcon/files/extra-patch-phalcon.zep.c
>@@ -1,6 +1,6 @@
>---- phalcon.zep.c.orig	2016-11-26 21:03:16 UTC
>+--- phalcon.zep.c.orig	2017-04-05 21:26:32 UTC
> +++ phalcon.zep.c
>-@@ -2114,8 +2114,8 @@ static int ZEPHIR_FASTCALL zephir_memory
>+@@ -2117,8 +2117,8 @@ static int ZEPHIR_FASTCALL zephir_memory
>  #define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack(NULL)
>  
>  #else
>@@ -11,7 +11,16 @@
>  
>  #define ZEPHIR_MM_GROW() zephir_memory_grow_stack()
>  #define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack()
>-@@ -4212,7 +4212,7 @@ static void ZEPHIR_FASTCALL zephir_memor
>+@@ -2131,7 +2131,7 @@ static int ZEPHIR_FASTCALL zephir_memory
>+ static void ZEPHIR_FASTCALL zephir_memory_observe(zval *var);
>+ static void ZEPHIR_FASTCALL zephir_memory_alloc(zval *var);
>+ 
>+-static int ZEPHIR_FASTCALL zephir_clean_restore_stack();
>++static int zephir_clean_restore_stack();
>+ 
>+ #define zephir_safe_zval_ptr_dtor(pzval)
>+ 
>+@@ -4240,7 +4240,7 @@ static void ZEPHIR_FASTCALL zephir_memor
>  
>  #else
>  
>@@ -20,7 +29,7 @@
>  {
>  	zend_zephir_globals_def *g = ZEPHIR_VGLOBAL;
>  	if (g->start_memory == NULL) {
>-@@ -4221,7 +4221,7 @@ static void ZEPHIR_FASTCALL zephir_memor
>+@@ -4249,7 +4249,7 @@ static void ZEPHIR_FASTCALL zephir_memor
>  	zephir_memory_grow_stack_common(g);
>  }
>  
>@@ -29,3 +38,14 @@
>  {
>  	zephir_memory_restore_stack_common(ZEPHIR_VGLOBAL);
>  	return SUCCESS;
>+@@ -4496,8 +4496,8 @@ static void ZEPHIR_FASTCALL zephir_memor
>+ 	ZVAL_NULL(var);
>+ }
>+ 
>+-static int ZEPHIR_FASTCALL zephir_clean_restore_stack() {
>+-
>++static int zephir_clean_restore_stack()
>++{
>+ 	zend_zephir_globals_def *zephir_globals_ptr = ZEPHIR_VGLOBAL;
>+ 
>+ 	while (zephir_globals_ptr->active_memory != NULL) {

Actions: View | Diff

Attachments on bug 218493: 181600 | 181606