From 5b2844a72c5906ddc38741cc333c092b0f569e24becf68ef3b1e3da679bd881b Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 9 Feb 2026 20:02:50 +0300 Subject: [PATCH] Update GnuTLS --- build/distfiles/.gitignore | 2 +- build/distfiles/gnutls-3.8.12.tar.xz.meta4 | 40 +++++++++++++++++++ build/distfiles/gnutls-3.8.6.tar.xz.meta4 | 28 ------------- build/skel/ftp/aria2-1.37.0.do | 2 +- build/skel/ftp/curl-with-tls-8.18.0.do | 2 +- build/skel/ftp/lftp-4.9.3.do | 2 +- build/skel/mail/mutt-2.3.0.do | 2 +- .../ffmpeg-n8.1-dev-1980-gde3f99d74b.do | 2 +- build/skel/net/glib-networking-2.80.0.do | 2 +- build/skel/net/tigervnc-1.13.90.do | 2 +- build/skel/security/gnupg-2.5.17.do | 2 +- .../security/gnutls-3.8.12-crau-fix.patch | 16 ++++++++ .../{gnutls-3.8.6.do => gnutls-3.8.12.do} | 6 ++- 13 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 build/distfiles/gnutls-3.8.12.tar.xz.meta4 delete mode 100644 build/distfiles/gnutls-3.8.6.tar.xz.meta4 create mode 100644 build/skel/security/gnutls-3.8.12-crau-fix.patch rename build/skel/security/{gnutls-3.8.6.do => gnutls-3.8.12.do} (81%) diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 9cb4359..1abe8af 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -69,7 +69,7 @@ /gmp-4.3.2.tar.bz2 /gmp-6.3.0.tar.zst /gnupg-2.5.17.tar.bz2 -/gnutls-3.8.6.tar.xz +/gnutls-3.8.12.tar.xz /go1.17.12.tar.gz /go1.20.14.tar.gz /go1.23.5.tar.gz diff --git a/build/distfiles/gnutls-3.8.12.tar.xz.meta4 b/build/distfiles/gnutls-3.8.12.tar.xz.meta4 new file mode 100644 index 0000000..fbcf809 --- /dev/null +++ b/build/distfiles/gnutls-3.8.12.tar.xz.meta4 @@ -0,0 +1,40 @@ + + + + d60d32619210c02b3b280a79e32c8323a7fd556ae77e1b461d69744bc93f05d5 + ff326dddce464b366ab6e892b812a2e38b5ebd57b35627ce265e4eb3e5930e30fda82e584ec01339ef61a8a7704f5c772f13110046559537f3b667484054f728 + 41f306e52ede809d75489aac9a175a6c9b66a0a3836817b99c20775c210017d6 + fe0ae59d4663bc591eba1ca827e78093ef3a844f78ca28fce85c4dba511f3c51fbe2fc5f4c7feef863b943cc0280fb4e7e84ad467f5dcd801c60b466e025318e + d380f59794430225dce0c19bea145ef1feb07f54d441628ba735c21b6aed5b84 + 1d172ea99695292fe50b60efb44174e76a8e1b0ea9aee40638ca603712c95d644c0e3a8de055f1dc747bccc4ea3d6005e914d3c35a67b603dda722538eeb3537 + 332a8e5200461517c7f08515e3aaab0bec6222747422e33e9e7d25d35613e3d0695a803fce226bd6a83f723054f551328bd99dcf0573e142be777dcf358e1a3b + a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51 + 0e8d19e494a903fadb0e1b6707197fffd670b39a3ea89b5419a90c4d210df530225a150c64128ca5d45b915390898642fd16d7777c12181c0ced6f6d7b068386 + 257b3e10bad14d4d8b061d268ef47b5d43f08da4625ff73ab04bda051d72301a + 13755ea1add56edf4c0e8a1e2660d5ba + + 6949604 + https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.12.tar.xz + http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.8/gnutls-3.8.12.tar.xz + + diff --git a/build/distfiles/gnutls-3.8.6.tar.xz.meta4 b/build/distfiles/gnutls-3.8.6.tar.xz.meta4 deleted file mode 100644 index fe6eb4f..0000000 --- a/build/distfiles/gnutls-3.8.6.tar.xz.meta4 +++ /dev/null @@ -1,28 +0,0 @@ - - - - 39e6d4b9ae58de3b6da927a8a0dd0e93babd232e31e72fe211ab754380871748 - 58910e252231c02cfaa1183b38f3127f61aa991d266078bef8fb65709930a2d2dda1adad5fa32cdb203fda65955bcab9193ce71b5fba0b74e6a36a218bc0dd94 - 92ad3aec59b1b30b141d59b01e44b34f0e1f10f3fa9bc907e68fbfb2a4bf420f - 6ca3af49671ec62c8383cdc6ed5d155e59e77284866186f16bcf31927bea509d7ab7e795dfc33abbd4e6b2998ab1153099776c8e858d9cbcde648a9849c8fb3a - 663f810afabe1b891ea3cab59573625243baa10e04941c323d4e728b84e68c8d - c518849d7cf70bc23aa642d2927c19a300472d489f1ede48e46bee0edd1861dd7c02dbb98ddc1c0560da8b98aa1b6ffffad5b8a9598aa329497422ffd0af262e - 58631c456dfb43f8cb6a1703ffa91c593a33357f37dc146e808d88692e19c7ac10aeabea40bee9952205be97e00648879e9f0fa80e670e8e695f8633ba726513 - 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd - 6e985dd4584fb52083691eeea38395cde5f75e96d3ade1978ecf9db8d1dbfea314c6aca3b405bce382d6beb52dab29a77b63efec5ec74bd77fb74dbf7bfba48a - 4130c108ad328791b28eb4db972f05eaad6b70c8b184121d26938e225d42befd - 65f40ac26d368dc3f900447e0f1b874b - - 6517476 - https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz - - diff --git a/build/skel/ftp/aria2-1.37.0.do b/build/skel/ftp/aria2-1.37.0.do index 9008acd..4d9c5fc 100644 --- a/build/skel/ftp/aria2-1.37.0.do +++ b/build/skel/ftp/aria2-1.37.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="dns/c-ares-1.30.0 security/gnutls-3.8.6" +rdeps="dns/c-ares-1.30.0 security/gnutls-3.8.12" 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/ftp/curl-with-tls-8.18.0.do b/build/skel/ftp/curl-with-tls-8.18.0.do index a2e1073..77306fa 100644 --- a/build/skel/ftp/curl-with-tls-8.18.0.do +++ b/build/skel/ftp/curl-with-tls-8.18.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/gnutls-3.8.6 dns/libidn2-2.3.7 www/libnghttp2-1.62.1" +rdeps="security/gnutls-3.8.12 dns/libidn2-2.3.7 www/libnghttp2-1.62.1" ver=${NAME#curl-with-tls-} redo-ifchange $bdeps "$DISTFILES"/curl-$ver.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/ftp/lftp-4.9.3.do b/build/skel/ftp/lftp-4.9.3.do index 7a33570..c0beec5 100644 --- a/build/skel/ftp/lftp-4.9.3.do +++ b/build/skel/ftp/lftp-4.9.3.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="dns/libidn2-2.3.7 security/gnutls-3.8.6" +rdeps="dns/libidn2-2.3.7 security/gnutls-3.8.12" 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/mail/mutt-2.3.0.do b/build/skel/mail/mutt-2.3.0.do index 7321a6c..aa105c3 100644 --- a/build/skel/mail/mutt-2.3.0.do +++ b/build/skel/mail/mutt-2.3.0.do @@ -8,7 +8,7 @@ devel/libiconv-1.17 devel/ncurses-6.4 dns/libidn2-2.3.7 security/cyrus-sasl-2.1.28 -security/gnutls-3.8.6 +security/gnutls-3.8.12 security/gpgme-1.23.2 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps diff --git a/build/skel/multimedia/ffmpeg-n8.1-dev-1980-gde3f99d74b.do b/build/skel/multimedia/ffmpeg-n8.1-dev-1980-gde3f99d74b.do index 25ffd29..63907d9 100644 --- a/build/skel/multimedia/ffmpeg-n8.1-dev-1980-gde3f99d74b.do +++ b/build/skel/multimedia/ffmpeg-n8.1-dev-1980-gde3f99d74b.do @@ -20,7 +20,7 @@ multimedia/libvpx-v1.14.1-303-gd6ae3ea465 multimedia/svt-av1-v4.0.1 multimedia/x264-2024-05-12 multimedia/zimg-3.0.5-207-g0e56801 -security/gnutls-3.8.6 +security/gnutls-3.8.12 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/net/glib-networking-2.80.0.do b/build/skel/net/glib-networking-2.80.0.do index c25c05c..6ef3876 100644 --- a/build/skel/net/glib-networking-2.80.0.do +++ b/build/skel/net/glib-networking-2.80.0.do @@ -12,7 +12,7 @@ devel/ninja-v1.12.1 lang/Python-3.7.3 " rdeps=" -security/gnutls-3.8.6 +security/gnutls-3.8.12 net/libproxy-0.4.18 dns/libpsl-0.21.5 " diff --git a/build/skel/net/tigervnc-1.13.90.do b/build/skel/net/tigervnc-1.13.90.do index faa4049..72f2f8b 100644 --- a/build/skel/net/tigervnc-1.13.90.do +++ b/build/skel/net/tigervnc-1.13.90.do @@ -6,7 +6,7 @@ bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3 devel/pkgconf-2.1.1" rdeps=" graphics/libjpeg-turbo-3.0.3 graphics/pixman-0.40.0 -security/gnutls-3.8.6 +security/gnutls-3.8.12 x11-toolkits/fltk-1.3.9 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps diff --git a/build/skel/security/gnupg-2.5.17.do b/build/skel/security/gnupg-2.5.17.do index 894653a..2847a69 100644 --- a/build/skel/security/gnupg-2.5.17.do +++ b/build/skel/security/gnupg-2.5.17.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/npth-1.7 -security/gnutls-3.8.6 +security/gnutls-3.8.12 security/libassuan-3.0.2 security/libgcrypt-1.12.0 security/libgpg-error-1.58 diff --git a/build/skel/security/gnutls-3.8.12-crau-fix.patch b/build/skel/security/gnutls-3.8.12-crau-fix.patch new file mode 100644 index 0000000..bd55ca8 --- /dev/null +++ b/build/skel/security/gnutls-3.8.12-crau-fix.patch @@ -0,0 +1,16 @@ +--- lib/crau/crau.h.orig 2026-02-09 17:41:57.000000000 +0300 ++++ lib/crau/crau.h 2026-02-09 20:28:32.571799000 +0300 +@@ -251,13 +251,7 @@ + # else + + # ifndef CRAU_MAYBE_UNUSED +-# if defined(__has_c_attribute) +-# if __has_c_attribute (__maybe_unused__) +-# define CRAU_MAYBE_UNUSED [[__maybe_unused__]] +-# endif +-# elif defined(__GNUC__) + # define CRAU_MAYBE_UNUSED __attribute__((__unused__)) +-# endif + # endif /* CRAU_MAYBE_UNUSED */ + + void crau_push_context(struct crau_context_stack_st *stack CRAU_MAYBE_UNUSED, diff --git a/build/skel/security/gnutls-3.8.6.do b/build/skel/security/gnutls-3.8.12.do similarity index 81% rename from build/skel/security/gnutls-3.8.6.do rename to build/skel/security/gnutls-3.8.12.do index b1614ba..482b8cf 100644 --- a/build/skel/security/gnutls-3.8.6.do +++ b/build/skel/security/gnutls-3.8.12.do @@ -13,9 +13,13 @@ $TAR xf "$DISTFILES"/$NAME.tar.xz "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh cd $NAME +if uname -s | grep -q -i freebsd ; then + patch <"$BASS_ROOT"/build/skel/security/gnutls-3.8.12-crau-fix.patch >&2 +fi ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ --without-tpm --without-p11-kit --enable-static \ - --with-included-unistring --with-included-libtasn1 >&2 + --with-included-unistring --with-included-libtasn1 \ + --disable-crypto-auditing >&2 make -j$MAKE_JOBS >&2 make install >&2 -- 2.52.0