2 files changed, 72 insertions, 0 deletions
diff --git a/security/pecl-gnupg/files/patch-gnupg.c b/security/pecl-gnupg/files/patch-gnupg.c
new file mode 100644
index 000000000000..fda8f01312fd
--- /dev/null
+++ b/security/pecl-gnupg/files/patch-gnupg.c
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..de4a30311382
--- /dev/null
+++ b/security/pecl-gnupg/files/patch-php85
@@ -0,0 +1,31 @@
+--- 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
+ 				);