aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2023-06-19 22:37:13 +0000
committerJason E. Hale <jhale@FreeBSD.org>2023-07-10 18:46:34 +0000
commit29b3afa37e3c6b607e92e45d27b504982775033c (patch)
tree117a15d4204ab574815f0a994069e6462a3d2f4d
parent143072ff128f78f0c63639d6bc28f5d0081a5618 (diff)
security/gnupg: Update to 2.4.3
2.4.3: https://dev.gnupg.org/T6509 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 Approved by: maintainer timeout (3 weeks)
-rw-r--r--security/gnupg/Makefile5
-rw-r--r--security/gnupg/distinfo8
-rw-r--r--security/gnupg/files/patch-dirmngr_server.c13
-rw-r--r--security/gnupg/pkg-plist11
4 files changed, 9 insertions, 28 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 018ca8a1bfa3..da89e93fc2e4 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,8 +1,11 @@
PORTNAME= gnupg
-DISTVERSION= 2.3.8
+DISTVERSION= 2.4.3
CATEGORIES= security
MASTER_SITES= GNUPG
+PATCH_SITES= https://github.com/gpg/${PORTNAME}/commit/
+PATCHFILES+= 9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch:-p1 #Fix linking without LDAP
+
MAINTAINER= adridg@FreeBSD.org
COMMENT= Complete and free PGP implementation
WWW= https://www.gnupg.org/
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 72aa673c8552..59804d414b94 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1666020426
-SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
-SIZE (gnupg-2.3.8.tar.bz2) = 7644926
+TIMESTAMP = 1689011640
+SHA256 (gnupg-2.4.3.tar.bz2) = a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d
+SIZE (gnupg-2.4.3.tar.bz2) = 7351327
+SHA256 (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 186154a2bd7750c212571c8be51a6f02d56e323d001673f2abe7342181d49d13
+SIZE (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 806
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