public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chrony] rawhide: Use gnutls for crypto on RHEL
@ 2026-09-17  7:00 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-17  7:00 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/chrony
            Branch : rawhide
            Commit : 9de8c668e8f195bf349c1637962dd537a3098d1e
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-09-17T08:54:00+02:00
            Stats  : +13/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/chrony/c/9de8c668e8f195bf349c1637962dd537a3098d1e?branch=rawhide

            Log:
            Use gnutls for crypto on RHEL

gnutls is already used for NTS, and standalone nettle is not supported with
FIPS on RHEL.

https://gitlab.com/redhat/centos-stream/rpms/chrony/-/commit/39012d846a324ae0d1e73782db3b32c20825a983
https://gitlab.com/redhat/centos-stream/rpms/chrony/-/commit/25ee86e7465d4f60e521b2b549b9746b27ba4985

---
diff --git a/chrony.spec b/chrony.spec
index 31a3835..11a8de2 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -3,13 +3,17 @@
 %bcond_without debug
 %bcond_without nts
 
+%if ! 0%{?rhel}
+%bcond_without nettle
+%endif
+
 %ifarch %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
 %bcond_without seccomp
 %endif
 
 Name:           chrony
 Version:        4.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An NTP client/server
 
 License:        GPL-2.0-only
@@ -26,8 +30,10 @@ Source10:       https://gitlab.com/chrony/clknetsim/-/archive/%{clknetsim_ver}/c
 # add distribution-specific bits to DHCP dispatcher
 Patch1:         chrony-nm-dispatcher-dhcp.patch
 
-BuildRequires:  libcap-devel libedit-devel nettle-devel pps-tools-devel
+BuildRequires:  libcap-devel libedit-devel pps-tools-devel
 BuildRequires:  gcc gcc-c++ make bison systemd gnupg2
+%{?with_nettle:BuildRequires: nettle-devel}
+%{!?with_nettle:BuildRequires: gnutls-devel}
 %{?with_nts:BuildRequires: gnutls-devel gnutls-utils}
 %{?with_seccomp:BuildRequires: libseccomp-devel}
 
@@ -107,7 +113,8 @@ mv clknetsim-%{clknetsim_ver} test/simulation/clknetsim
         --with-user=chrony \
         --with-hwclockfile=%{_sysconfdir}/adjtime \
         --with-pidfile=/run/chrony/chronyd.pid \
-        --with-sendmail=%{_sbindir}/sendmail
+        --with-sendmail=%{_sbindir}/sendmail \
+%{!?with_nettle: --without-nettle}
 %make_build
 
 %install
@@ -206,6 +213,9 @@ fi
 %ghost %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Thu Aug 27 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 4.9-2
+- Use gnutls for crypto on RHEL
+
 * Thu Aug 27 2026 Miroslav Lichvar <mlichvar@redhat.com> 4.9-1
 - update to 4.9
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-17  7:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17  7:00 [rpms/chrony] rawhide: Use gnutls for crypto on RHEL Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox