Attachment 242882 Details for Bug 272083 – security/gnupg: Update to 2.4.2 (apply with git am)

[patch] security/gnupg: Update to 2.4.2 (apply with git am)

0001-security-gnupg-Update-to-2.4.2.patch (text/plain), 3.48 KB, created by Jason E. Hale on 2023-06-19 23:09:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2023-06-19 23:09:55 UTC

Size: 3.48 KB

patch

obsolete

>From 748ff33fc952d62a9070ff766fb20748c6e7a8c9 Mon Sep 17 00:00:00 2001
>From: "Jason E. Hale" <jhale@FreeBSD.org>
>Date: Mon, 19 Jun 2023 18:37:13 -0400
>Subject: [PATCH] security/gnupg: Update to 2.4.2
>
>2.4.2: https://dev.gnupg.org/T6506
>2.4.1: https://dev.gnupg.org/T6454
>2.4.0: https://dev.gnupg.org/T6303
>
>PR:		272083
>---
> security/gnupg/Makefile                     |  2 +-
> security/gnupg/distinfo                     |  6 +++---
> security/gnupg/files/patch-dirmngr_server.c | 13 -------------
> security/gnupg/pkg-plist                    | 11 -----------
> 4 files changed, 4 insertions(+), 28 deletions(-)
> delete mode 100644 security/gnupg/files/patch-dirmngr_server.c
>
>diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
>index 018ca8a1bfa3..ddf55384ad8a 100644
>--- a/security/gnupg/Makefile
>+++ b/security/gnupg/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	gnupg
>-DISTVERSION=	2.3.8
>+DISTVERSION=	2.4.2
> CATEGORIES=	security
> MASTER_SITES=	GNUPG
> 
>diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
>index 72aa673c8552..d6615aad2fca 100644
>--- a/security/gnupg/distinfo
>+++ b/security/gnupg/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1666020426
>-SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
>-SIZE (gnupg-2.3.8.tar.bz2) = 7644926
>+TIMESTAMP = 1687200963
>+SHA256 (gnupg-2.4.2.tar.bz2) = 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49
>+SIZE (gnupg-2.4.2.tar.bz2) = 7346587
>diff --git a/security/gnupg/files/patch-dirmngr_server.c b/security/gnupg/files/patch-dirmngr_server.c
>deleted file mode 100644
>index 3a20a36994a1..000000000000
>--- a/security/gnupg/files/patch-dirmngr_server.c
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- dirmngr/server.c.orig	2022-10-07 13:23:50 UTC
>-+++ dirmngr/server.c
>-@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int se
>-                ctrl->refcount);
>-   else
>-     {
>-+#if USE_LDAP
>-       ks_ldap_free_state (ctrl->ks_get_state);
>-       ctrl->ks_get_state = NULL;
>-+#endif /*USE_LDAP*/
>-       release_ctrl_ocsp_certs (ctrl);
>-       xfree (ctrl->server_local);
>-       dirmngr_deinit_default_ctrl (ctrl);
>diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
>index 33becc416461..49090edb2b2e 100644
>--- a/security/gnupg/pkg-plist
>+++ b/security/gnupg/pkg-plist
>@@ -55,24 +55,13 @@ sbin/applygnupgdefaults
> %%PORTDOCS%%%%DOCSDIR%%/OpenPGP
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
>-%%PORTDOCS%%%%DOCSDIR%%/examples/Automatic.prf
> %%PORTDOCS%%%%DOCSDIR%%/examples/README
>-%%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf
> %%PORTDOCS%%%%DOCSDIR%%/examples/common.conf
>-%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf
> %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
> %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames
> %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
> %%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt
> %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-browser.socket
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service
>-%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket
> %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
> %%PORTDOCS%%%%DOCSDIR%%/help.be.txt
> %%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 272083: 242882 | 243332