From 745c5e72d9def46213b9f9e350664d2b4c469867fdce6b72e3798a7eed097483 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 6 Dec 2024 17:06:31 +0300
Subject: [PATCH] Update GnuPG

---
 build/distfiles/.gitignore                    |  4 +--
 build/distfiles/gnupg-2.5.1.tar.bz2.meta4     | 27 -----------------
 build/distfiles/gnupg-2.5.2.tar.bz2.meta4     | 27 +++++++++++++++++
 .../distfiles/libgpg-error-1.50.tar.bz2.meta4 | 27 -----------------
 .../distfiles/libgpg-error-1.51.tar.bz2.meta4 | 29 +++++++++++++++++++
 ...nviron.patch => gnupg-2.5.2-environ.patch} |  0
 .../{gnupg-2.5.1.do => gnupg-2.5.2.do}        |  4 +--
 build/skel/security/gpgme-1.23.2.do           |  2 +-
 build/skel/security/libgcrypt-1.11.0.do       |  2 +-
 ....patch => libgpg-error-1.51-environ.patch} |  0
 ...gpg-error-1.50.do => libgpg-error-1.51.do} |  2 +-
 build/skel/security/libksba-1.6.7.do          |  2 +-
 build/skel/security/pinentry-1.3.0.do         |  2 +-
 13 files changed, 65 insertions(+), 63 deletions(-)
 delete mode 100644 build/distfiles/gnupg-2.5.1.tar.bz2.meta4
 create mode 100644 build/distfiles/gnupg-2.5.2.tar.bz2.meta4
 delete mode 100644 build/distfiles/libgpg-error-1.50.tar.bz2.meta4
 create mode 100644 build/distfiles/libgpg-error-1.51.tar.bz2.meta4
 rename build/skel/security/{gnupg-2.5.1-environ.patch => gnupg-2.5.2-environ.patch} (100%)
 rename build/skel/security/{gnupg-2.5.1.do => gnupg-2.5.2.do} (91%)
 rename build/skel/security/{libgpg-error-1.50-environ.patch => libgpg-error-1.51-environ.patch} (100%)
 rename build/skel/security/{libgpg-error-1.50.do => libgpg-error-1.51.do} (92%)

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 88b6a49..7e1b4d9 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -66,7 +66,7 @@
 /gmime-3.2.7.tar.xz
 /gmp-4.3.2.tar.bz2
 /gmp-6.3.0.tar.zst
-/gnupg-2.5.1.tar.bz2
+/gnupg-2.5.2.tar.bz2
 /gnutls-3.8.6.tar.xz
 /go1.17.13.tar.gz
 /go1.20.14.tar.gz
@@ -112,7 +112,7 @@
 /libedit-20230828-3.1.tar.gz
 /libevent-2.1.12.tar.gz
 /libgcrypt-1.11.0.tar.bz2
-/libgpg-error-1.50.tar.bz2
+/libgpg-error-1.51.tar.bz2
 /libiconv-1.17.tar.gz
 /libidn2-2.3.7.tar.gz
 /libinotify-kqueue-20211018.tar.gz
diff --git a/build/distfiles/gnupg-2.5.1.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.1.tar.bz2.meta4
deleted file mode 100644
index 688e666..0000000
--- a/build/distfiles/gnupg-2.5.1.tar.bz2.meta4
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="gnupg-2.5.1.tar.bz2">
-    <hash type="blake3-256">315d4451d120350aedc27e8862ec58c24d571954c62e018cc9414aac35cc8f86</hash>
-    <hash type="blake2b-512">46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66</hash>
-    <hash type="blake2b-256">32914d54fcd01c01a987681f0f4d78ec5a70431986045b6f1492eb4ebb076bf3</hash>
-    <hash type="skein-512">be07cbe31a247e32837bb553a5b869a810d794aa1d45bda51af46f19b47bac10a212c26dd1aa3dafe0015b9451c88492f3f9db89ed3c2c44b47e39f2f324db4b</hash>
-    <hash type="shake128">e3f64d70bfc758d79ff4892fba752057cdb322fd4f1e4a0d9e42cefd6b5f5465</hash>
-    <hash type="shake256">1d0c3b0140651063e2dd913a83a5928fa699ba8a390af7443c5be483315854c409ec63c43e2cda779c62e3d6da60e26ef2f975c3529af2e063271f46be8c7b40</hash>
-    <hash type="sha-512">733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd</hash>
-    <hash type="sha-256">8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e</hash>
-    <hash type="streebog-512">e6209e901b3f11510fbb6b0bbe44be20b15c6aa4ca5b986a331d7a8d9b514276a56912a25655b06a7c3f9c8e28d6e63d1484838975fae21b2b2ac97ada19c385</hash>
-    <hash type="streebog-256">f486214a7a3d7f653b4a5f6f4c97756257d5fb0b2b70197a0418afa7867d15ff</hash>
-    <hash type="xxh3-128">dfadac22bf4d79ac6cd1fe1a34cf35c6</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP ARMORED FILE-----
-
-iHUEABYIAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZuK5vQAKCRBSiJe4JkA6
-2pARAP0aV7dTR8MMYEyBL8RyntkaXJ7EFmOfW/8Uyc9KNUJBcQEA0wSNhnedIXN8
-+KMB5wHhBgvpecpQWMHuC1yxed4JhgY=
-=N42U
------END PGP ARMORED FILE-----
-]]></signature>
-    <size>8126739</size>
-    <url>https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.1.tar.bz2</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/gnupg-2.5.2.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.2.tar.bz2.meta4
new file mode 100644
index 0000000..3337725
--- /dev/null
+++ b/build/distfiles/gnupg-2.5.2.tar.bz2.meta4
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="gnupg-2.5.2.tar.bz2">
+    <hash type="blake3-256">3b74ecc60dead95f9e30fb73786adbabfa14a303a5a8028e10a27e8b103ea094</hash>
+    <hash type="blake2b-512">02ecc890b7ca2b1444dafdaa84b615c20d9743b9143d27f45254e175815b083f476071a92746c43e812d502cf803e5be838d249ca2df00c06dcd3222b04ccf0b</hash>
+    <hash type="blake2b-256">759354e4a6ba73ac050c44aaa9511bde0b266b8d35e39923e273b7af64cfdfc1</hash>
+    <hash type="skein-512">72ad7d3d4ad163aa7bbcdd1819b0dfb3013ac21b82584b718f924dbd761379a3d4660ce629b803edc507a3960aa109e7b226d919a879f9239d2b3ef9602b0722</hash>
+    <hash type="shake128">81a555bf43a9591786fa67f87c2ada77441dd68ce061bdcc2a656b6d5cb257f4</hash>
+    <hash type="shake256">9638f12d62807b44dfb45c31e6152829bcf2e6173ef589a3f28182173d717825c6ba9b4ea253a58df826b92c5733241eb86fae0af2f817ae885030170f4bafef</hash>
+    <hash type="sha-512">8f2561e2e0709a60c4cc60883a2c6b3996741353995dfa1948b67b010fb63990b9ef9198b515a4d259d24aed7b89cab4dc731bdd5bb3f895c33362c97c87fa51</hash>
+    <hash type="sha-256">7f404ccc6a58493fedc15faef59f3ae914831cff866a23f0bf9d66cfdd0fea29</hash>
+    <hash type="streebog-512">fc2384022e0a06e20da14b42dcd1cede0f02ceddcaf95ee06356594eac19d34104fdc99767aafede9c6bbef78bbfcc243213fc7a97d51118bd54e4f8e5740c53</hash>
+    <hash type="streebog-256">38510c3986a35344aae0f10bc58b0afe6d277dbf399d74b42749a184e08c5f73</hash>
+    <hash type="xxh3-128">31457f3185f850adfed10da535707c0b</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP ARMORED FILE-----
+
+iHUEABYKAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZ1F/NAAKCRBSiJe4JkA6
+2jkMAP9E+rabQnxPsR4X/F7PB+FfeiQdUwC2xIrRmhsGVL36egD9Hd90nJ8bdHbs
+txUVPYNLx9fXiKoFVbhVhZuCTt1XXAE=
+=yrn5
+-----END PGP ARMORED FILE-----
+]]></signature>
+    <size>8150487</size>
+    <url>https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.2.tar.bz2</url>
+  </file>
+</metalink>
diff --git a/build/distfiles/libgpg-error-1.50.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.50.tar.bz2.meta4
deleted file mode 100644
index bbfa997..0000000
--- a/build/distfiles/libgpg-error-1.50.tar.bz2.meta4
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="libgpg-error-1.50.tar.bz2">
-    <hash type="blake3-256">9e30e6a7e2529c24a4c06c3343b2ae453b3c35969e91fd124879cbf4a44967ac</hash>
-    <hash type="blake2b-512">621d9a604585daa1fbd08aaa94f3b177f6265046ccf452317e126e73079c567c555cbb8ab8b63e09b76bdf4f11a1aad7effd118651fe9e9cbcf01229f20ab297</hash>
-    <hash type="blake2b-256">60a92ed8183f634a793a05a78361d2c17a6d51cc3b55041026396a5c53162682</hash>
-    <hash type="skein-512">9ca2a86565fceef973043b1407012fdf82c39a56310d01e2258e47cdb979a3e0891bcd974470e01ceaee4a68a2b35f9acf706bafef94c71b7de9472b978672ee</hash>
-    <hash type="shake128">6fc0617ab66afaaf4eee0f57d4b666c24f57bd62bc237300f62cab24a5e46a98</hash>
-    <hash type="shake256">d9184815701418b847869dfb8a19b32f7aed762c1762a878b433001ae2c21df2e1ea0dcd7162eb12fc5d2e56b9ea5a844a2c7b0e1c393bc65ca9949658831b75</hash>
-    <hash type="sha-512">96e466d892a50843af6d7c08c0da602518bc6a28836bfc35f0a28cde74d368f57c5c70c65f0f41edb4fc1ca5ebd00f2ece531d8b3eb1bd6db566adbb29bc61ff</hash>
-    <hash type="sha-256">69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a</hash>
-    <hash type="streebog-512">2fd98cc50e89e48432f7af2e8fdce4d306b9db2a9034bdec410b6524cd5a6c845535f3d68f7a49fd1e31aedfa90b933876c37bada2b5057b0ed82827db78d778</hash>
-    <hash type="streebog-256">ae8a0041cea833b8f8947a4971636fe41015d57ecdb9f265b7735379050375d6</hash>
-    <hash type="xxh3-128">492022f4b690196864bd5b39bd549018</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP ARMORED FILE-----
-
-iHUEABYIAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZnKcKQAKCRBSiJe4JkA6
-2mR5AP44pVJiZSqhUlziLCmfhJsaQdZU0nDXIpMe+oxHD/eTQQD/dp1zVyhyaU5f
-XkMp3LsnCgB7Say3vJ2TeeSYoL65bgU=
-=wE6/
------END PGP ARMORED FILE-----
-]]></signature>
-    <size>1082003</size>
-    <url>https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.50.tar.bz2</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/libgpg-error-1.51.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.51.tar.bz2.meta4
new file mode 100644
index 0000000..37a1d37
--- /dev/null
+++ b/build/distfiles/libgpg-error-1.51.tar.bz2.meta4
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="libgpg-error-1.51.tar.bz2">
+    <hash type="blake3-256">361a98d980c1ffac27f671bc6ec95a0b0e7af2f954dcf96702a8482d954a4735</hash>
+    <hash type="blake2b-512">8727a993fb5e589beceafce9d06d843b28ceff80398c33a5655608bdcd3d92ee363389bc209a1dff675b9f78d56f13b78d77e55696c0736612b09275ae0da7f3</hash>
+    <hash type="blake2b-256">33ab9895c7ec79d50fe77fa384f824a26998b67d645390699d092c8b2ecd3f3d</hash>
+    <hash type="skein-512">c8d0d203750eae284c83d0a48dc0d325e015d207da190c5e704dfd82c812e1f47efe27b4d9a33487bf9ffb072857e0526d0c748ff2d17424916eb69db649e11a</hash>
+    <hash type="shake128">ef27208c54b56bfd9a0285281a68373dc85da73463d12a58b7dcd101871c7015</hash>
+    <hash type="shake256">93b8a688f845f2986bc0ad6095010a1c936285f8329533a36432aac5435a43b1749d81ec36ca884e92aaf16b8c145b9c30ba7ab4967bd368e6eb4f7c67ab6f3e</hash>
+    <hash type="sha-512">4489f615c6a0389577a7d1fd7d3917517bb2fe032abd9a6d87dfdbd165dabcf53f8780645934020bf27517b67a064297475888d5b368176cf06bc22f1e735e2b</hash>
+    <hash type="sha-256">be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2</hash>
+    <hash type="streebog-512">2609f738437bdd76b65c2a0ba5d64ae404b0a04fdfb84282b0a45aadfcc2ee9691e10b9cf04fa598bbc8120b5267f88e8522c279f23e4ce9c554496d3f8e1b9b</hash>
+    <hash type="streebog-256">4ab612b30d1b64372cc91749ed21c5fc5eaf2c9ba1d0c5a3e429b6818637688c</hash>
+    <hash type="xxh3-128">676d56a9d084ddd1dcf3b3e511b82a4d</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP ARMORED FILE-----
+
+iHUEABYIAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZzHd9wAKCRBSiJe4JkA6
+2sdRAQDluLdXGIVd61Al1ZZ8w3/WQgg/FKIa/qybGKR54fVASAD9GDZCpbn8mjQA
+Y7tyvnACQTu2O0a+bJAlw0LYErnegwmIdQQAFggAHRYhBKyOEVv3Pi2NR/qZCOmO
+my0Zxsi9BQJnMviLAAoJEOmOmy0Zxsi9L28BAKMS5t5iAx0P2JfQSleVHLz6h/4C
+zozypmAfyVbK+BrdAQCy5nEn6H6K7NrQ5FBgOyttpCIp85/Hd+bIixlDyj7rCQ==
+=k7qB
+-----END PGP ARMORED FILE-----
+]]></signature>
+    <size>1085510</size>
+    <url>https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.51.tar.bz2</url>
+  </file>
+</metalink>
diff --git a/build/skel/security/gnupg-2.5.1-environ.patch b/build/skel/security/gnupg-2.5.2-environ.patch
similarity index 100%
rename from build/skel/security/gnupg-2.5.1-environ.patch
rename to build/skel/security/gnupg-2.5.2-environ.patch
diff --git a/build/skel/security/gnupg-2.5.1.do b/build/skel/security/gnupg-2.5.2.do
similarity index 91%
rename from build/skel/security/gnupg-2.5.1.do
rename to build/skel/security/gnupg-2.5.2.do
index e7710a5..678a39e 100644
--- a/build/skel/security/gnupg-2.5.1.do
+++ b/build/skel/security/gnupg-2.5.2.do
@@ -8,7 +8,7 @@ devel/npth-1.7
 security/gnutls-3.8.6
 security/libassuan-3.0.1
 security/libgcrypt-1.11.0
-security/libgpg-error-1.50
+security/libgpg-error-1.51
 security/libksba-1.6.7
 security/pinentry-1.3.0
 "
@@ -21,7 +21,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.bz2
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-patch -p1 <"$BASS_ROOT"/build/skel/security/gnupg-2.5.1-environ.patch >&2
+patch -p1 <"$BASS_ROOT"/build/skel/security/gnupg-2.5.2-environ.patch >&2
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2
 make -j$MAKE_JOBS >&2
 make install >&2
diff --git a/build/skel/security/gpgme-1.23.2.do b/build/skel/security/gpgme-1.23.2.do
index b362728..b6898ae 100644
--- a/build/skel/security/gpgme-1.23.2.do
+++ b/build/skel/security/gpgme-1.23.2.do
@@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps=security/gnupg-2.5.1
+rdeps=security/gnupg-2.5.2
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/security/libgcrypt-1.11.0.do b/build/skel/security/libgcrypt-1.11.0.do
index edec367..38e3f34 100644
--- a/build/skel/security/libgcrypt-1.11.0.do
+++ b/build/skel/security/libgcrypt-1.11.0.do
@@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps=security/libgpg-error-1.50
+rdeps=security/libgpg-error-1.51
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/security/libgpg-error-1.50-environ.patch b/build/skel/security/libgpg-error-1.51-environ.patch
similarity index 100%
rename from build/skel/security/libgpg-error-1.50-environ.patch
rename to build/skel/security/libgpg-error-1.51-environ.patch
diff --git a/build/skel/security/libgpg-error-1.50.do b/build/skel/security/libgpg-error-1.51.do
similarity index 92%
rename from build/skel/security/libgpg-error-1.50.do
rename to build/skel/security/libgpg-error-1.51.do
index 236d233..9f4b094 100644
--- a/build/skel/security/libgpg-error-1.50.do
+++ b/build/skel/security/libgpg-error-1.51.do
@@ -12,7 +12,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.bz2
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-patch -p1 <"$BASS_ROOT"/build/skel/security/libgpg-error-1.50-environ.patch >&2
+patch -p1 <"$BASS_ROOT"/build/skel/security/libgpg-error-1.51-environ.patch >&2
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
     --enable-static --enable-install-gpg-error-config >&2
 make -j$MAKE_JOBS >&2
diff --git a/build/skel/security/libksba-1.6.7.do b/build/skel/security/libksba-1.6.7.do
index 09e4afb..7b2b706 100644
--- a/build/skel/security/libksba-1.6.7.do
+++ b/build/skel/security/libksba-1.6.7.do
@@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps=security/libgpg-error-1.50
+rdeps=security/libgpg-error-1.51
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/security/pinentry-1.3.0.do b/build/skel/security/pinentry-1.3.0.do
index ed128ac..269730b 100644
--- a/build/skel/security/pinentry-1.3.0.do
+++ b/build/skel/security/pinentry-1.3.0.do
@@ -5,7 +5,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
 rdeps="
 devel/ncurses-6.4
-security/libgpg-error-1.50
+security/libgpg-error-1.51
 security/libassuan-3.0.1
 "
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
-- 
2.48.1