SOURCES: php-pecl-gnupg-tsrmls.patch (NEW), php4-pecl-gnupg-tsrmls...
adamg
adamg at pld-linux.org
Sat Nov 12 18:59:47 CET 2005
Author: adamg Date: Sat Nov 12 17:59:47 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new, fixes build when zts is enabled
---- Files affected:
SOURCES:
php-pecl-gnupg-tsrmls.patch (NONE -> 1.1) (NEW), php4-pecl-gnupg-tsrmls.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/php-pecl-gnupg-tsrmls.patch
diff -u /dev/null SOURCES/php-pecl-gnupg-tsrmls.patch:1.1
--- /dev/null Sat Nov 12 18:59:47 2005
+++ SOURCES/php-pecl-gnupg-tsrmls.patch Sat Nov 12 18:59:42 2005
@@ -0,0 +1,115 @@
+--- gnupg-0.6.orig/gnupg.c 2005-11-12 17:55:00.000000000 +0100
++++ gnupg-0.6/gnupg.c 2005-11-12 18:36:38.021214568 +0100
+@@ -92,7 +92,7 @@
+ gpgme_release (intern->ctx);
+ intern->ctx = NULL;
+ }
+- gnupg_free_encryptkeys(intern);
++ gnupg_free_encryptkeys(intern TSRMLS_CC);
+ zend_hash_destroy(intern->signkeys);
+ FREE_HASHTABLE(intern->signkeys);
+ zend_hash_destroy(intern->decryptkeys);
+@@ -278,31 +278,31 @@
+ if (SUCCESS != gnupg_keylistiterator_init()){
+ return FAILURE;
+ }
+- gnupg_declare_long_constant("SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL TSRMLS_DC);
+- gnupg_declare_long_constant("SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH TSRMLS_DC);
+- gnupg_declare_long_constant("SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_UNKNOWN", GPGME_VALIDITY_UNKNOWN TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_UNDEFINED", GPGME_VALIDITY_UNDEFINED TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_NEVER", GPGME_VALIDITY_NEVER TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_MARGINAL", GPGME_VALIDITY_MARGINAL TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_FULL", GPGME_VALIDITY_FULL TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_ULTIMATE", GPGME_VALIDITY_ULTIMATE TSRMLS_DC);
+- gnupg_declare_long_constant("PROTOCOL_OpenPGP", GPGME_PROTOCOL_OpenPGP TSRMLS_DC);
+- gnupg_declare_long_constant("PROTOCOL_CMS", GPGME_PROTOCOL_CMS TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_VALID", GPGME_SIGSUM_VALID TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_GREEN", GPGME_SIGSUM_GREEN TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_RED", GPGME_SIGSUM_RED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_REVOKED", GPGME_SIGSUM_KEY_REVOKED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_EXPIRED", GPGME_SIGSUM_KEY_EXPIRED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_SIG_EXPIRED", GPGME_SIGSUM_SIG_EXPIRED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_MISSING", GPGME_SIGSUM_KEY_MISSING TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_CRL_MISSING", GPGME_SIGSUM_CRL_MISSING TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_CRL_TOO_OLD", GPGME_SIGSUM_CRL_TOO_OLD TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_BAD_POLICY", GPGME_SIGSUM_BAD_POLICY TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_SYS_ERROR", GPGME_SIGSUM_SYS_ERROR TSRMLS_DC);
+- gnupg_declare_long_constant("ERROR_WARNING", 1);
+- gnupg_declare_long_constant("ERROR_EXCEPTION", 2);
+- gnupg_declare_long_constant("ERROR_SILENT", 3);
++ gnupg_declare_long_constant("SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL TSRMLS_CC);
++ gnupg_declare_long_constant("SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH TSRMLS_CC);
++ gnupg_declare_long_constant("SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_UNKNOWN", GPGME_VALIDITY_UNKNOWN TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_UNDEFINED", GPGME_VALIDITY_UNDEFINED TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_NEVER", GPGME_VALIDITY_NEVER TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_MARGINAL", GPGME_VALIDITY_MARGINAL TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_FULL", GPGME_VALIDITY_FULL TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_ULTIMATE", GPGME_VALIDITY_ULTIMATE TSRMLS_CC);
++ gnupg_declare_long_constant("PROTOCOL_OpenPGP", GPGME_PROTOCOL_OpenPGP TSRMLS_CC);
++ gnupg_declare_long_constant("PROTOCOL_CMS", GPGME_PROTOCOL_CMS TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_VALID", GPGME_SIGSUM_VALID TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_GREEN", GPGME_SIGSUM_GREEN TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_RED", GPGME_SIGSUM_RED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_REVOKED", GPGME_SIGSUM_KEY_REVOKED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_EXPIRED", GPGME_SIGSUM_KEY_EXPIRED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_SIG_EXPIRED", GPGME_SIGSUM_SIG_EXPIRED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_MISSING", GPGME_SIGSUM_KEY_MISSING TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_CRL_MISSING", GPGME_SIGSUM_CRL_MISSING TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_CRL_TOO_OLD", GPGME_SIGSUM_CRL_TOO_OLD TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_BAD_POLICY", GPGME_SIGSUM_BAD_POLICY TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_SYS_ERROR", GPGME_SIGSUM_SYS_ERROR TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_WARNING", 1 TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_EXCEPTION", 2 TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_SILENT", 3 TSRMLS_CC);
+ #endif
+ REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH, CONST_CS | CONST_PERSISTENT);
+@@ -355,7 +355,7 @@
+
+ /* {{{ callback func for setting the passphrase */
+
+-gpgme_error_t passphrase_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd){
++gpgme_error_t passphrase_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd TSRMLS_DC){
+ char uid[16];
+ int idx;
+ char *passphrase = NULL;
+@@ -382,7 +382,7 @@
+ return 0;
+ }
+
+-gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd){
++gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd TSRMLS_DC){
+ char uid[16];
+ int idx;
+ char *passphrase = NULL;
+@@ -435,7 +435,7 @@
+ PHP_FUNCTION(gnupg_init){
+ gnupg_object *intern;
+ intern = emalloc(sizeof(gnupg_object));
+- gnupg_res_init(intern);
++ gnupg_res_init(intern TSRMLS_CC);
+ ZEND_REGISTER_RESOURCE(return_value,intern,le_gnupg);
+ }
+ /* }}} */
+@@ -817,7 +817,7 @@
+ }
+ ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg);
+ }
+- gnupg_free_encryptkeys(intern);
++ gnupg_free_encryptkeys(intern TSRMLS_CC);
+
+ RETURN_TRUE;
+ }
+--- gnupg-0.6.orig/gnupg_keylistiterator.c 2005-11-12 17:55:00.000000000 +0100
++++ gnupg-0.6/gnupg_keylistiterator.c 2005-11-12 18:36:54.963638928 +0100
+@@ -113,7 +113,7 @@
+ memcpy(&gnupg_keylistiterator_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ le_gnupg_keylistiterator = zend_register_list_destructors_ex(NULL, NULL, "ctx_keylistiterator", module_number);
+
+- zend_class_implements (gnupg_keylistiterator_class_entry TSRMLS_DC, 1, zend_ce_iterator);
++ zend_class_implements (gnupg_keylistiterator_class_entry TSRMLS_CC, 1, zend_ce_iterator);
+
+ return SUCCESS;
+ }
================================================================
Index: SOURCES/php4-pecl-gnupg-tsrmls.patch
diff -u /dev/null SOURCES/php4-pecl-gnupg-tsrmls.patch:1.1
--- /dev/null Sat Nov 12 18:59:47 2005
+++ SOURCES/php4-pecl-gnupg-tsrmls.patch Sat Nov 12 18:59:42 2005
@@ -0,0 +1,115 @@
+--- gnupg-0.6.orig/gnupg.c 2005-11-12 17:55:00.000000000 +0100
++++ gnupg-0.6/gnupg.c 2005-11-12 18:36:38.021214568 +0100
+@@ -92,7 +92,7 @@
+ gpgme_release (intern->ctx);
+ intern->ctx = NULL;
+ }
+- gnupg_free_encryptkeys(intern);
++ gnupg_free_encryptkeys(intern TSRMLS_CC);
+ zend_hash_destroy(intern->signkeys);
+ FREE_HASHTABLE(intern->signkeys);
+ zend_hash_destroy(intern->decryptkeys);
+@@ -278,31 +278,31 @@
+ if (SUCCESS != gnupg_keylistiterator_init()){
+ return FAILURE;
+ }
+- gnupg_declare_long_constant("SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL TSRMLS_DC);
+- gnupg_declare_long_constant("SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH TSRMLS_DC);
+- gnupg_declare_long_constant("SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_UNKNOWN", GPGME_VALIDITY_UNKNOWN TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_UNDEFINED", GPGME_VALIDITY_UNDEFINED TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_NEVER", GPGME_VALIDITY_NEVER TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_MARGINAL", GPGME_VALIDITY_MARGINAL TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_FULL", GPGME_VALIDITY_FULL TSRMLS_DC);
+- gnupg_declare_long_constant("VALIDITY_ULTIMATE", GPGME_VALIDITY_ULTIMATE TSRMLS_DC);
+- gnupg_declare_long_constant("PROTOCOL_OpenPGP", GPGME_PROTOCOL_OpenPGP TSRMLS_DC);
+- gnupg_declare_long_constant("PROTOCOL_CMS", GPGME_PROTOCOL_CMS TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_VALID", GPGME_SIGSUM_VALID TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_GREEN", GPGME_SIGSUM_GREEN TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_RED", GPGME_SIGSUM_RED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_REVOKED", GPGME_SIGSUM_KEY_REVOKED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_EXPIRED", GPGME_SIGSUM_KEY_EXPIRED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_SIG_EXPIRED", GPGME_SIGSUM_SIG_EXPIRED TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_KEY_MISSING", GPGME_SIGSUM_KEY_MISSING TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_CRL_MISSING", GPGME_SIGSUM_CRL_MISSING TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_CRL_TOO_OLD", GPGME_SIGSUM_CRL_TOO_OLD TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_BAD_POLICY", GPGME_SIGSUM_BAD_POLICY TSRMLS_DC);
+- gnupg_declare_long_constant("SIGSUM_SYS_ERROR", GPGME_SIGSUM_SYS_ERROR TSRMLS_DC);
+- gnupg_declare_long_constant("ERROR_WARNING", 1);
+- gnupg_declare_long_constant("ERROR_EXCEPTION", 2);
+- gnupg_declare_long_constant("ERROR_SILENT", 3);
++ gnupg_declare_long_constant("SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL TSRMLS_CC);
++ gnupg_declare_long_constant("SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH TSRMLS_CC);
++ gnupg_declare_long_constant("SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_UNKNOWN", GPGME_VALIDITY_UNKNOWN TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_UNDEFINED", GPGME_VALIDITY_UNDEFINED TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_NEVER", GPGME_VALIDITY_NEVER TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_MARGINAL", GPGME_VALIDITY_MARGINAL TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_FULL", GPGME_VALIDITY_FULL TSRMLS_CC);
++ gnupg_declare_long_constant("VALIDITY_ULTIMATE", GPGME_VALIDITY_ULTIMATE TSRMLS_CC);
++ gnupg_declare_long_constant("PROTOCOL_OpenPGP", GPGME_PROTOCOL_OpenPGP TSRMLS_CC);
++ gnupg_declare_long_constant("PROTOCOL_CMS", GPGME_PROTOCOL_CMS TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_VALID", GPGME_SIGSUM_VALID TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_GREEN", GPGME_SIGSUM_GREEN TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_RED", GPGME_SIGSUM_RED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_REVOKED", GPGME_SIGSUM_KEY_REVOKED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_EXPIRED", GPGME_SIGSUM_KEY_EXPIRED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_SIG_EXPIRED", GPGME_SIGSUM_SIG_EXPIRED TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_KEY_MISSING", GPGME_SIGSUM_KEY_MISSING TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_CRL_MISSING", GPGME_SIGSUM_CRL_MISSING TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_CRL_TOO_OLD", GPGME_SIGSUM_CRL_TOO_OLD TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_BAD_POLICY", GPGME_SIGSUM_BAD_POLICY TSRMLS_CC);
++ gnupg_declare_long_constant("SIGSUM_SYS_ERROR", GPGME_SIGSUM_SYS_ERROR TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_WARNING", 1 TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_EXCEPTION", 2 TSRMLS_CC);
++ gnupg_declare_long_constant("ERROR_SILENT", 3 TSRMLS_CC);
+ #endif
+ REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH, CONST_CS | CONST_PERSISTENT);
+@@ -355,7 +355,7 @@
+
+ /* {{{ callback func for setting the passphrase */
+
+-gpgme_error_t passphrase_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd){
++gpgme_error_t passphrase_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd TSRMLS_DC){
+ char uid[16];
+ int idx;
+ char *passphrase = NULL;
+@@ -382,7 +382,7 @@
+ return 0;
+ }
+
+-gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd){
++gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint, const char *passphrase_info,int last_was_bad, int fd TSRMLS_DC){
+ char uid[16];
+ int idx;
+ char *passphrase = NULL;
+@@ -435,7 +435,7 @@
+ PHP_FUNCTION(gnupg_init){
+ gnupg_object *intern;
+ intern = emalloc(sizeof(gnupg_object));
+- gnupg_res_init(intern);
++ gnupg_res_init(intern TSRMLS_CC);
+ ZEND_REGISTER_RESOURCE(return_value,intern,le_gnupg);
+ }
+ /* }}} */
+@@ -817,7 +817,7 @@
+ }
+ ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg);
+ }
+- gnupg_free_encryptkeys(intern);
++ gnupg_free_encryptkeys(intern TSRMLS_CC);
+
+ RETURN_TRUE;
+ }
+--- gnupg-0.6.orig/gnupg_keylistiterator.c 2005-11-12 17:55:00.000000000 +0100
++++ gnupg-0.6/gnupg_keylistiterator.c 2005-11-12 18:36:54.963638928 +0100
+@@ -113,7 +113,7 @@
+ memcpy(&gnupg_keylistiterator_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ le_gnupg_keylistiterator = zend_register_list_destructors_ex(NULL, NULL, "ctx_keylistiterator", module_number);
+
+- zend_class_implements (gnupg_keylistiterator_class_entry TSRMLS_DC, 1, zend_ce_iterator);
++ zend_class_implements (gnupg_keylistiterator_class_entry TSRMLS_CC, 1, zend_ce_iterator);
+
+ return SUCCESS;
+ }
================================================================
More information about the pld-cvs-commit
mailing list