From 3ddc1bc0aecd8ead4a0804cdbc4544e9a837cab2950c14dda1bb145cb46b01fe Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 22 Oct 2025 20:02:23 +0300 Subject: [PATCH] Update GnuPG --- build/distfiles/.gitignore | 4 +-- build/distfiles/gnupg-2.5.12.tar.bz2.meta4 | 25 ----------------- build/distfiles/gnupg-2.5.13.tar.bz2.meta4 | 25 +++++++++++++++++ .../distfiles/libgpg-error-1.55.tar.bz2.meta4 | 27 ------------------- .../distfiles/libgpg-error-1.56.tar.bz2.meta4 | 26 ++++++++++++++++++ ...viron.patch => gnupg-2.5.13-environ.patch} | 0 .../{gnupg-2.5.12.do => gnupg-2.5.13.do} | 4 +-- build/skel/security/libassuan-3.0.2.do | 2 +- build/skel/security/libgcrypt-1.11.1.do | 2 +- ....patch => libgpg-error-1.56-environ.patch} | 0 ...gpg-error-1.55.do => libgpg-error-1.56.do} | 2 +- build/skel/security/libksba-1.6.7.do | 2 +- build/skel/security/pinentry-1.3.0.do | 2 +- 13 files changed, 60 insertions(+), 61 deletions(-) delete mode 100644 build/distfiles/gnupg-2.5.12.tar.bz2.meta4 create mode 100644 build/distfiles/gnupg-2.5.13.tar.bz2.meta4 delete mode 100644 build/distfiles/libgpg-error-1.55.tar.bz2.meta4 create mode 100644 build/distfiles/libgpg-error-1.56.tar.bz2.meta4 rename build/skel/security/{gnupg-2.5.12-environ.patch => gnupg-2.5.13-environ.patch} (100%) rename build/skel/security/{gnupg-2.5.12.do => gnupg-2.5.13.do} (90%) rename build/skel/security/{libgpg-error-1.55-environ.patch => libgpg-error-1.56-environ.patch} (100%) rename build/skel/security/{libgpg-error-1.55.do => libgpg-error-1.56.do} (90%) diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index a88f177..0ac633c 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -68,7 +68,7 @@ /gmime-3.2.7.tar.xz /gmp-4.3.2.tar.bz2 /gmp-6.3.0.tar.zst -/gnupg-2.5.12.tar.bz2 +/gnupg-2.5.13.tar.bz2 /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz @@ -119,7 +119,7 @@ /libedit-20230828-3.1.tar.gz /libevent-2.1.12.tar.gz /libgcrypt-1.11.1.tar.bz2 -/libgpg-error-1.55.tar.bz2 +/libgpg-error-1.56.tar.bz2 /libheif-v1.19.5-49-g1630460f.tar.zst /libheif.git/ /libiconv-1.17.tar.gz diff --git a/build/distfiles/gnupg-2.5.12.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.12.tar.bz2.meta4 deleted file mode 100644 index d0232cd..0000000 --- a/build/distfiles/gnupg-2.5.12.tar.bz2.meta4 +++ /dev/null @@ -1,25 +0,0 @@ - - - - a0e00c203622477737225aaf84eb93f0b073027bcad86b08529c3c49dea70386 - cab3802d08acf96772071c42949c55e78734447a29d3088b7c08636282cf38f92fcf35ce6ded5df9a18b2725a27500980d1616f5d3850df05f9543a43453d5c0 - 50245e7b2ff1b091cf71757ee466e15ac1045d11fb60bd226cfbb6f101607751 - afba9b934c9b03d0ef8bae8621fc45e42a2d0a45edc8a6b2e801208439bec589ab9f7a89b1c6402b6c8b096a4aad1bce1026fb8fc5169d70918a5cd3f909ecf5 - fa0510f24b844e2ee122543421e0ee47415cb5a1599c28abe2ec22830c378b50125e70289fd227bd6ca35bb3d6a40928955f42b44b24f657733b93c64d6d27d8 - 48d7b15474d330c571128a49eb32ae2332c086ce7945fb94d4c5491b07985e09 - a72a459d27e33221eb23b5837446b6db0e154cfa494aee5b1703c9d04bd64df72b34d844744a9252d4c916dafec5c77d013a9c8d8ea584a710fe20c18bd862d9 - 1a274058e381bae64d442fd22d2bacf7819d53288f0d81a02c8b157c19ed3fc2 - 6ac71e1f425ff9ea0d28750d3d2cd494 - - 8225353 - https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.12.tar.bz2 - - diff --git a/build/distfiles/gnupg-2.5.13.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.13.tar.bz2.meta4 new file mode 100644 index 0000000..0f16ab2 --- /dev/null +++ b/build/distfiles/gnupg-2.5.13.tar.bz2.meta4 @@ -0,0 +1,25 @@ + + + + e1fa15c0148e306deeeed249247ca8e9b2e20deb8b23386417e44f836ca7e78f + d898a86d2c13a8daa4dc4ab96376610768710bfa719d4e21d77c97d41e377305aa606df20bab1ac8d9553783e67afe2c42970374f3be19128686a781fcc13f1f + 9f4969e83e1bfa0febe0513cf70c83daffd8151c37bacc9e34246fa3a0d4b7e9 + 62d8ca4766329847befd8471b95cc02fe43044dc14406e7dd34006b7234f0246b70af7ddb24680039463a9062b1550a1abcfb6ed2544f4a2d43eb91440d7c4ec + 76f355bae2b600935996a33597577f60e332c274ce72cfff936ef0435b0990b6c811942ad9ec58c2f0e518814b43ff1e301058ef2797b178404d2b3eb91dbaf9 + 31a92aa03525d66a5834fe8ae4aad05a9ba93e99235189f4f64e78ae32f13093 + 22bc6f8f59b7f70bce843fab1d732121b177317d5d1f669bc7d7814c64c7831468e72f6d5c6affaf67782b6388a00bac9f5e85105d32169bb86ede89ea625c68 + 5f5aaedb7c4897f082b2a323daeb1900d7ccf419eb6e7e1fcd7d7bc0bf75f942 + a2197750afb1501abff854cc502235cc + + 8227840 + https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.13.tar.bz2 + + diff --git a/build/distfiles/libgpg-error-1.55.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.55.tar.bz2.meta4 deleted file mode 100644 index a8b010a..0000000 --- a/build/distfiles/libgpg-error-1.55.tar.bz2.meta4 +++ /dev/null @@ -1,27 +0,0 @@ - - - - 6c363dd8c6bcf2601dd5ff3b11fa2f699baa2aae40de2acd92461af0fd8178f0 - ae8bf5d17ebd252b32b05b9686baf2d2e027f5e827dbd7db6fea37570aeeeea2625d416aaea96fbcdfd64fd08de589ef054843b2e3619d22fc8a052a6b5c7e0a - 0b42772883a4a50e85c732d65fb1de18e70648de17c63f6c5e5d95f2fcb9e65c - fd6bfb200202b3ffe8e3e2863a06b98eecc2876723f64158d5043b6ae9b352ac7c70bac4407cb5057b2d00994b0cad0de3edc3c8bc96074d88344ddfb644e387 - d3f6ca9d9abefe81f5cbbc195fbe259d3362119018c535ad2621ee407cad3487011325a9f4c4a15442a9ac5a0fe7ce86dafd7b3d891a446516362ba6b7b9047b - 95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78 - cf320242c96511900cf2f45a16d1917e9c23b23e558b79725c3ec798a072b9f8c631d3e2e6a56b3c1b760b0c325b1d3131aeb2830eae1334c39ee09bb0ea1b54 - 4b784cf9f25dc72e5dcf8849d7a9f45da600c00273f80309a711420302fb2c2e - 3f74e9ed60a6e111e44fa90537748754 - - 1109437 - https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.55.tar.bz2 - - diff --git a/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 new file mode 100644 index 0000000..ba67fe0 --- /dev/null +++ b/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 @@ -0,0 +1,26 @@ + + + + f2dcd2027bf3f1dd304f035f5d00a7c5da352af213144ca6deddde1e210f687f + 2c84fe5cef8c77dc01f481aeacada815baf7fff85369a9c877dc4a11f2e3f84f37ad69a04213bc79765677dd2829a5074d7c8239b298429484378234cb4d2a66 + 31b8fdfe77fcfdacb85be016a068e0c54a98ab4aa4afe757a28b6bb755a42451 + f6aa1c9cf0f2f733f32aaae6d308bc4791b3d41877572afe1976233ccb50defd9b9983023940758589bdad87a0b0c1b3a45ad4de6f34c7e573ff42781c330942 + ff4160f4133cf1a90eddf5f59d6248214b59db4f021f124302be37bf04fa1f2eb665560914cbe289095e630a31ba141252e7a72a8e6dbbc622cb135a2066259a + 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 + 0a43403ef6a0248f954fa65e7560203e1511baefeabc29812a5edcd1feb083a9b09e640f0b6d1b04b5193a058172c175ea56b3b35077955430960184148e6f59 + caf24a64596a0c25180ab40117f0849414197d5827f45f4a73d9eca781ac63eb + 3fae84561fc0e51baaefe23d2438ab41 + + 1116017 + https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.56.tar.bz2 + + diff --git a/build/skel/security/gnupg-2.5.12-environ.patch b/build/skel/security/gnupg-2.5.13-environ.patch similarity index 100% rename from build/skel/security/gnupg-2.5.12-environ.patch rename to build/skel/security/gnupg-2.5.13-environ.patch diff --git a/build/skel/security/gnupg-2.5.12.do b/build/skel/security/gnupg-2.5.13.do similarity index 90% rename from build/skel/security/gnupg-2.5.12.do rename to build/skel/security/gnupg-2.5.13.do index 65dd333..cb6d0c8 100644 --- a/build/skel/security/gnupg-2.5.12.do +++ b/build/skel/security/gnupg-2.5.13.do @@ -8,7 +8,7 @@ devel/npth-1.7 security/gnutls-3.8.6 security/libassuan-3.0.2 security/libgcrypt-1.11.1 -security/libgpg-error-1.55 +security/libgpg-error-1.56 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.12-environ.patch >&2 +patch -p1 <"$BASS_ROOT"/build/skel/security/$NAME-environ.patch >&2 LDFLAGS="-lm $LDFLAGS" ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 make -j$MAKE_JOBS >&2 make install >&2 diff --git a/build/skel/security/libassuan-3.0.2.do b/build/skel/security/libassuan-3.0.2.do index c49cda1..729d68c 100644 --- a/build/skel/security/libassuan-3.0.2.do +++ b/build/skel/security/libassuan-3.0.2.do @@ -2,7 +2,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 security/libgpg-error-1.55" +bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1 security/libgpg-error-1.56" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 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.1.do b/build/skel/security/libgcrypt-1.11.1.do index e63a5b3..5a1edb7 100644 --- a/build/skel/security/libgcrypt-1.11.1.do +++ b/build/skel/security/libgcrypt-1.11.1.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.55 +rdeps=security/libgpg-error-1.56 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.55-environ.patch b/build/skel/security/libgpg-error-1.56-environ.patch similarity index 100% rename from build/skel/security/libgpg-error-1.55-environ.patch rename to build/skel/security/libgpg-error-1.56-environ.patch diff --git a/build/skel/security/libgpg-error-1.55.do b/build/skel/security/libgpg-error-1.56.do similarity index 90% rename from build/skel/security/libgpg-error-1.55.do rename to build/skel/security/libgpg-error-1.56.do index bf879f6..ee7c723 100644 --- a/build/skel/security/libgpg-error-1.55.do +++ b/build/skel/security/libgpg-error-1.56.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.55-environ.patch >&2 +patch -p1 <"$BASS_ROOT"/build/skel/security/$NAME-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 09e66e8..0b23bba 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.55 +rdeps=security/libgpg-error-1.56 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 75291ae..959f76e 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.55 +security/libgpg-error-1.56 security/libassuan-3.0.2 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps -- 2.52.0