From 15abb458c1568711a9bb4476d53dbe484a413cc976ee39c2939bfb958380eda7 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Tue, 30 Dec 2025 12:18:02 +0300 Subject: [PATCH] Update GnuPG with dependencies --- build/distfiles/.gitignore | 6 ++-- build/distfiles/gnupg-2.5.14.tar.bz2.meta4 | 29 ------------------- build/distfiles/gnupg-2.5.16.tar.bz2.meta4 | 26 +++++++++++++++++ .../distfiles/libgcrypt-1.11.1.tar.bz2.meta4 | 28 ------------------ .../distfiles/libgcrypt-1.11.2.tar.bz2.meta4 | 29 +++++++++++++++++++ .../distfiles/libgpg-error-1.56.tar.bz2.meta4 | 27 ----------------- .../distfiles/libgpg-error-1.58.tar.bz2.meta4 | 27 +++++++++++++++++ build/skel/irc/irssi-1.4.5.do | 2 +- build/skel/net/tshark-4.2.5.do | 2 +- ...viron.patch => gnupg-2.5.16-environ.patch} | 0 .../{gnupg-2.5.14.do => gnupg-2.5.16.do} | 4 +-- build/skel/security/gpgme-1.23.2.do | 2 +- build/skel/security/libassuan-3.0.2.do | 2 +- ...ibgcrypt-1.11.1.do => libgcrypt-1.11.2.do} | 2 +- ....patch => libgpg-error-1.58-environ.patch} | 0 ...gpg-error-1.56.do => libgpg-error-1.58.do} | 0 build/skel/security/libksba-1.6.7.do | 2 +- build/skel/security/libotr-4.1.1.do | 2 +- build/skel/security/pinentry-1.3.0.do | 2 +- build/skel/www/webkitgtk-2.34.6.do | 2 +- 20 files changed, 96 insertions(+), 98 deletions(-) delete mode 100644 build/distfiles/gnupg-2.5.14.tar.bz2.meta4 create mode 100644 build/distfiles/gnupg-2.5.16.tar.bz2.meta4 delete mode 100644 build/distfiles/libgcrypt-1.11.1.tar.bz2.meta4 create mode 100644 build/distfiles/libgcrypt-1.11.2.tar.bz2.meta4 delete mode 100644 build/distfiles/libgpg-error-1.56.tar.bz2.meta4 create mode 100644 build/distfiles/libgpg-error-1.58.tar.bz2.meta4 rename build/skel/security/{gnupg-2.5.14-environ.patch => gnupg-2.5.16-environ.patch} (100%) rename build/skel/security/{gnupg-2.5.14.do => gnupg-2.5.16.do} (94%) rename build/skel/security/{libgcrypt-1.11.1.do => libgcrypt-1.11.2.do} (96%) rename build/skel/security/{libgpg-error-1.56-environ.patch => libgpg-error-1.58-environ.patch} (100%) rename build/skel/security/{libgpg-error-1.56.do => libgpg-error-1.58.do} (100%) diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 85947ca..3862dce 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.14.tar.bz2 +/gnupg-2.5.16.tar.bz2 /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz @@ -119,8 +119,8 @@ /libebml-1.4.5.tar.xz /libedit-20230828-3.1.tar.gz /libevent-2.1.12.tar.gz -/libgcrypt-1.11.1.tar.bz2 -/libgpg-error-1.56.tar.bz2 +/libgcrypt-1.11.2.tar.bz2 +/libgpg-error-1.58.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.14.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.14.tar.bz2.meta4 deleted file mode 100644 index 586ebf3..0000000 --- a/build/distfiles/gnupg-2.5.14.tar.bz2.meta4 +++ /dev/null @@ -1,29 +0,0 @@ - - - - 2a0e11050d4920375752117027340c70e3db6207905abe5736bceb54bf05d8f2 - 167efad48b08f824c8c19c3aaedce4dc0c409f3f8d001659c1f1183e885db86f4cedddf8fd0e1adc04e1c6fde30a9496b653d3e0c5ef0d4f1dab3102b72edb0e - 014d83dd69e58a2d3cb3b4f826c1857ec251807b9ebcad43c8ad5c41bb88a39c - 45248db92fab2fd42e079c507744ab38e637b6ec96533f2623918200ef2cd90113724a607bbc7b159227f55004f665fb50170eee710f8d3650cdf8f2404adaf5 - 514c78d75848d98360425dc3ccb16eeac829c9010ddc4f362b9a7728734fa7b0391a8872501300df12125a4a5d698252200621cc1680aefd25d47ec2799f95d1 - 25a622e625a1cc9078b5e3f7adf2bd02b86759170e2fbb8542bca8e907214610 - 7c25990a2a66a1d5cf91899325e5621d0bc1fcae102fb0740ac77bb468189286a06e1a1792d3a6dc86e15a51fd0f0f1c14a84520d3206d0aa7bedfe484299a9a - 37420825ba48d0a9bed502eda89602069d2555a9b2fe40433c581b38886c1f94 - 5c0283012d3d1eb74cc4f848c8763d90 - - 8259582 - https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.14.tar.bz2 - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnupg/gnupg-2.5.14.tar.bz2 - - diff --git a/build/distfiles/gnupg-2.5.16.tar.bz2.meta4 b/build/distfiles/gnupg-2.5.16.tar.bz2.meta4 new file mode 100644 index 0000000..f454c99 --- /dev/null +++ b/build/distfiles/gnupg-2.5.16.tar.bz2.meta4 @@ -0,0 +1,26 @@ + + + + 9303f88bd802f40f31e106f9673003154d1ba02b604bc6d0aaf49d9efe44d0fa + 722c90ac88b2eeacb150dc6fa5f4d83b5577d0285871cd7d336463d25aabd1087cdca103a23b251b2067de6c3046615d9fcb552721ceef4826f4dd3e96c5525a + 7b9c9259c0ae7dc99ac068012935e31b7c8b9540de41ba3c89e7936353c8b854 + ec8cf1cb12da4f0894b5013910b0f67c3c6c9d03e234cbe0fe425f3d49e026d2bffad51ad60f00381a1ff98293664aaf43092a470da39b960b425d81a81d10a1 + 0a48628e9e7f8050022e5204bf9febd1f2db6ee9d55b573207884fc2ef2825d814015851141ba6851bd4466f0cc0827123e5f474003c054f3af55f4bd1440bf7 + 05144040fedb828ced2a6bafa2c4a0479ee4cceacf3b6d68ccc75b175ac13b7e + 337ef601c51e2ab53e94053d1280e5916bd9fa4c3c1d92cba6b02a7c50b25556deb4ea3c20facbf1a9c316a6576080f1ec40533041a484f556c73f5535681579 + b03b71ac1b56ecd44fb03cc000bc358cc3843333cc0ec2ef3ba1d4a7a13470cd + 8499c3f9992b3fc98254a3f824c96f5d + + 8304335 + https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.16.tar.bz2 + http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnupg/gnupg-2.5.16.tar.bz2 + + diff --git a/build/distfiles/libgcrypt-1.11.1.tar.bz2.meta4 b/build/distfiles/libgcrypt-1.11.1.tar.bz2.meta4 deleted file mode 100644 index 26c6b43..0000000 --- a/build/distfiles/libgcrypt-1.11.1.tar.bz2.meta4 +++ /dev/null @@ -1,28 +0,0 @@ - - - - 68844e12b92960d66c4ce85a4c3db1df8377b232980f1218b4c5d904e9c02511 - 6416c6a782665e8a8d1c7993d94e620c586cfb65f273bde3d609bd7ca729a92d7ac3e156dabea42c34dbe50af7ce9b16333f63115f968aebb2b4a6dd37d4b99c - 38d49834469d7b9ef4dc94467f921279e8b5068bcfc420d5706bb95c1bf9704c - ac086434bc1bad02450e6193ef4c8bfc8653d53a3e32fc7b1697dc110492da7b830cf519d323e6548bcaab6ec30ddf055f7cfadd67bfca08bef694712134272f - 85846d62ce785e4250a2bf8a2b13ec24837e48ab8e10d537ad4a18d650d2cca747f82fd1501feab47ad3114b9593b36c9fa7a892f48139e2a71ef61295a47678 - 24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e - 2da1e8b3627dfee65e5c175ceebbb5d2b08da38a4af91d047084f04f9993818bab93a62d00c46895ab0bcf1cb761a52655186ba24138298bf13be130467cff3e - 97db5d0d2368196499567ccbc44eff37ce6d40d8ab137af92bfd1b2d3beaffab - 8766a25b671367b6d9dfd862fa00da47 - - 4233557 - https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.11.1.tar.bz2 - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.11.1.tar.bz2 - - diff --git a/build/distfiles/libgcrypt-1.11.2.tar.bz2.meta4 b/build/distfiles/libgcrypt-1.11.2.tar.bz2.meta4 new file mode 100644 index 0000000..162746c --- /dev/null +++ b/build/distfiles/libgcrypt-1.11.2.tar.bz2.meta4 @@ -0,0 +1,29 @@ + + + + 8ed7be810e41618b334460d7d5194bd18b3f997495bced2d8a4fd2cd55145227 + 8ad2dd84e8ec2bddb5c008c6823a6d72b8f2d6237972966bc590be0d89bb6b50a5cbba1b42631d0950c4bea125a6d9a845fbf703b756a38088f66054712efa9c + b171c758860e6c8260ea32136c232db7f4c646ed6bc341bed012939c2c7637d3 + 66c223156a5d2dfc3dc145b8f6effb48b60f215cad25b4f905c7e895488a83d98c499bb1a4a5b66065f2890e940371361354507f0418e155d967317c2c43d3df + b706cea602cc8f0896e57ce979643bf78974b05faec27c1b053b773c57d8b04250e30e95a4ef5899e1df981d01d8d08f0a36e10b5820a5ec4183e74c02e5f1f0 + 6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac + fd52fd1f08c78495818222d89bbc1ce99f6177d8b70a181f1c64e2eb7ad8327b56ba8f5b7ff3388682de376e96df649191f5321b3321493bc4a0bf22f0e72ad6 + c4acb518f7300d5420aa257b76c0906131a39bded8d9879697d50d8721a34f5e + 0709ac1c4067947d173e9a2253cbbba3 + + 4237802 + https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.11.2.tar.bz2 + http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.11.2.tar.bz2 + + diff --git a/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 deleted file mode 100644 index ce07d69..0000000 --- a/build/distfiles/libgpg-error-1.56.tar.bz2.meta4 +++ /dev/null @@ -1,27 +0,0 @@ - - - - f2dcd2027bf3f1dd304f035f5d00a7c5da352af213144ca6deddde1e210f687f - 2c84fe5cef8c77dc01f481aeacada815baf7fff85369a9c877dc4a11f2e3f84f37ad69a04213bc79765677dd2829a5074d7c8239b298429484378234cb4d2a66 - 31b8fdfe77fcfdacb85be016a068e0c54a98ab4aa4afe757a28b6bb755a42451 - f6aa1c9cf0f2f733f32aaae6d308bc4791b3d41877572afe1976233ccb50defd9b9983023940758589bdad87a0b0c1b3a45ad4de6f34c7e573ff42781c330942 - ff4160f4133cf1a90eddf5f59d6248214b59db4f021f124302be37bf04fa1f2eb665560914cbe289095e630a31ba141252e7a72a8e6dbbc622cb135a2066259a - 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 - 0a43403ef6a0248f954fa65e7560203e1511baefeabc29812a5edcd1feb083a9b09e640f0b6d1b04b5193a058172c175ea56b3b35077955430960184148e6f59 - caf24a64596a0c25180ab40117f0849414197d5827f45f4a73d9eca781ac63eb - 3fae84561fc0e51baaefe23d2438ab41 - - 1116017 - https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.56.tar.bz2 - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.56.tar.bz2 - - diff --git a/build/distfiles/libgpg-error-1.58.tar.bz2.meta4 b/build/distfiles/libgpg-error-1.58.tar.bz2.meta4 new file mode 100644 index 0000000..b148874 --- /dev/null +++ b/build/distfiles/libgpg-error-1.58.tar.bz2.meta4 @@ -0,0 +1,27 @@ + + + + 34bd4a83ec9590e55577ab83d54e0666352293824fa79caf753d6e83a0eae963 + 7d1c0d54094d870e9e92aebadc4a8a3cf0e7a1ae7841b445896105583a8885439ca8364b2e364639759912ea46f801b41e5025db9aa292c4fce43713430711e1 + 2092aaa58c13df1fbb09ec6baf757094ca05f5c39fc41cec33a41f9bc15d3cad + ac406a5d69af8d25e22bf23cf8a29c39ae719c19b925ec7231dbf3a6404302413ace8d8b9bab52d1b99f64536a308a9e54a06aa5b9fe03284320c4fcb6d0385b + 4f4cb7f24e6cf4266c30da3985b9e62d4ab6012d8f43e9969d6edfd344d2a08f6277ab10610627597f6c58d064b3127fd286ae678381b84610d611645db5bbb4 + f943aea9a830a8bd938e5124b579efaece24a3225ff4c3d27611a80ce1260c27 + 996114e8495c4fa42cf293d370c7670514b8f390eae4bd578e6effd5e0b16bd8a478a5757a84889cdbe77faeb678f3c71de102d888d620b302117f86f8b0ebc9 + 925de8c0efe5a62a5f8ef4119d1602f0bc119f7b4ecd6d94ca0151fa66666ff3 + 278f35f49471fce01aba72fb65625b15 + + 1123899 + https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.58.tar.bz2 + http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.58.tar.bz2 + + diff --git a/build/skel/irc/irssi-1.4.5.do b/build/skel/irc/irssi-1.4.5.do index d671a7f..d181a09 100644 --- a/build/skel/irc/irssi-1.4.5.do +++ b/build/skel/irc/irssi-1.4.5.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="devel/ncurses-6.4 security/libgcrypt-1.11.1 security/libotr-4.1.1" +rdeps="devel/ncurses-6.4 security/libgcrypt-1.11.2 security/libotr-4.1.1" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/net/tshark-4.2.5.do b/build/skel/net/tshark-4.2.5.do index 2896e38..b1d0ff1 100644 --- a/build/skel/net/tshark-4.2.5.do +++ b/build/skel/net/tshark-4.2.5.do @@ -11,7 +11,7 @@ devel/gmake-4.4.1 devel/pkgconf-2.1.1 devel/cmake-3.28.3 " -rdeps="dns/c-ares-1.30.0 security/libgcrypt-1.11.1" +rdeps="dns/c-ares-1.30.0 security/libgcrypt-1.11.2" ver=${NAME#tshark-} redo-ifchange $bdeps "$DISTFILES"/wireshark-$ver.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/security/gnupg-2.5.14-environ.patch b/build/skel/security/gnupg-2.5.16-environ.patch similarity index 100% rename from build/skel/security/gnupg-2.5.14-environ.patch rename to build/skel/security/gnupg-2.5.16-environ.patch diff --git a/build/skel/security/gnupg-2.5.14.do b/build/skel/security/gnupg-2.5.16.do similarity index 94% rename from build/skel/security/gnupg-2.5.14.do rename to build/skel/security/gnupg-2.5.16.do index cb6d0c8..06b21dd 100644 --- a/build/skel/security/gnupg-2.5.14.do +++ b/build/skel/security/gnupg-2.5.16.do @@ -7,8 +7,8 @@ rdeps=" devel/npth-1.7 security/gnutls-3.8.6 security/libassuan-3.0.2 -security/libgcrypt-1.11.1 -security/libgpg-error-1.56 +security/libgcrypt-1.11.2 +security/libgpg-error-1.58 security/libksba-1.6.7 security/pinentry-1.3.0 " diff --git a/build/skel/security/gpgme-1.23.2.do b/build/skel/security/gpgme-1.23.2.do index 0cb2fca..d99081d 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.14 +rdeps=security/gnupg-2.5.16 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/libassuan-3.0.2.do b/build/skel/security/libassuan-3.0.2.do index 729d68c..e6683fe 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.56" +bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1 security/libgpg-error-1.58" 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.2.do similarity index 96% rename from build/skel/security/libgcrypt-1.11.1.do rename to build/skel/security/libgcrypt-1.11.2.do index 5a1edb7..3db7e19 100644 --- a/build/skel/security/libgcrypt-1.11.1.do +++ b/build/skel/security/libgcrypt-1.11.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/libgpg-error-1.56 +rdeps=security/libgpg-error-1.58 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.56-environ.patch b/build/skel/security/libgpg-error-1.58-environ.patch similarity index 100% rename from build/skel/security/libgpg-error-1.56-environ.patch rename to build/skel/security/libgpg-error-1.58-environ.patch diff --git a/build/skel/security/libgpg-error-1.56.do b/build/skel/security/libgpg-error-1.58.do similarity index 100% rename from build/skel/security/libgpg-error-1.56.do rename to build/skel/security/libgpg-error-1.58.do diff --git a/build/skel/security/libksba-1.6.7.do b/build/skel/security/libksba-1.6.7.do index 0b23bba..bba0a73 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.56 +rdeps=security/libgpg-error-1.58 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/libotr-4.1.1.do b/build/skel/security/libotr-4.1.1.do index 742d98d..1f063e7 100644 --- a/build/skel/security/libotr-4.1.1.do +++ b/build/skel/security/libotr-4.1.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/libgcrypt-1.11.1 +rdeps=security/libgcrypt-1.11.2 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $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 959f76e..a8aa3a7 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.56 +security/libgpg-error-1.58 security/libassuan-3.0.2 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps diff --git a/build/skel/www/webkitgtk-2.34.6.do b/build/skel/www/webkitgtk-2.34.6.do index 6a40b2d..b1ac97a 100644 --- a/build/skel/www/webkitgtk-2.34.6.do +++ b/build/skel/www/webkitgtk-2.34.6.do @@ -23,7 +23,7 @@ graphics/libpng-1.6.52 graphics/libwebp-1.4.0 graphics/openjpeg-2.5.2 net/libsoup-2.74.3 -security/libgcrypt-1.11.1 +security/libgcrypt-1.11.2 security/libtasn1-4.19.0 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps -- 2.52.0