Skip to content

Commit

Permalink
gnupg2: update to 2.2.40
Browse files Browse the repository at this point in the history
* remove platforms line
  • Loading branch information
aeiouaeiouaeiouaeiouaeiouaeiou authored and roederja committed Oct 17, 2022
1 parent a7a90a0 commit 336a995
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
13 changes: 7 additions & 6 deletions mail/gnupg2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ PortSystem 1.0

set my_name gnupg
name ${my_name}2
version 2.2.39
version 2.2.40
revision 0

# Putting the SHA1 hash because that is published on the website
checksums rmd160 927bbaeff56cdef7aa353e64dfbbb21a976d0338 \
sha1 b0ae1a364cd22f96311bc2ef814a4c059475294c \
sha256 ab74db6685f026d7c0a10b527ecddecd608606a1691d15fda5d0a7f7d27e4c2f \
size 7290098
checksums rmd160 ed3d03254ac23d85277ce111b30a637345ceb156 \
sha1 2a8b52d08cc78e4ebeb07ec2fc8d95e290a3c4a7 \
sha256 1164b29a75e8ab93ea15033300149e1872a7ef6bdda3d7c78229a735f8204c28 \
size 7301631

# https://trac.macports.org/ticket/63552
epoch 1
Expand All @@ -27,13 +27,14 @@ long_description GnuPG is a complete and free replacement for PGP. Because
without any restrictions. GnuPG is a RFC4880 (OpenPGP) \
compliant application.
homepage https://www.gnupg.org
platforms darwin freebsd sunos
conflicts ${my_name}1
distname ${my_name}-${version}
master_sites ${my_name}:${my_name}

use_bzip2 yes

patchfiles patch-fix-use-ldap.diff

platform darwin {
if {![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
# Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
Expand Down
20 changes: 20 additions & 0 deletions mail/gnupg2/files/patch-fix-use-ldap.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 14 Oct 2022 09:58:41 +0900
Subject: [PATCH] dirmngr: Fix build with no LDAP support.

* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize.

--- dirmngr/server.c
+++ dirmngr/server.c
@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id)
ctrl->refcount);
else
{
+#if USE_LDAP
ks_ldap_free_state (ctrl->ks_get_state);
ctrl->ks_get_state = NULL;
+#endif
release_ctrl_ocsp_certs (ctrl);
xfree (ctrl->server_local);
dirmngr_deinit_default_ctrl (ctrl);

0 comments on commit 336a995

Please sign in to comment.