git: ea9b7cb2b1f1 - main - security/pecl-gnupg: Update to 1.5.4

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ea9b7cb2b1f166bacf3addb971ecc53b714346c5

commit ea9b7cb2b1f166bacf3addb971ecc53b714346c5
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-09-07 22:35:31 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-09-07 23:03:31 +0000

    security/pecl-gnupg: Update to 1.5.4
    
    Changes:        https://pecl.php.net/package-changelog.php?package=gnupg
                    https://github.com/php-gnupg/php-gnupg/blob/master/NEWS.md
---
 security/pecl-gnupg/Makefile            |  3 +--
 security/pecl-gnupg/distinfo            |  6 ++---
 security/pecl-gnupg/files/patch-gnupg.c | 41 ---------------------------------
 security/pecl-gnupg/files/patch-php85   | 31 -------------------------
 4 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index dd2eb5172e17..acff4677d2fe 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gnupg
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.4
 CATEGORIES=	security
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/security/pecl-gnupg/distinfo b/security/pecl-gnupg/distinfo
index 52ded8388151..96fec406399e 100644
--- a/security/pecl-gnupg/distinfo
+++ b/security/pecl-gnupg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749813026
-SHA256 (PECL/gnupg-1.5.3.tgz) = c1555e0c86a7f6d95141530761c1ecf3fe8dbf76e14727e6f885cd7e034bdfd2
-SIZE (PECL/gnupg-1.5.3.tgz) = 47696
+TIMESTAMP = 1757120606
+SHA256 (PECL/gnupg-1.5.4.tgz) = 4d4a0980759bf259e4129ef02cb592bbeb103b4005e7b4bb6945d79488951a50
+SIZE (PECL/gnupg-1.5.4.tgz) = 47874
diff --git a/security/pecl-gnupg/files/patch-gnupg.c b/security/pecl-gnupg/files/patch-gnupg.c
deleted file mode 100644
index fda8f01312fd..000000000000
--- a/security/pecl-gnupg/files/patch-gnupg.c
+++ /dev/null
@@ -1,41 +0,0 @@
-The trustlist feature has been deprecated in Gpgme since 2003 and was removed
-in version 2.0.0.
-
---- gnupg.c.orig	2025-06-02 18:54:02 UTC
-+++ gnupg.c
-@@ -341,7 +341,9 @@ phpc_function_entry gnupg_methods[] = {
- 	PHP_GNUPG_FALIAS(addencryptkey,     arginfo_gnupg_key_method)
- 	PHP_GNUPG_FALIAS(adddecryptkey,     arginfo_gnupg_key_passphrase_method)
- 	PHP_GNUPG_FALIAS(deletekey,         arginfo_gnupg_deletekey_method)
-+#if GPGME_VERSION_NUMBER < 0x020000  /* GPGME < 2.0.0 */
- 	PHP_GNUPG_FALIAS(gettrustlist,      arginfo_gnupg_pattern_method)
-+#endif
- 	PHP_GNUPG_FALIAS(listsignatures,    arginfo_gnupg_keyid_method)
- 	PHP_GNUPG_FALIAS(seterrormode,      arginfo_gnupg_errmode_method)
- 	PHPC_FE_END
-@@ -483,7 +485,9 @@ static zend_function_entry gnupg_functions[] = {
- 	PHP_FE(gnupg_addencryptkey,		arginfo_gnupg_key_function)
- 	PHP_FE(gnupg_adddecryptkey,		arginfo_gnupg_key_passphrase_function)
- 	PHP_FE(gnupg_deletekey,			arginfo_gnupg_deletekey_function)
-+#if GPGME_VERSION_NUMBER < 0x020000  /* GPGME < 2.0.0 */
- 	PHP_FE(gnupg_gettrustlist,		arginfo_gnupg_pattern_function)
-+#endif
- 	PHP_FE(gnupg_listsignatures,	arginfo_gnupg_keyid_function)
- 	PHP_FE(gnupg_seterrormode,		arginfo_gnupg_errmode_function)
- 	PHPC_FE_END
-@@ -1936,6 +1940,7 @@ PHP_FUNCTION(gnupg_deletekey)
- }
- /* }}} */
- 
-+#if GPGME_VERSION_NUMBER < 0x020000  /* GPGME < 2.0.0 */
- /* {{{ proto array gnupg_gettrustlist(string pattern)
- * searching for trust items which match PATTERN
- */
-@@ -1980,6 +1985,7 @@ PHP_FUNCTION(gnupg_gettrustlist)
- 	}
- }
- /* }}} */
-+#endif
- 
- /* {{{ proto array gnupg_listsignatures(string keyid) */
- PHP_FUNCTION(gnupg_listsignatures)
diff --git a/security/pecl-gnupg/files/patch-php85 b/security/pecl-gnupg/files/patch-php85
deleted file mode 100644
index de4a30311382..000000000000
--- a/security/pecl-gnupg/files/patch-php85
+++ /dev/null
@@ -1,31 +0,0 @@
---- gnupg_keylistiterator.c.orig	2025-06-02 18:54:02 UTC
-+++ gnupg_keylistiterator.c
-@@ -201,7 +201,7 @@ PHP_METHOD(gnupg_keylistiterator, rewind)
- 
- 	if ((PHPC_THIS->err = gpgme_op_keylist_start(
- 			 PHPC_THIS->ctx, PHPC_THIS->pattern ? PHPC_THIS->pattern : "", 0)) != GPG_ERR_NO_ERROR){
--		zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC);
-+		zend_throw_exception(zend_ce_exception, (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC);
- 	}
- 	if ((PHPC_THIS->err = gpgme_op_keylist_next(PHPC_THIS->ctx, &PHPC_THIS->gpgkey)) != GPG_ERR_NO_ERROR){
- 		RETURN_FALSE;
---- gnupg.c.orig	2025-06-02 18:54:02 UTC
-+++ gnupg.c
-@@ -64,7 +64,7 @@ PHPC_OBJ_DEFINE_HANDLER_VAR(gnupg);
- 				break; \
- 			case 2: \
- 				zend_throw_exception(\
--					zend_exception_get_default(TSRMLS_C), \
-+					zend_ce_exception, \
- 					(char*) error, \
- 					0 TSRMLS_CC \
- 				); \
-@@ -169,7 +169,7 @@ static void php_gnupg_this_make(PHPC_THIS_DECLARE(gnup
- 			if (gpgme_ctx_set_engine_info(
- 					ctx, GPGME_PROTOCOL_OpenPGP, file_name, home_dir) != GPG_ERR_NO_ERROR) {
- 				zend_throw_exception(
--					zend_exception_get_default(TSRMLS_C),
-+					zend_ce_exception,
- 					(char*) "Setting engine info failed",
- 					0 TSRMLS_CC
- 				);