3 files changed, 88 insertions, 0 deletions

diff --git a/archivers/pecl-phk/files/patch-PHK.c b/archivers/pecl-phk/files/patch-PHK.c
new file mode 100644
index 000000000000..d5114efee34b
--- /dev/null
+++ b/archivers/pecl-phk/files/patch-PHK.c
@@ -0,0 +1,11 @@
+--- ./PHK.c.orig	2010-04-12 20:08:05.000000000 -0400
++++ ./PHK.c	2010-04-12 20:08:15.000000000 -0400
+@@ -1086,7 +1086,7 @@
+ /* }}} */
+ /*---------------------------------------------------------------*/
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(PHK_prolog_arginfo, 0, 0, 3)
++ZEND_BEGIN_ARG_INFO_EX(PHK_prolog_arginfo, 0, 0, 3)
+ ZEND_ARG_INFO(0, file)
+ ZEND_ARG_INFO(1, cmd)
+ ZEND_ARG_INFO(1, ret)
diff --git a/archivers/pecl-phk/files/patch-PHK_Stream.c b/archivers/pecl-phk/files/patch-PHK_Stream.c
new file mode 100644
index 000000000000..0942048e3442
--- /dev/null
+++ b/archivers/pecl-phk/files/patch-PHK_Stream.c
@@ -0,0 +1,11 @@
+--- ./PHK_Stream.c.orig	2010-04-12 20:07:31.000000000 -0400
++++ ./PHK_Stream.c	2010-04-12 20:07:39.000000000 -0400
+@@ -921,7 +921,7 @@
+ 
+ /*---------------------------------------------------------------*/
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(PHK_Stream_get_file_arginfo, 0, 0, 6)
++ZEND_BEGIN_ARG_INFO_EX(PHK_Stream_get_file_arginfo, 0, 0, 6)
+ ZEND_ARG_INFO(0, dir)
+ ZEND_ARG_INFO(0, uri)
+ ZEND_ARG_INFO(0, mnt)
diff --git a/archivers/pecl-phk/files/patch-utils.c b/archivers/pecl-phk/files/patch-utils.c
new file mode 100644
index 000000000000..541d6273e5bd
--- /dev/null
+++ b/archivers/pecl-phk/files/patch-utils.c
@@ -0,0 +1,66 @@
+--- ./utils.c.orig	2010-04-12 20:05:49.000000000 -0400
++++ ./utils.c	2010-04-12 20:07:15.000000000 -0400
+@@ -65,37 +65,37 @@
+ /*============================================================================*/
+ /* Generic arginfo structures */
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
++ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
++ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
++ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
++ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
++ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_ARG_INFO(0, arg2)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
++ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_ARG_INFO(0, arg2)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
++ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_ARG_INFO(0, arg2)
+ ZEND_ARG_INFO(0, arg3)
+ ZEND_END_ARG_INFO()
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
++ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
+ ZEND_ARG_INFO(0, arg1)
+ ZEND_ARG_INFO(0, arg2)
+ ZEND_ARG_INFO(0, arg3)
+@@ -234,13 +234,13 @@
+ 
+ static void ut_persistent_zval_ptr_dtor(zval ** zval_ptr)
+ {
+-	(*zval_ptr)->refcount--;
+-	if ((*zval_ptr)->refcount == 0) {
++	Z_DELREF_P((*zval_ptr));
++	if (Z_REFCOUNT_P((*zval_ptr))) {
+ 		ut_persistent_zval_dtor(*zval_ptr);
+ 		pefree(*zval_ptr, 1);
+ 	} else {
+-		if ((*zval_ptr)->refcount == 1)
+-			(*zval_ptr)->is_ref = 0;
++		if (Z_REFCOUNT_P((*zval_ptr)) == 1)
++			Z_UNSET_ISREF_P((*zval_ptr));
+ 	}
+ }
+