From b4afca73d067eb5bab9e5136d848d9be50b05d7d5c90eb65d69a25c4e7934db7 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 17 Feb 2025 10:01:03 +0300
Subject: [PATCH] Update GnuPG

---
 build/distfiles/.gitignore                    |  2 +-
 build/distfiles/gnupg-2.5.3.tar.bz2.meta4     | 29 -------------------
 build/distfiles/gnupg-2.5.4.tar.bz2.meta4     | 25 ++++++++++++++++
 ...nviron.patch => gnupg-2.5.4-environ.patch} |  0
 .../{gnupg-2.5.3.do => gnupg-2.5.4.do}        |  2 +-
 build/skel/security/gpgme-1.23.2.do           |  2 +-
 6 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 build/distfiles/gnupg-2.5.3.tar.bz2.meta4
 create mode 100644 build/distfiles/gnupg-2.5.4.tar.bz2.meta4
 rename build/skel/security/{gnupg-2.5.3-environ.patch => gnupg-2.5.4-environ.patch} (100%)
 rename build/skel/security/{gnupg-2.5.3.do => gnupg-2.5.4.do} (93%)

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index b767929..a06f3ef 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.3.tar.bz2
+/gnupg-2.5.4.tar.bz2
 /gnutls-3.8.6.tar.xz
 /go1.17.13.tar.gz
 /go1.20.14.tar.gz
diff --git a/build/distfiles/gnupg-2.5.3.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.3.tar.bz2.meta4
deleted file mode 100644
index 9e65cb6..0000000
--- a/build/distfiles/gnupg-2.5.3.tar.bz2.meta4
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="gnupg-2.5.3.tar.bz2">
-    <hash type="blake3-256">0dea615c6f9501835ddfc95f456c1574de1bac9f03a02d753d00298f4e61e70f</hash>
-    <hash type="blake2b-512">a681419f975886e1ef46027683ed5bdeaf1c0f8361199797c23c6aba113168eec0667fe4896a6f3e958451e33064a940d68c0843f8050acd90e14069854b57ad</hash>
-    <hash type="blake2b-256">7fb8b2f7393c897fcd4e5ca6b7b412ea9da7a11dab8ffd94dbabd2f854517ac3</hash>
-    <hash type="skein-512">e82359586d3afe0e66fa9e86660d39d50f97ba5873fa0152a69ef0729d29d5f8e1a5081de07dab6af4bae4647b911d336e7d57ff7dfb873dd8248a13f21b3873</hash>
-    <hash type="shake128">46ad2b3cb5ae097ff35e5e6b8fddd0fae14e4645f8afd36faa7fb77eb88faf7c</hash>
-    <hash type="shake256">524d444a7bf11c7d12ef08e06e4db82d6adb79acb5944cbc6292c7b6c19310fbc4eb6d449af059ff41ac492a471559f28f8d6daf94e9b50af6dff80e603ccdc1</hash>
-    <hash type="sha-512">6c9c85cbc047f8d7a1a8e59a567f95955476436c87af6ed41e9255ee8056e4bd4a657bfa6f13418f4ea4a33ed6f93f11546f51dd5a4052df0cf131cb10c7835b</hash>
-    <hash type="sha-256">23128b136aed4e5121e793d1b6c60ee50c8007a9d926c1313e524d05386b54ac</hash>
-    <hash type="streebog-512">63fd1c426dc4f784b7ec9994604b308f227021533a1a00415f13c5da5a9c3c119519b58f9f14d3aec67b666d90463edf9e7323380170e197f275f0956a18ac96</hash>
-    <hash type="streebog-256">e6d3ec8178f107fe986de01a38a403b2af6c9265ad412b2d9dda7343d237a031</hash>
-    <hash type="xxh3-128">89be7ea913bcfaef6d32e7a04e807614</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP ARMORED FILE-----
-
-iHUEABYKAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZ3+P2gAKCRBSiJe4JkA6
-2o1vAP0UlNwf3FdBn4/5GibP6XVGOJOxo5ZPWdPLd7+2ys/98AEAnQIy2GS0YJR3
-exAUCmuoOS0zv36faaoDfBAsY7FH1guIdQQAFggAHRYhBKyOEVv3Pi2NR/qZCOmO
-my0Zxsi9BQJngG3yAAoJEOmOmy0Zxsi9Fl4A/RPv5SD5xAQWaV2/dTaW6q50K74N
-iZnxv8ae3rHk2UaJAP9bPcK//t+q44H7WioQiravRCf0ZGHvcxbcgoj7UmfhBw==
-=2YIf
------END PGP ARMORED FILE-----
-]]></signature>
-    <size>8181570</size>
-    <url>https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.3.tar.bz2</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/gnupg-2.5.4.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.4.tar.bz2.meta4
new file mode 100644
index 0000000..378fb36
--- /dev/null
+++ b/build/distfiles/gnupg-2.5.4.tar.bz2.meta4
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="gnupg-2.5.4.tar.bz2">
+    <hash type="blake3-256">1b10b7df0307e601c3097ee79caac5ab53d1e49de5b338dd6d5611e797b4ccc5</hash>
+    <hash type="blake2b-512">25c109819d30513c41945e5dcdcaa8f57d5c9bb4a0eea89cc32b3c75fdbf7d94452e46ddf434d1f4743a579b96cced56d8f4b10ab5bbe4df011b2d1012ca56f7</hash>
+    <hash type="blake2b-256">a04fd00af696739396726102b3f3dfedfe68a754d75f0fee68ca9aa1c90009c9</hash>
+    <hash type="skein-512">d3b55295fc1282937a633f37847d3d83c826814bdb49387b209df0614f700652728861880e8946ce0edf45dcb74ba08c2a47e57a4929f235c950835772595776</hash>
+    <hash type="sha-512">fa215d31e1ee0e841c7a489c01edfeed675af1aa204e9e7de44cee5146f3f4c4ff1dd9a1fcab326fa70f22498cf077fa491bab12311becafa3ea70d49c2179e1</hash>
+    <hash type="sha-256">f8cb2ac6c9f17f81e3541c62158764910fad5c3a0765e00b398c41a32bc4e0ea</hash>
+    <hash type="streebog-512">62ab82ac04d396de68988717e95bb55739e70c74d9e3bf712175ca02ab545237b80b32e39f68019890286ad8e36ec105976e7bf9c75237eef2ba4705a8398d0b</hash>
+    <hash type="streebog-256">cc569407b95622fd0e2345270668329ed29526f35cbad79c1010152883d0a1a6</hash>
+    <hash type="xxh3-128">d8f43c531dcaa726e8393dce45a0598c</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP ARMORED FILE-----
+
+iHUEABYKAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCZ6x9sgAKCRBSiJe4JkA6
+2lK/AQCAq0XS+OX3XkkCYCz8zYCitZUOe/lbck/n7Hh4ScoDOQEA4l2rwqHYMH8Q
+Ee90Xv8qzbkEJSBSvipkwOtLc9KWrQE=
+=tGFP
+-----END PGP ARMORED FILE-----
+]]></signature>
+    <size>8174777</size>
+    <url>https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.4.tar.bz2</url>
+  </file>
+</metalink>
diff --git a/build/skel/security/gnupg-2.5.3-environ.patch b/build/skel/security/gnupg-2.5.4-environ.patch
similarity index 100%
rename from build/skel/security/gnupg-2.5.3-environ.patch
rename to build/skel/security/gnupg-2.5.4-environ.patch
diff --git a/build/skel/security/gnupg-2.5.3.do b/build/skel/security/gnupg-2.5.4.do
similarity index 93%
rename from build/skel/security/gnupg-2.5.3.do
rename to build/skel/security/gnupg-2.5.4.do
index 1f8e91d..75c419a 100644
--- a/build/skel/security/gnupg-2.5.3.do
+++ b/build/skel/security/gnupg-2.5.4.do
@@ -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.3-environ.patch >&2
+patch -p1 <"$BASS_ROOT"/build/skel/security/gnupg-2.5.4-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 02f9f8c..35fe9c5 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.3
+rdeps=security/gnupg-2.5.4
 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
-- 
2.48.1