From 8e064606b7f6e50d6504800bfcf499d8c3aa0ace9d61bd28cac7f25a85ca1ae5 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 17 Jul 2024 20:34:36 +0300
Subject: [PATCH] Update Nettle

---
 build/distfiles/.gitignore                    |  2 +-
 build/distfiles/nettle-3.10.tar.gz.meta4      | 33 +++++++++++++++++++
 build/distfiles/nettle-3.9.1.tar.gz.meta4     | 32 ------------------
 build/skel/devel/git-full-2.45.2.do           |  2 +-
 build/skel/security/gnutls-3.8.6.do           |  4 +--
 .../{nettle-3.9.1.do => nettle-3.10.do}       |  0
 6 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 build/distfiles/nettle-3.10.tar.gz.meta4
 delete mode 100644 build/distfiles/nettle-3.9.1.tar.gz.meta4
 rename build/skel/security/{nettle-3.9.1.do => nettle-3.10.do} (100%)

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index bccd83e..f71ef9d 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -163,7 +163,7 @@
 /nasm-2.16.01.tar.xz
 /ncurses-6.4.tar.gz
 /netpbm-11.04.02.tar.xz
-/nettle-3.9.1.tar.gz
+/nettle-3.10.tar.gz
 /nghttp2-1.62.1.tar.xz
 /ninja-v1.12.1.tar.zst
 /ninja.git/
diff --git a/build/distfiles/nettle-3.10.tar.gz.meta4 b/build/distfiles/nettle-3.10.tar.gz.meta4
new file mode 100644
index 0000000..f76a201
--- /dev/null
+++ b/build/distfiles/nettle-3.10.tar.gz.meta4
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="nettle-3.10.tar.gz">
+    <hash type="blake3-256">c2b37a2c9500b6eea1b186ccd525c7c7f82abb2039bd0ff6ba1c0232329832d0</hash>
+    <hash type="blake2b-512">edf0ba6375f06e2dd4b1e3ed4bab5f592ac04a36f748ce0461bbec32622eb3d5f96f89350926c24b5bbbf37dbe14a1ad64bba5df7cb7ad5987ec634573aabbb5</hash>
+    <hash type="blake2b-256">1722751437f0d75ad7093254647fd37c049261d26aabff1290b73cf9dd5d4bbe</hash>
+    <hash type="skein-512">a16675edd791b994438dd4074540a9d70af184527298eade47c5fceff69529daadde45dce9bb887fff377bdd126c367beb85a27c6b2140144764b6d7ef750a56</hash>
+    <hash type="shake128">8e4a94174d0d5e393673c18accf0e8c9b1c50c5d73b34c3de992fea1f10d114c</hash>
+    <hash type="shake256">7d3007e8ba4514e18dc4c076574cc70a34f390c2115cd9f98232cd42253f192dea84bbc782fe42857d0b084f778df4bf35f20f95dc4f3ff79d362d8401f5a5e7</hash>
+    <hash type="sha-512">18d5b904ce60514aa81b57bff2945e5f7f4366d4775e6a5ffc227b85be2def72b3d2159b983b75ac95a56d3167a2ef1a25b5dfc2fb6193f16a012935c36a7b34</hash>
+    <hash type="sha-256">b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c</hash>
+    <hash type="streebog-512">0617b5c0fa8fe1fe510ad95e256fbc4d9bfbe4e61dc9dffd85b21a288e9cba47c2fac07f3870eed7c78f99bf2cdd74b0611b1863c102ed1fc7cba75684d4475f</hash>
+    <hash type="streebog-256">5dfdf6841c025c92e75d48bb8b1109a8c97a4d31404e16eebe700f3202916f19</hash>
+    <hash type="xxh3-128">34d6178bec539462ce3563ab23e1078d</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP ARMORED FILE-----
+Comment: Use "gpg --dearmor" for unpacking
+
+iQFzBAABCgAdFiEENDwv8PvuXsLtvvOZ81mf+CjGcpgFAmZvBkAACgkQ81mf+CjG
+cpgYkAn/eAZiZZyLJHcSjZrlSv43MsTwBY9HJrmA8HPFZ7VyiYcVE+hrSN88fSSf
+UMpr4kL46ap4os12HBuU1ZDixKkpRMUI4ncGRX6Y8JAUrcUjcCPx6PWs9ZKg2AAN
+73WZr7l1ttJYyCtFGUxdjGoYFzDytligKdy/EmtPfyHZNKPyLCIjtyy1xUk6r5Ci
+jLSFY5ItXO+wQIVDWkUBRphwflaoTw+AB0C5hywnOvjTeNA9friNYmdHxn85rcpu
+u7ofZXMPj63BW0liRBzUIBcm021t28YUG0zBNJXBeQV2prdW8L8DaC+F+1QYJvAK
+0GPhyYh8eqO6UXgaBScRohTQCsC4TpRLwVsLYj3vdKsGeSY/bENMhXNKytKVIl6T
+XxgS7730GY5CaKz/uMIBy3zQ6SPU3pivSUuBJ8YWHoWiqX609P4=
+=cGjS
+-----END PGP ARMORED FILE-----
+]]></signature>
+    <size>2640485</size>
+    <url>https://ftpmirror.gnu.org/nettle/nettle-3.10.tar.gz</url>
+  </file>
+</metalink>
diff --git a/build/distfiles/nettle-3.9.1.tar.gz.meta4 b/build/distfiles/nettle-3.9.1.tar.gz.meta4
deleted file mode 100644
index 52bf9ba..0000000
--- a/build/distfiles/nettle-3.9.1.tar.gz.meta4
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="nettle-3.9.1.tar.gz">
-    <hash type="blake3-256">e4bfbda32f4fdf5ed96c152efe3a3867193b690faa5378d02a2a6fd052ee3393</hash>
-    <hash type="blake2b-512">e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142</hash>
-    <hash type="blake2b-256">038e1dd0921ecf77c3a2118c040d2e070f1c7028a4b94b8ea60d82b677e998b9</hash>
-    <hash type="skein-512">645fb945d2a7295a64b22e7ab110a67339ebf101d79b14dcc481f02a285badcdc3a60db2dbd6be793138ef57e4e65a7f39e3b4829a5dcf476d30d15b9ab69b24</hash>
-    <hash type="shake128">5ffa8da8ea8a525d6f0a3165077bf683bfc7b68c820906dc83892fd742ede69f</hash>
-    <hash type="shake256">0b4cda0ffa7ce0fb5042d03644be88afc9f37087ca914b42f491c5db61df877380e0e659fdc7c252c2f647767e2bbad4542d4e5d3e872ed261124485252007d5</hash>
-    <hash type="sha-512">5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced</hash>
-    <hash type="sha-256">ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3</hash>
-    <hash type="streebog-512">235fdb814c744341fe6156c3932a4bb01b6998207732279fc1f8e68fd76d2853a0381a0a0f8ac1d7e8100bed9e56625bdd6635dcb752010d44541462e55b5851</hash>
-    <hash type="streebog-256">b67caed4bc952f0e0288aa2fc772b7b2daa94142b11cc84622fbc08231c46e3f</hash>
-    <hash type="xxh3-128">446fc4f7dd9639f0b3f009b64eae1a2c</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP ARMORED FILE-----
-
-iQFzBAABCgAdFiEENDwv8PvuXsLtvvOZ81mf+CjGcpgFAmR45wQACgkQ81mf+CjG
-cpi9TAn/Xu1fLlO+fikHDdqLVkmhvrO6x/p+SEoUzyOuhqX42W+M/wna+gnEDZqo
-xF6PZHOV2M+t3O3eRoO5R+tnGvPM7VfBWGE1+0G6KfuWpbIgA7BtxzSvOl1Npg35
-Q9Ddv1i8tvvY5bvV+a7Q9v6mISH99T0eUDNM8NLAVsmlpVJ3kyjar+ICtFPk8TNd
-fSxGOvZgcixfVFCh33ehIt/t9gVNXnLavZqc2OWUy8++8xi+s8Il8p02Ms/6bRE8
-BwZbnG8a8CMzB02vtfj81lp9uPywFuPxMUg2Lnrmudefm5a/aYHpxmp3keQdE2uy
-48XzUt4mn9+342kP0BPNSGspNvKhlsD50JI69ExGiIWjiNx2CC2jqsUzelU7PEZc
-U/ihxzftmSl/6e5ug7sOc6cTsRW0FgI5A/ypu+dEYuDGPUUOijM=
-=Z+jJ
------END PGP ARMORED FILE-----
-]]></signature>
-    <size>2396741</size>
-    <url>https://ftpmirror.gnu.org/nettle/nettle-3.9.1.tar.gz</url>
-  </file>
-</metalink>
diff --git a/build/skel/devel/git-full-2.45.2.do b/build/skel/devel/git-full-2.45.2.do
index 9d372bd..ac5ceed 100644
--- a/build/skel/devel/git-full-2.45.2.do
+++ b/build/skel/devel/git-full-2.45.2.do
@@ -14,7 +14,7 @@ rdeps="
 devel/pcre2-10.44
 ftp/curl-with-tls-8.7.1
 lang/perl-5.32.1
-security/nettle-3.9.1
+security/nettle-3.10
 "
 ver=${NAME#git-full-}
 redo-ifchange $bdeps "$DISTFILES"/git-$ver.tar.xz $rdeps
diff --git a/build/skel/security/gnutls-3.8.6.do b/build/skel/security/gnutls-3.8.6.do
index 3984389..52752fd 100644
--- a/build/skel/security/gnutls-3.8.6.do
+++ b/build/skel/security/gnutls-3.8.6.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/nettle-3.9.1"
+rdeps="dns/libidn2-2.3.7 security/nettle-3.10"
 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
@@ -14,7 +14,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.xz
 
 cd $NAME
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
-    --without-tpm --without-p11-kit >&2
+    --without-tpm --without-p11-kit --enable-static >&2
 make -j$MAKE_JOBS >&2
 make install >&2
 
diff --git a/build/skel/security/nettle-3.9.1.do b/build/skel/security/nettle-3.10.do
similarity index 100%
rename from build/skel/security/nettle-3.9.1.do
rename to build/skel/security/nettle-3.10.do
-- 
2.48.1