Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 net/chrony/DETAILS               |    2 
 net/chrony/HISTORY               |    7 +-
 net/chrony/PRE_BUILD             |    4 -
 net/chrony/patches/nettle4.patch |  130 
---------------------------------------
 4 files changed, 7 insertions(+), 136 deletions(-)

New commits:
commit 60708623897830484302cf8aae807667ae87de6f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    net/chrony: version 4.9

diff --git a/net/chrony/DETAILS b/net/chrony/DETAILS
index 5fc3b4a..c678379 100755
--- a/net/chrony/DETAILS
+++ b/net/chrony/DETAILS
@@ -1,5 +1,5 @@
            SPELL=chrony
-         VERSION=4.8
+         VERSION=4.9
   SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SPELL-$VERSION-tar-gz-asc.txt
diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY
index 910e026..39cdce1 100644
--- a/net/chrony/HISTORY
+++ b/net/chrony/HISTORY
@@ -1,5 +1,10 @@
+2026-08-30 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 4.9
+       * PRE_BUILD, patches/nettle4.patch: removed, not needed anymore
+
 2026-03-20 Pavel Vinogradov <public AT sourcemage.org>
-       * PRE_BUILD, patches/nettle4.patch: addet from upstream to build with 
nettle 4.0
+       * PRE_BUILD, patches/nettle4.patch: added from upstream to build with
+         nettle 4.0
 
 2025-08-27 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 4.8
diff --git a/net/chrony/PRE_BUILD b/net/chrony/PRE_BUILD
deleted file mode 100755
index 54dfd4b..0000000
--- a/net/chrony/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd  "${SOURCE_DIRECTORY}" &&
-
-apply_patch_dir "patches"
diff --git a/net/chrony/patches/nettle4.patch 
b/net/chrony/patches/nettle4.patch
deleted file mode 100644
index 9b57ec8..0000000
--- a/net/chrony/patches/nettle4.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From fee12ec914cce805cc704a4c2804d75b4933ad2f Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar AT redhat.com>
-Date: Mon, 2 Mar 2026 11:55:30 +0100
-Subject: [PATCH] cmac+hash: add support for Nettle 4.0
-
-Support for truncated digests was removed in Nettle 4.0. The digest
-functions no longer accept the output length. Provide a full-length
-buffer and copy the requested length of the digest, same as with the
-other crypto providers.
----
- cmac_nettle.c | 20 ++++++++++++++++++--
- configure     |  2 +-
- hash_nettle.c | 13 ++++++++++++-
- 3 files changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/cmac_nettle.c b/cmac_nettle.c
-index 5b2c0d4c..cbbf9ddb 100644
---- a/cmac_nettle.c
-+++ b/cmac_nettle.c
-@@ -30,8 +30,10 @@
- #include "sysincl.h"
- 
- #include <nettle/cmac.h>
-+#include <nettle/version.h>
- 
- #include "cmac.h"
-+#include "hash.h"
- #include "memory.h"
- 
- struct CMC_Instance_Record {
-@@ -86,25 +88,39 @@ CMC_CreateInstance(CMC_Algorithm algorithm, const 
unsigned char *key, int length
- int
- CMC_Hash(CMC_Instance inst, const void *in, int in_len, unsigned char *out, 
int out_len)
- {
-+  unsigned char buf[MAX_HASH_LENGTH];
-+
-   if (in_len < 0 || out_len < 0)
-     return 0;
- 
-   if (out_len > CMAC128_DIGEST_SIZE)
-     out_len = CMAC128_DIGEST_SIZE;
- 
-+  assert(CMAC128_DIGEST_SIZE <= sizeof (buf));
-+
-   switch (inst->key_length) {
-     case AES128_KEY_SIZE:
-       cmac_aes128_update(&inst->context.aes128, in_len, in);
--      cmac_aes128_digest(&inst->context.aes128, out_len, out);
-+      cmac_aes128_digest(&inst->context.aes128,
-+#if NETTLE_VERSION_MAJOR < 4
-+                         CMAC128_DIGEST_SIZE,
-+#endif
-+                         buf);
-       break;
-     case AES256_KEY_SIZE:
-       cmac_aes256_update(&inst->context.aes256, in_len, in);
--      cmac_aes256_digest(&inst->context.aes256, out_len, out);
-+      cmac_aes256_digest(&inst->context.aes256,
-+#if NETTLE_VERSION_MAJOR < 4
-+                         CMAC128_DIGEST_SIZE,
-+#endif
-+                         buf);
-       break;
-     default:
-       assert(0);
-   }
- 
-+  memcpy(out, buf, out_len);
-+
-   return out_len;
- }
- 
-diff --git a/configure b/configure
-index 1c254435..a98e2e98 100755
---- a/configure
-+++ b/configure
-@@ -911,7 +911,7 @@ HASH_LINK=""
- if [ $feat_sechash = "1" ] && [ "x$HASH_LINK" = "x" ]  && [ $try_nettle = 
"1" ]; then
-   test_cflags="`pkg_config --cflags nettle`"
-   test_link="`pkg_config --libs nettle`"
--  if test_code 'nettle' 'nettle/nettle-meta.h nettle/sha2.h' \
-+  if test_code 'nettle' 'nettle/nettle-meta.h nettle/sha2.h 
nettle/version.h' \
-     "$test_cflags" "$test_link" \
-     'return nettle_hashes[0]->context_size;'
-   then
-diff --git a/hash_nettle.c b/hash_nettle.c
-index 4a214f6e..d6dee58b 100644
---- a/hash_nettle.c
-+++ b/hash_nettle.c
-@@ -30,6 +30,7 @@
- #include "sysincl.h"
- 
- #include <nettle/nettle-meta.h>
-+#include <nettle/version.h>
- 
- #include "hash.h"
- #include "memory.h"
-@@ -91,6 +92,7 @@ int
- HSH_Hash(int id, const void *in1, int in1_len, const void *in2, int in2_len,
-          unsigned char *out, int out_len)
- {
-+  unsigned char buf[MAX_HASH_LENGTH];
-   const struct nettle_hash *hash;
-   void *context;
- 
-@@ -103,11 +105,20 @@ HSH_Hash(int id, const void *in1, int in1_len, const 
void *in2, int in2_len,
-   if (out_len > hash->digest_size)
-     out_len = hash->digest_size;
- 
-+  if (hash->digest_size > sizeof (buf))
-+    return 0;
-+
-   hash->init(context);
-   hash->update(context, in1_len, in1);
-   if (in2)
-     hash->update(context, in2_len, in2);
--  hash->digest(context, out_len, out);
-+  hash->digest(context,
-+#if NETTLE_VERSION_MAJOR < 4
-+               hash->digest_size,
-+#endif
-+               buf);
-+
-+  memcpy(out, buf, out_len);
- 
-   return out_len;
- }
--- 
-GitLab
-