diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /security/pecl-gnupg/files/patch-php85 | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'security/pecl-gnupg/files/patch-php85')
| -rw-r--r-- | security/pecl-gnupg/files/patch-php85 | 31 |
1 files changed, 0 insertions, 31 deletions
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 - ); |