Update GnuTLS

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 9cb43596f32b213e5c8b111093f428c008e167cd3146f6ee568376db3cec311a..1abe8af711e62287bbf96bd46afda03414a1fc25044ac94fb0c202753111b33b 100644 (file)
--- 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 (file)
index 0000000..fbcf809
--- /dev/null
+++ b/build/distfiles/gnutls-3.8.12.tar.xz.meta4
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="gnutls-3.8.12.tar.xz">
+    <hash type="blake3-256">d60d32619210c02b3b280a79e32c8323a7fd556ae77e1b461d69744bc93f05d5</hash>
+    <hash type="blake2b-512">ff326dddce464b366ab6e892b812a2e38b5ebd57b35627ce265e4eb3e5930e30fda82e584ec01339ef61a8a7704f5c772f13110046559537f3b667484054f728</hash>
+    <hash type="blake2b-256">41f306e52ede809d75489aac9a175a6c9b66a0a3836817b99c20775c210017d6</hash>
+    <hash type="skein-512">fe0ae59d4663bc591eba1ca827e78093ef3a844f78ca28fce85c4dba511f3c51fbe2fc5f4c7feef863b943cc0280fb4e7e84ad467f5dcd801c60b466e025318e</hash>
+    <hash type="shake128">d380f59794430225dce0c19bea145ef1feb07f54d441628ba735c21b6aed5b84</hash>
+    <hash type="shake256">1d172ea99695292fe50b60efb44174e76a8e1b0ea9aee40638ca603712c95d644c0e3a8de055f1dc747bccc4ea3d6005e914d3c35a67b603dda722538eeb3537</hash>
+    <hash type="sha-512">332a8e5200461517c7f08515e3aaab0bec6222747422e33e9e7d25d35613e3d0695a803fce226bd6a83f723054f551328bd99dcf0573e142be777dcf358e1a3b</hash>
+    <hash type="sha-256">a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51</hash>
+    <hash type="streebog-512">0e8d19e494a903fadb0e1b6707197fffd670b39a3ea89b5419a90c4d210df530225a150c64128ca5d45b915390898642fd16d7777c12181c0ced6f6d7b068386</hash>
+    <hash type="streebog-256">257b3e10bad14d4d8b061d268ef47b5d43f08da4625ff73ab04bda051d72301a</hash>
+    <hash type="xxh3-128">13755ea1add56edf4c0e8a1e2660d5ba</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP ARMORED FILE-----
+
+iQIzBAABCgAdFiEEpqtToB0jepT57sTQQSdIpAr8wvsFAmmJ9qUACgkQQSdIpAr8
+wvu/pQ//XqB9p1qInegWjwNGK9nDMV3t5BozmgASf4UtsIbhyYvVYwxPTSmEiCTF
+mv+B3CsDudvUsf20pAxtjCVOm2m49ia153eg00oDCcz9g9Daz4PXrqJA4ykkWjfC
+3KTCr2Wd6jkok10PzdXFPf1ZkPgHbuAmBNEPr8+n4V+kXopvRLf0fSc0pXjWWZhm
+h3GHnCl4LCLLJBy4vA1S+zsVfMQV274Kp1PmwmBquwc4ccqjXlI8Ho4w28IMNemK
+P00A0bAemZYmV13ECOTemTwxgkEUeDPp5IRBtA6ojnKlKPv4aidh70u3hKF2HHYN
+zByvm1O77WpMqOPNZF6guGka9Z126jLTnSW4z3GY6yfeBYX5yzNa7nwQr20KSdT0
+UQ6TtMKtMHnfR14zx5uqV3BYalBmkWytJDICKOwlPEUIj3vOEB+Z/UEf8XsqB7yw
+JZ0KzYKR+MFUXy3NWOPvpqDVBayb/bE/LWQSgCYUCLyIqoyue2BmtYTyrEf22df1
+wAx3hItUnuKRP/n80uLj0PRGQHft2dDISzfcGuxRHb6Mg9QQ78DXOAPgJ8OU9wIn
+QJRN0hixMssgVHl2+2tffMAEgMKC+pT5xb6glTHiJAozWKdj9+a6AN0P+KNOa3tF
+J4+U4TwTcQ8BqE7vdaklP+xg7HyJC01r2QGflFJdSzxIY9wveHCIdQQAFgoAHRYh
+BF1Gyw92NAWnBTVW9Hp1pkiz+SIMBQJpifvWAAoJEHp1pkiz+SIM7WcBAM7spMye
+xoMEd2MEOZfmohygAAIlkYdItCl1XWjA7ZMiAP9fa+pbdyJGBj72mJhRWSCVrxkm
+/rk/HFGLesDglv7RDg==
+=4EPQ
+-----END PGP ARMORED FILE-----
+]]></signature>
+    <size>6949604</size>
+    <url>https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.12.tar.xz</url>
+    <url>http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.8/gnutls-3.8.12.tar.xz</url>
+  </file>
+</metalink>

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 (file)
index fe6eb4f..0000000
--- a/build/distfiles/gnutls-3.8.6.tar.xz.meta4
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="gnutls-3.8.6.tar.xz">
-    <hash type="blake3-256">39e6d4b9ae58de3b6da927a8a0dd0e93babd232e31e72fe211ab754380871748</hash>
-    <hash type="blake2b-512">58910e252231c02cfaa1183b38f3127f61aa991d266078bef8fb65709930a2d2dda1adad5fa32cdb203fda65955bcab9193ce71b5fba0b74e6a36a218bc0dd94</hash>
-    <hash type="blake2b-256">92ad3aec59b1b30b141d59b01e44b34f0e1f10f3fa9bc907e68fbfb2a4bf420f</hash>
-    <hash type="skein-512">6ca3af49671ec62c8383cdc6ed5d155e59e77284866186f16bcf31927bea509d7ab7e795dfc33abbd4e6b2998ab1153099776c8e858d9cbcde648a9849c8fb3a</hash>
-    <hash type="shake128">663f810afabe1b891ea3cab59573625243baa10e04941c323d4e728b84e68c8d</hash>
-    <hash type="shake256">c518849d7cf70bc23aa642d2927c19a300472d489f1ede48e46bee0edd1861dd7c02dbb98ddc1c0560da8b98aa1b6ffffad5b8a9598aa329497422ffd0af262e</hash>
-    <hash type="sha-512">58631c456dfb43f8cb6a1703ffa91c593a33357f37dc146e808d88692e19c7ac10aeabea40bee9952205be97e00648879e9f0fa80e670e8e695f8633ba726513</hash>
-    <hash type="sha-256">2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd</hash>
-    <hash type="streebog-512">6e985dd4584fb52083691eeea38395cde5f75e96d3ade1978ecf9db8d1dbfea314c6aca3b405bce382d6beb52dab29a77b63efec5ec74bd77fb74dbf7bfba48a</hash>
-    <hash type="streebog-256">4130c108ad328791b28eb4db972f05eaad6b70c8b184121d26938e225d42befd</hash>
-    <hash type="xxh3-128">65f40ac26d368dc3f900447e0f1b874b</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP ARMORED FILE-----
-
-iHUEABYKAB0WIQRdRssPdjQFpwU1VvR6daZIs/kiDAUCZoUp1gAKCRB6daZIs/ki
-DAViAP41Mmymw3Vf4U21cX0QKJ2yPf1b2uoa+aPdiI08MwfROgEAjBYsISF15h4P
-1gbl8oRRxcMemajLG+6PCG+7YFKOAAA=
-=/Wfz
------END PGP ARMORED FILE-----
-]]></signature>
-    <size>6517476</size>
-    <url>https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz</url>
-    <url>http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz</url>
-  </file>
-</metalink>

diff --git a/build/skel/ftp/aria2-1.37.0.do b/build/skel/ftp/aria2-1.37.0.do
index 9008acdaabda4beceb1d94db24083980b5167bc80c25d398ec84f4cb142a005a..4d9c5fca31d35e0d1eb34b8caa8ef5ef53c184cd53caac853f5d3fedbed81dc2 100644 (file)
--- 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 a2e1073c10aee8f46c92852a6d2a245be4ccfda2e5f4899ff4830787147f3139..77306fa7d6523c707f36607eb51a1205a5aadd65bf0f096a78d9da47b5fbcbf7 100644 (file)
--- 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 7a335707704659f9e1494767deacd008c65a08e8d506be0722172a2238f98be4..c0beec59bcc52538cbdde1b94eaa1a2ea2a3714fb889e643fc4d0bab85f6ad0f 100644 (file)
--- 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 7321a6c9fe3c0d1d1907648259b88be408fc0db6b38ebb1e777d43e3ecbf5067..aa105c3ebcba6630877b5dd0a4dc9f50f36a9803c03fdbd4d1bf7670d4ea823d 100644 (file)
--- 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 25ffd29d297d51972814ad3226b3af752121cde83b0f83972ab27fb7b97a9d8e..63907d9e25125f7d0801336e906df37e0494091361f3382b5deab67651a32406 100644 (file)
--- 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 c25c05c6dede606fc419996c61d379c908939b9ae63ea6478f3905f77b33a8e2..6ef38769ceb26fea3b1746c6a14fac9ca4ba715973348fdbfdf02d642fe81bc9 100644 (file)
--- 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 faa40497dfdceabc485060da5f41160d8448c980c9d0477ff1f38f3c9e2f896e..72f2f8b6d8e7b61ef56a884a3b5c5cba5f71c749385b49f66ea7dcf7c59c5414 100644 (file)
--- 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 894653a44028f4036d12c3931327a4494c45b618c04d7c065fef1e3e3af4741e..2847a69a2184623514ecac07409d869edd364a96dfb4ccfb4b51d0862d8e69b0 100644 (file)
--- 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 (file)
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 b1614ba866fafb124cb65817ef6affbf235671ac7f320c97a065ee490001d3fb..482b8cff016a28c2341a53eb93a0e38de02db51ec71a3c371bd2e61c7af814fb 100644 (file)
--- 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