From 535865e9088b297d54615c3c3a375539b4fa9e4b Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Thu, 17 Jan 2008 03:19:44 +0000 Subject: [PATCH] give up on gpg signing because of non-existent windows support for gpg signing lib --- ext/phar/config.m4 | 1 - ext/phar/config.w32 | 1 - ext/phar/phar.c | 13 ------------- ext/phar/phar_internal.h | 4 ---- 4 files changed, 19 deletions(-) diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 5999c6d747..a4ab9f2cb5 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -13,6 +13,5 @@ if test "$PHP_PHAR" != "no"; then PHP_ADD_EXTENSION_DEP(phar, zlib, true) PHP_ADD_EXTENSION_DEP(phar, bz2, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) - PHP_ADD_EXTENSION_DEP(phar, gnupg, true) PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/ext/phar/config.w32 b/ext/phar/config.w32 index c5a9be4e65..7c25c4ed47 100644 --- a/ext/phar/config.w32 +++ b/ext/phar/config.w32 @@ -19,5 +19,4 @@ if (PHP_PHAR != "no") { ADD_EXTENSION_DEP('phar', 'zlib', true); ADD_EXTENSION_DEP('phar', 'bz2', true); ADD_EXTENSION_DEP('phar', 'spl', true); - ADD_EXTENSION_DEP('phar', 'gnupg', true); } diff --git a/ext/phar/phar.c b/ext/phar/phar.c index b497710469..77c254e57e 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3225,7 +3225,6 @@ PHP_MINIT_FUNCTION(phar) /* {{{ */ ZEND_INIT_MODULE_GLOBALS(phar, php_phar_init_globals_module, NULL); REGISTER_INI_ENTRIES(); - phar_has_gnupg = zend_hash_exists(&module_registry, "gnupg", sizeof("gnupg")); phar_has_bz2 = zend_hash_exists(&module_registry, "bz2", sizeof("bz2")); phar_has_zlib = zend_hash_exists(&module_registry, "zlib", sizeof("zlib")); phar_has_zip = zend_hash_exists(&module_registry, "zip", sizeof("zip")); @@ -3334,15 +3333,6 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */ } #else php_info_print_table_row(2, "bzip2 compression", "unavailable (install pecl/bz2)"); -#endif -#if HAVE_GNUPGLIB - if (phar_has_gnupg) { - php_info_print_table_row(2, "GPG signature", "enabled"); - } else { - php_info_print_table_row(2, "GPG signature", "disabled (install pecl/gnupg)"); - } -#else - php_info_print_table_row(2, "GPG signature", "unavailable (install pecl/gnupg)"); #endif php_info_print_table_end(); @@ -3370,9 +3360,6 @@ static zend_module_dep phar_deps[] = { #if HAVE_BZ2 ZEND_MOD_OPTIONAL("bz2") #endif -#if HAVE_GNUPGLIB - ZEND_MOD_OPTIONAL("gnupg") -#endif #if HAVE_SPL ZEND_MOD_REQUIRED("spl") #endif diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 4973b5ab2f..7e718eaa4b 100755 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -65,9 +65,6 @@ #include "ext/spl/spl_exceptions.h" #include "ext/spl/spl_iterators.h" #endif -#if HAVE_GNUPGLIB -#include "ext/gnupg/php_gnupg.h" -#endif #include "php_phar.h" #ifdef HAVE_STDINT_H #include @@ -172,7 +169,6 @@ ZEND_END_MODULE_GLOBALS(phar) ZEND_EXTERN_MODULE_GLOBALS(phar) int phar_has_bz2; -int phar_has_gnupg; int phar_has_zlib; int phar_has_zip; -- 2.40.0