[packages/chrony] - updated to 4.8, allow build with nettle 4.x
qboosh
qboosh at pld-linux.org
Fri May 22 06:28:04 CEST 2026
commit 141f78d50f808aa49b8a0a85cf8575f60e699ab0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri May 22 06:28:04 2026 +0200
- updated to 4.8, allow build with nettle 4.x
chrony-nettle4.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
chrony.spec | 6 ++++--
2 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/chrony.spec b/chrony.spec
index 3623001..0955850 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -3,12 +3,12 @@
Summary: An NTP client/server
Summary(pl.UTF-8): Klient/serwer NTP
Name: chrony
-Version: 4.7
+Version: 4.8
Release: 1
License: GPL v2
Group: Daemons
Source0: https://chrony-project.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: a1ab6e972527a9cbf6bf862679352ed3
+# Source0-md5: 0ad862b6d40b84abe145b13d9f1d8025
Source1: %{name}.conf
Source2: %{name}.keys
Source3: %{name}d.sysconfig
@@ -16,6 +16,7 @@ Source4: %{name}d.init
Source5: %{name}.logrotate
Patch0: fix-seccomp-build.patch
Patch1: conf.d.patch
+Patch2: %{name}-nettle4.patch
URL: https://chrony-project.org/
BuildRequires: asciidoc
BuildRequires: bison
@@ -65,6 +66,7 @@ Internetu, obsługuje także komputery na stałym łączu.
%setup -q
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
%build
# NOTE: It is not autoconf generated configre
diff --git a/chrony-nettle4.patch b/chrony-nettle4.patch
new file mode 100644
index 0000000..d2d61e8
--- /dev/null
+++ b/chrony-nettle4.patch
@@ -0,0 +1,52 @@
+--- chrony-4.8/cmac_nettle.c.orig 2026-05-21 22:25:14.426837855 +0200
++++ chrony-4.8/cmac_nettle.c 2026-05-21 22:26:57.756278071 +0200
+@@ -29,6 +29,7 @@
+
+ #include "sysincl.h"
+
++#include <nettle/version.h>
+ #include <nettle/cmac.h>
+
+ #include "cmac.h"
+@@ -95,11 +96,19 @@ CMC_Hash(CMC_Instance inst, const void *
+ switch (inst->key_length) {
+ case AES128_KEY_SIZE:
+ cmac_aes128_update(&inst->context.aes128, in_len, in);
++#if NETTLE_VERSION_MAJOR < 4
+ cmac_aes128_digest(&inst->context.aes128, out_len, out);
++#else
++ cmac_aes128_digest(&inst->context.aes128, out);
++#endif
+ break;
+ case AES256_KEY_SIZE:
+ cmac_aes256_update(&inst->context.aes256, in_len, in);
++#if NETTLE_VERSION_MAJOR < 4
+ cmac_aes256_digest(&inst->context.aes256, out_len, out);
++#else
++ cmac_aes256_digest(&inst->context.aes256, out);
++#endif
+ break;
+ default:
+ assert(0);
+--- chrony-4.8/hash_nettle.c.orig 2026-05-22 06:24:06.004518870 +0200
++++ chrony-4.8/hash_nettle.c 2026-05-22 06:24:36.031022869 +0200
+@@ -30,6 +30,7 @@
+ #include "sysincl.h"
+
+ #include <nettle/nettle-meta.h>
++#include <nettle/version.h>
+
+ #include "hash.h"
+ #include "memory.h"
+@@ -107,7 +108,11 @@ HSH_Hash(int id, const void *in1, int in
+ hash->update(context, in1_len, in1);
+ if (in2)
+ hash->update(context, in2_len, in2);
++#if NETTLE_VERSION_MAJOR < 4
+ hash->digest(context, out_len, out);
++#else
++ hash->digest(context, out);
++#endif
+
+ return out_len;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chrony.git/commitdiff/141f78d50f808aa49b8a0a85cf8575f60e699ab0
More information about the pld-cvs-commit
mailing list