Skip to content

Commit

Permalink
gnupg: Update to 2.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
der-eismann committed Jan 18, 2024
1 parent 16e7f48 commit 2ff74ea
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 16 deletions.
Binary file modified g/gnupg/manifest.x86_64.bin
Binary file not shown.
15 changes: 2 additions & 13 deletions g/gnupg/manifest.x86_64.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -64,24 +64,13 @@
"/usr/share/doc/gnupg/OpenPGP",
"/usr/share/doc/gnupg/README",
"/usr/share/doc/gnupg/TRANSLATE",
"/usr/share/doc/gnupg/examples/Automatic.prf",
"/usr/share/doc/gnupg/examples/README",
"/usr/share/doc/gnupg/examples/VS-NfD.prf",
"/usr/share/doc/gnupg/examples/common.conf",
"/usr/share/doc/gnupg/examples/debug.prf",
"/usr/share/doc/gnupg/examples/gpgconf.conf",
"/usr/share/doc/gnupg/examples/gpgconf.rnames",
"/usr/share/doc/gnupg/examples/pwpattern.list",
"/usr/share/doc/gnupg/examples/qualified.txt",
"/usr/share/doc/gnupg/examples/scd-event",
"/usr/share/doc/gnupg/examples/systemd-user/README",
"/usr/share/doc/gnupg/examples/systemd-user/dirmngr.service",
"/usr/share/doc/gnupg/examples/systemd-user/dirmngr.socket",
"/usr/share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket",
"/usr/share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket",
"/usr/share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket",
"/usr/share/doc/gnupg/examples/systemd-user/gpg-agent.service",
"/usr/share/doc/gnupg/examples/systemd-user/gpg-agent.socket",
"/usr/share/doc/gnupg/examples/trustlist.txt",
"/usr/share/gnupg/distsigkey.gpg",
"/usr/share/gnupg/help.be.txt",
Expand Down Expand Up @@ -191,6 +180,6 @@
}
},
"source-name": "gnupg",
"source-release": "1",
"source-version": "2.4.0"
"source-release": "2",
"source-version": "2.4.3"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 5 Jul 2023 09:29:54 +0900
Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when
USE_LDAP.

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

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
dirmngr/server.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 51a149cb2..ee61f63d6 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line)

if (opt_help)
{
+#if USE_LDAP
ks_ldap_help_variables (ctrl);
+#endif
err = 0;
goto leave;
}
--
2.11.0
8 changes: 5 additions & 3 deletions g/gnupg/stone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# SPDX-License-Identifier: MPL-2.0
#
name : gnupg
version : 2.4.0
release : 1
version : '2.4.3'
release : 2
homepage : https://gnupg.org/software/index.html
upstreams :
- https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2 : 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483
- https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.3.tar.bz2 : a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d
summary : Complete and free implementation of the OpenPGP standard to encrypt communications and files
description : |
%(name) is a complete and free implementation of the OpenPGP standard as defined by RFC4880, also known as PGP. GnuPG allows you to encrypt and sign your data and communications; it features a versatile key management system, along with access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications. A wealth of frontend applications and libraries are available. GnuPG also provides support for S/MIME and SSH.
Expand All @@ -27,6 +27,8 @@ builddeps :
rundeps :
- pinentry
setup : |
# can be removed when building with LDAP
%patch %(pkgdir)/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch
%configure
build : |
%make
Expand Down

0 comments on commit 2ff74ea

Please sign in to comment.