From 2ff74ea88c42fea8312636c95f66ab02b4f21060 Mon Sep 17 00:00:00 2001
From: Philipp Trulson <der-eismann@users.noreply.github.com>
Date: Thu, 18 Jan 2024 22:05:57 +0100
Subject: [PATCH] gnupg: Update to 2.4.3

---
 g/gnupg/manifest.x86_64.bin                   | Bin 882 -> 884 bytes
 g/gnupg/manifest.x86_64.jsonc                 |  15 +-------
 ...he-call-of-ks_ldap_help_variables-wh.patch |  35 ++++++++++++++++++
 g/gnupg/stone.yml                             |   8 ++--
 4 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 g/gnupg/pkg/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch

diff --git a/g/gnupg/manifest.x86_64.bin b/g/gnupg/manifest.x86_64.bin
index ac0fb1b2d246b68fb3961db1549474408bf42abf..4dd81fc50af01609a6e34e7282dce1b69ab78ed5 100644
GIT binary patch
delta 858
zcmV-g1Eu`(2J{AyCx0{m0000000y>8x%ERCFp&5F001)p0RaLiwJ-euXk8fqc4~t(
za8Ek?|NsC0|NsBLlSar+Nxh}q$dF|3B=<D-dBzwVie2GkKiQ(})DgMGK!n;z+@YTW
zasX)ndjRWM*`jBuD3TGh(jjk##>Yp;ND0f1s&yUT)oz`w<$v|J1Udtts^0Lq_2QOg
z(%RQX(~7<F*G+bj-*?5c5?fQ*{`_8YqkPXFJA2zbuXT~PzoC}N5tRniMO6V30(5hr
zn-0}Mai}Dqn6^bsB>>f^Y8>M2$;-1^7yF}}*XJR(XhoKSn#Mc(^KxSS@$JaDp_IQJ
zAIv=7Z_2lNK7VIDSZ$iS_&_`5wcc=ZGF$hyEZ)yQ(PB|%{XX)=IC8e525rOl?6X5X
zx97h0--htB+ZnOvn;fl+B!nEZ-9e&-w>n1I;3iuJ7*7Wn!N-2knijB_&F3_dKiv3g
zH*)Aqew^b1J&;sk_A{KOoHVG;gtFpM2|*b;JYGCLVt-T$(1HS({fCNa7ayl5i~f?%
z!KS1*91z$3KPqXoLRFPAX=x!zIZ5HP{FIuu`Fgt-l2dC~F?<2q>3<N$B?HaDhC_QY
zRX_pkP`im?G(UEHni|M7bow8JamPI;KCi_Ot{n6*<(y5?arj%*z$84Zh7Asx3PL0D
z=FR{S7=ITWlys`YW13>N_~7Iqr+Sbxed7qI!A31U*0TuVx0nhP(oFt;Q1dLad;=e6
z?US`DN^5o~fR3o~Q~^S$Mn*<KK~hL#fF?Rc=K)esVTxhOOqC?Y+W!uy=G6jGWKX%N
z7FL_Y^8RR&1Z4k+pAa5IyR`>LVx`ov(pfJ2aDN<?j2)%mVT{SEjrg;F95NGF6oU|!
zZn)1RRX?^qN3^%Wp|<!3_6)5I7+ZwNzwDJ_5=)S$<FLmuIo|Og&{(Fd(*zw-zDY;-
z*zy#l@?T{r;|{|ts5NLjInuyAQORBj^cSP>;{E-=@7$b4hh{j5xzCoUuq>S_A?H!&
z7*hzZu2(=IgtrzQcS_HT?=&VXi)(ijisOm}NoO_{NL>tvA5-!R{f4B7g3_*k>(=58
k^Y3L|l;r|(g&-xDs`IUoqHmT`^eSk2IZ{!Ny+`$-0sCU9jsO4v

delta 856
zcmV-e1E>7-2J!}wCx0>k0000000y?3HTRb5P!FE~001)p0RaLiwJ-euXiXUaHtK>k
zaBVvL|NsC0|NsAg5E8OeB-&E0Hsszr$vqf5h=}$AzR&TXpR^@$FPIU83Y(ACO9e+u
zWOD#$0D1sY@`g&f8QN-+=oBq=$y?#c$hheEFxir|uxG>?u7C5jydHPpwOrnN-ZJ_X
zXSZ$i+UH93n!WTFR)&+`w<J_Dn<LrQelfa}#^;~C#qF-x!pYm;lG|v<n*<(8!R2W<
zPvfaBs?VDOUdDAZd(-7%-g^Nu@`$%9FIQ{f?4Pt^+DmTIa%?3zj<>e<v}XM?ZppbN
zrN2F++(O>5(tp3YMtDVOb)3T)MO!Jh-m-&qTlc;$UhN}kvq`spFZpIXdD~Kpwq<<w
z+M}-Bb7T8)H~1NDomupbmexr$quTBw(!pOnCryBruT91jCmZ<LQC`$RHn$ofX7ZOE
zV+~6Ry-^K9&OFZa3~E11s#3~RfhduZ(3=Pz!UaYOMt{c2n*d%WBe&P8m4-8Rx-#i8
z>Yc38s?*VM?q7Qo=0&{sUIlV;;xQ63(mDA`Ij-~dhH*qI*V5t-)E}jaPa6zJ^Wh?k
z1(1<FYDgiJ>d&5$dmEMnP=Ayv4!P@t_T0>1%S8*7*4hvtm)}iK=74b}SbSJ42G8Wq
zoi7a(6MvtIdUb(8Q7heyl7g~hMcJv|bpqZ-^CYzEnMCm2iX|FhD*s2x`L<oIk&(Cd
z${aT7RXc!=sPR+*La0VYMnOSREQ|qwCOSpu0a93Diebo1nIy*A{|>0e)dEpsPqhga
zmY#&=_11(5=>E|^p$>?4s|Sw2N~UAgd9MEOTz{I39i`x5jLD0Q__Kc;!bw>aKuGo%
z+-H)iA6wrc+FRIwSo{NDh9(2cmP7I)d*vHqIp0&cuj7cEHGHx(mZ|LYKnIjx($RWs
zITcdLuP~H$fMFKanlzdmY2cn1X|EmnixF7y_HN)mY|f$sGmyk=XG@`2mZnOG@@P2*
z&QZhHD^UpHtxw0D67u3ZjS0)@S~v>hxWxj~8BGyV7sCO^l>AcP5FgQH+VgLTTD)QY
i{mrYfT!^j^q~u?9z7<l~%~Fb9g$`yTD2mhf&^$C<jI193

diff --git a/g/gnupg/manifest.x86_64.jsonc b/g/gnupg/manifest.x86_64.jsonc
index 61dc5397..6ac8a028 100644
--- a/g/gnupg/manifest.x86_64.jsonc
+++ b/g/gnupg/manifest.x86_64.jsonc
@@ -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",
@@ -191,6 +180,6 @@
 		}
 	},
 	"source-name": "gnupg",
-	"source-release": "1",
-	"source-version": "2.4.0"
+	"source-release": "2",
+	"source-version": "2.4.3"
 }
diff --git a/g/gnupg/pkg/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/g/gnupg/pkg/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch
new file mode 100644
index 00000000..912bb10c
--- /dev/null
+++ b/g/gnupg/pkg/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch
@@ -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
diff --git a/g/gnupg/stone.yml b/g/gnupg/stone.yml
index 096e83c4..6f01d800 100644
--- a/g/gnupg/stone.yml
+++ b/g/gnupg/stone.yml
@@ -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.
@@ -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