From 50c14a755c73e7f948155306d984f784d5415a27 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 02:04:32 -0500 Subject: [PATCH] import chrony-4.2-1.el9 --- .chrony.metadata | 3 + .gitignore | 3 + SOURCES/chrony-4.2-tar-gz-asc.txt | 16 + SOURCES/chrony-nm-dispatcher-dhcp.patch | 182 +++++++ SOURCES/chrony-seccomp.patch | 31 ++ SOURCES/chrony-services.patch | 38 ++ SOURCES/chrony.dhclient | 27 + SPECS/chrony.spec | 667 ++++++++++++++++++++++++ 8 files changed, 967 insertions(+) create mode 100644 .chrony.metadata create mode 100644 .gitignore create mode 100644 SOURCES/chrony-4.2-tar-gz-asc.txt create mode 100644 SOURCES/chrony-nm-dispatcher-dhcp.patch create mode 100644 SOURCES/chrony-seccomp.patch create mode 100644 SOURCES/chrony-services.patch create mode 100644 SOURCES/chrony.dhclient create mode 100644 SPECS/chrony.spec diff --git a/.chrony.metadata b/.chrony.metadata new file mode 100644 index 0000000..40fb2fc --- /dev/null +++ b/.chrony.metadata @@ -0,0 +1,3 @@ +0f5de043b395311a58bcf4be9800f7118afd5f59 SOURCES/chrony-4.2.tar.gz +2e1fac8161ea8d92d76532c0b272fb31799bc310 SOURCES/clknetsim-824c48.tar.gz +1395afa521d2e3302a31083edcf568bbc036aafc SOURCES/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..65f6088 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +SOURCES/chrony-4.2.tar.gz +SOURCES/clknetsim-824c48.tar.gz +SOURCES/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc diff --git a/SOURCES/chrony-4.2-tar-gz-asc.txt b/SOURCES/chrony-4.2-tar-gz-asc.txt new file mode 100644 index 0000000..23c7755 --- /dev/null +++ b/SOURCES/chrony-4.2-tar-gz-asc.txt @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmG7LoQACgkQU34rdvdo +Daw47w//fpF3YlqSJWQObHv/hMC6EGQSX6hRVzckXgzq7PFN2HaTX1iZV2UsP1KN +NtXfH3V7PxTdT4jT41bHUw++vN0HXkaAw3ccbm31MVTc353JFv5VUKT/OtK+I8dZ +CKGDy7X4REET7rCYTEfhgvAwjisIlc81xFq9fMYiGasj2LXZD9GUFHqu0JzvvyMz +R0PNGDSYaJX5Ex1GtbgULjDJNF0FRDE+T6SBjs8Xlej020DbNRb4MNZitzygMNum +ChN2MltzEccw/UegrsaN1UYQG2C4/Xgdjeqfa4ioiewBL0/79oPkNyJT0GCtOIUM +TCAdDRrwLuh7d3+Hl6szy8FxKRFN4s/TTjSTinwDCaexqqNgKeSRkJPFWPWhq4l1 +2W+hh5cYtToP4wYNpFdadz+LJYrRzYEtAKdFMegYt2Q/MMVtsNji4qeJ/VOnyrUI +cJD6sWqDtrUQnegVky1QDwKIYLzO+h6kDaTEm7ZhaT3pR4gGC47umPR9HAcgch0/ +QdmHd1dP1rutDdpiGmXRicvSV48M1Ol6AAs7rUERuQGJ4Tl/zoMGWmN93UQEpisS +9L1PBNdAjdutJaZKA3Bgq49BOPzcRGvhamH63fO5Q+h6uXCzxd9s8MDeY8wh3Idn +2aHcGnx32z3DNbpG/nXtKE3GeiSDbw6FmN4KUmKKBR552lCcgpA= +=F4BS +-----END PGP SIGNATURE----- diff --git a/SOURCES/chrony-nm-dispatcher-dhcp.patch b/SOURCES/chrony-nm-dispatcher-dhcp.patch new file mode 100644 index 0000000..d424737 --- /dev/null +++ b/SOURCES/chrony-nm-dispatcher-dhcp.patch @@ -0,0 +1,182 @@ +commit 5bd13c8d593a74ad168057efe94dd2b3aeeffe14 +Author: Miroslav Lichvar +Date: Mon Feb 7 13:27:25 2022 +0100 + + examples: support DHCPv6 NTP servers in NM dispatcher script + + Latest NetworkManager code provides NTP servers from the DHCPv6 NTP + option (RFC 5908) in the DHCP6_DHCP6_NTP_SERVERS variable to dispatcher + scripts. + + Check for invalid characters (which can come from the FQDN suboption) + and include the servers in the interface-specific sources file. + +diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp +index 6ea4c370..4454f037 100644 +--- a/examples/chrony.nm-dispatcher.dhcp ++++ b/examples/chrony.nm-dispatcher.dhcp +@@ -1,8 +1,7 @@ + #!/bin/sh + # This is a NetworkManager dispatcher script for chronyd to update +-# its NTP sources passed from DHCP options. Note that this script is +-# specific to NetworkManager-dispatcher due to use of the +-# DHCP4_NTP_SERVERS environment variable. ++# its NTP sources with servers from DHCP options passed by NetworkManager ++# in the DHCP4_NTP_SERVERS and DHCP6_DHCP6_NTP_SERVERS environment variables. + + export LC_ALL=C + +@@ -10,17 +9,19 @@ interface=$1 + action=$2 + + chronyc=/usr/bin/chronyc +-default_server_options=iburst ++server_options=iburst + server_dir=/var/run/chrony-dhcp + + dhcp_server_file=$server_dir/$interface.sources +-# DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager. +-nm_dhcp_servers=$DHCP4_NTP_SERVERS ++dhcp_ntp_servers="$DHCP4_NTP_SERVERS $DHCP6_DHCP6_NTP_SERVERS" + + add_servers_from_dhcp() { + rm -f "$dhcp_server_file" +- for server in $nm_dhcp_servers; do +- echo "server $server $default_server_options" >> "$dhcp_server_file" ++ for server in $dhcp_ntp_servers; do ++ # Check for invalid characters (from the DHCPv6 NTP FQDN suboption) ++ printf '%s\n' "$server" | grep -E -q '^[-A-Za-z0-9:.]{1,255}$' || continue ++ ++ printf 'server %s %s\n' "$server" "$server_options" >> "$dhcp_server_file" + done + $chronyc reload sources > /dev/null 2>&1 || : + } +@@ -34,10 +35,11 @@ clear_servers_from_dhcp() { + + mkdir -p $server_dir + +-if [ "$action" = "up" ] || [ "$action" = "dhcp4-change" ]; then +- add_servers_from_dhcp +-elif [ "$action" = "down" ]; then +- clear_servers_from_dhcp +-fi ++case "$action" in ++ up|dhcp4-change|dhcp6-change) ++ add_servers_from_dhcp;; ++ down) ++ clear_servers_from_dhcp;; ++esac + + exit 0 + +commit e55f174bd3a7ae82fb24afd43443d0b55d5536cf +Author: Miroslav Lichvar +Date: Mon Feb 7 13:27:48 2022 +0100 + + examples: handle more actions in NM dispatcher script + + Run the chronyc onoffline command also when the connectivity-change + and dhcp6-change actions are reported by the NetworkManager dispatcher. + + The latter should not be necessary, but there currently doesn't seem to + be any action for IPv6 becoming routable after duplicate address + detection, so at least in networks using DHCPv6, IPv6 NTP servers should + not be stuck in the offline state from a previously reported action. + +diff --git a/examples/chrony.nm-dispatcher.onoffline b/examples/chrony.nm-dispatcher.onoffline +index 34cfa0db..01e6fdb1 100644 +--- a/examples/chrony.nm-dispatcher.onoffline ++++ b/examples/chrony.nm-dispatcher.onoffline +@@ -7,8 +7,18 @@ export LC_ALL=C + + chronyc=/usr/bin/chronyc + +-# For NetworkManager consider only up/down events +-[ $# -ge 2 ] && [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0 ++# For NetworkManager consider only selected events ++if [ $# -ge 2 ]; then ++ case "$2" in ++ up|down|connectivity-change) ++ ;; ++ dhcp6-change) ++ # No other action is reported for routable IPv6 ++ ;; ++ *) ++ exit 0;; ++ esac ++fi + + # Note: for networkd-dispatcher routable.d ~= on and off.d ~= off + +commit fca8966adaaf8376536af86ba2afe02501463588 +Author: Miroslav Lichvar +Date: Wed Mar 23 15:17:03 2022 +0100 + + examples: replace grep command in NM dispatcher script + + Some grep implementations detect binary data and return success without + matching whole line. This might be an issue for the DHCPv6 NTP FQDN + check. The GNU grep in the C locale seems to check only for the NUL + character, which cannot be passed in an environment variable, but other + implementations might behave differently and there doesn't seem to be a + portable way to force matching the whole line. + + Instead of the grep command, check for invalid characters by comparing + the length of the input passed through "tr -d -c". + +diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp +index 4454f037..547ce83f 100644 +--- a/examples/chrony.nm-dispatcher.dhcp ++++ b/examples/chrony.nm-dispatcher.dhcp +@@ -19,7 +19,11 @@ add_servers_from_dhcp() { + rm -f "$dhcp_server_file" + for server in $dhcp_ntp_servers; do + # Check for invalid characters (from the DHCPv6 NTP FQDN suboption) +- printf '%s\n' "$server" | grep -E -q '^[-A-Za-z0-9:.]{1,255}$' || continue ++ len1=$(printf '%s' "$server" | wc -c) ++ len2=$(printf '%s' "$server" | tr -d -c 'A-Za-z0-9:.-' | wc -c) ++ if [ "$len1" -ne "$len2" ] || [ "$len2" -lt 1 ] || [ "$len2" -gt 255 ]; then ++ continue ++ fi + + printf 'server %s %s\n' "$server" "$server_options" >> "$dhcp_server_file" + done +From: Robert Fairley +Date: Wed, 17 Jun 2020 10:14:19 -0400 +Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig + +Use the PEERNTP and NTPSERVERARGS environment variables from +/etc/sysconfig/network{-scripts}. + +Co-Authored-By: Christian Glombek + +diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp +index 6ea4c37..a6ad35a 100644 +--- a/examples/chrony.nm-dispatcher.dhcp ++++ b/examples/chrony.nm-dispatcher.dhcp +@@ -8,15 +8,23 @@ export LC_ALL=C + interface=$1 + action=$2 + ++[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network ++[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \ ++ . /etc/sysconfig/network-scripts/ifcfg-"${interface}" ++ + chronyc=/usr/bin/chronyc +-server_options=iburst +-server_dir=/var/run/chrony-dhcp ++server_options=${NTPSERVERARGS:-iburst} ++server_dir=/run/chrony-dhcp + + dhcp_server_file=$server_dir/$interface.sources + dhcp_ntp_servers="$DHCP4_NTP_SERVERS $DHCP6_DHCP6_NTP_SERVERS" + + add_servers_from_dhcp() { + rm -f "$dhcp_server_file" ++ ++ # Don't add NTP servers if PEERNTP=no specified; return early. ++ [ "$PEERNTP" = "no" ] && return ++ + for server in $dhcp_ntp_servers; do + # Check for invalid characters (from the DHCPv6 NTP FQDN suboption) + len1=$(printf '%s' "$server" | wc -c) diff --git a/SOURCES/chrony-seccomp.patch b/SOURCES/chrony-seccomp.patch new file mode 100644 index 0000000..523759c --- /dev/null +++ b/SOURCES/chrony-seccomp.patch @@ -0,0 +1,31 @@ +commit 8bb8f15a7d049ed26c69d95087065b381f76ec4d +Author: Michael Hudson-Doyle +Date: Wed Feb 9 09:06:13 2022 +0100 + + sys_linux: allow rseq in seccomp filter + + Libc 2.35 will use rseq syscalls [1][2] by default and thereby + break chrony in seccomp isolation. + + [1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ + [2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html + + Tested-by: Christian Ehrhardt + Reviewed-by: Christian Ehrhardt + Signed-off-by: Michael Hudson-Doyle + Signed-off-by: Christian Ehrhardt + +diff --git a/sys_linux.c b/sys_linux.c +index 9cab2efa..cc3c9311 100644 +--- a/sys_linux.c ++++ b/sys_linux.c +@@ -497,6 +497,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(getrlimit), + SCMP_SYS(getuid), + SCMP_SYS(getuid32), ++#ifdef __NR_rseq ++ SCMP_SYS(rseq), ++#endif + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigreturn), + SCMP_SYS(rt_sigprocmask), diff --git a/SOURCES/chrony-services.patch b/SOURCES/chrony-services.patch new file mode 100644 index 0000000..262bf67 --- /dev/null +++ b/SOURCES/chrony-services.patch @@ -0,0 +1,38 @@ +diff -up chrony-4.2/examples/chronyd.service.services chrony-4.2/examples/chronyd.service +--- chrony-4.2/examples/chronyd.service.services 2021-12-16 13:17:42.000000000 +0100 ++++ chrony-4.2/examples/chronyd.service 2022-01-19 13:55:59.066677473 +0100 +@@ -32,8 +32,7 @@ ProtectKernelLogs=yes + ProtectKernelModules=yes + ProtectKernelTunables=yes + ProtectProc=invisible +-ProtectSystem=strict +-ReadWritePaths=/run /var/lib/chrony -/var/log ++ProtectSystem=full + RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX + RestrictNamespaces=yes + RestrictSUIDSGID=yes +@@ -42,7 +41,6 @@ SystemCallFilter=~@cpu-emulation @debug + + # Adjust restrictions for /usr/sbin/sendmail (mailonchange directive) + NoNewPrivileges=no +-ReadWritePaths=-/var/spool + RestrictAddressFamilies=AF_NETLINK + + [Install] + +Avoid a SELinux issue + +diff --git a/examples/chrony-wait.service b/examples/chrony-wait.service +index 72b028f2..57646950 100644 +--- a/examples/chrony-wait.service ++++ b/examples/chrony-wait.service +@@ -18,7 +18,7 @@ StandardOutput=null + + CapabilityBoundingSet= + DevicePolicy=closed +-DynamicUser=yes ++#DynamicUser=yes + IPAddressAllow=localhost + IPAddressDeny=any + LockPersonality=yes + diff --git a/SOURCES/chrony.dhclient b/SOURCES/chrony.dhclient new file mode 100644 index 0000000..3fe9e92 --- /dev/null +++ b/SOURCES/chrony.dhclient @@ -0,0 +1,27 @@ +#!/bin/bash + +CHRONY_SOURCEDIR=/run/chrony-dhcp +SERVERFILE=$CHRONY_SOURCEDIR/$interface.sources + +chrony_config() { + # Disable modifications if called from a NM dispatcher script + [ -n "$NM_DISPATCHER_ACTION" ] && return 0 + + rm -f "$SERVERFILE" + if [ "$PEERNTP" != "no" ]; then + mkdir -p $CHRONY_SOURCEDIR + for server in $new_ntp_servers; do + echo "server $server ${NTPSERVERARGS:-iburst}" >> "$SERVERFILE" + done + /usr/bin/chronyc reload sources > /dev/null 2>&1 || : + fi +} + +chrony_restore() { + [ -n "$NM_DISPATCHER_ACTION" ] && return 0 + + if [ -f "$SERVERFILE" ]; then + rm -f "$SERVERFILE" + /usr/bin/chronyc reload sources > /dev/null 2>&1 || : + fi +} diff --git a/SPECS/chrony.spec b/SPECS/chrony.spec new file mode 100644 index 0000000..3525920 --- /dev/null +++ b/SPECS/chrony.spec @@ -0,0 +1,667 @@ +%global _hardened_build 1 +%global clknetsim_ver 824c48 +%bcond_without debug +%bcond_without nts + +%ifarch %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x +%bcond_without seccomp +%endif + +Name: chrony +Version: 4.2 +Release: 1%{?dist} +Summary: An NTP client/server + +License: GPLv2 +URL: https://chrony.tuxfamily.org +Source0: https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}.tar.gz +Source1: https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}-tar-gz-asc.txt +Source2: https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc +Source3: chrony.dhclient +# simulator for test suite +Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz +%{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz} + +# add IPv6 support and distribution-specific bits to DHCP dispatcher +Patch1: chrony-nm-dispatcher-dhcp.patch +# update seccomp filter for new glibc +Patch2: chrony-seccomp.patch +# revert some hardening options in service files +Patch3: chrony-services.patch + +BuildRequires: gnutls-devel libcap-devel libedit-devel pps-tools-devel +BuildRequires: gcc gcc-c++ make bison systemd gnupg2 +%{?with_nts:BuildRequires: gnutls-utils} +%{?with_seccomp:BuildRequires: libseccomp-devel} + +Requires(pre): shadow-utils +%{?systemd_requires} + +# Old NetworkManager expects the dispatcher scripts in a different place +Conflicts: NetworkManager < 1.20 + +# suggest drivers for hardware reference clocks +Suggests: ntp-refclock + +%description +chrony is a versatile implementation of the Network Time Protocol (NTP). +It can synchronise the system clock with NTP servers, reference clocks +(e.g. GPS receiver), and manual input using wristwatch and keyboard. It +can also operate as an NTPv4 (RFC 5905) server and peer to provide a time +service to other computers in the network. + +%if 0%{!?vendorzone:1} +%global vendorzone %(source /etc/os-release && echo ${ID}.) +%endif + +%prep +%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0} +%setup -q -n %{name}-%{version}%{?prerelease} -a 10 +%{?gitpatch:%patch0 -p1} +%patch1 -p1 -b .nm-dispatcher-dhcp +%patch2 -p1 -b .seccomp +%patch3 -p1 -b .services + +%{?gitpatch: echo %{version}-%{gitpatch} > version.txt} + +# review changes in packaged configuration files and scripts +md5sum -c <<-EOF | (! grep -v 'OK$') + 222e652b95027289877fa77146d3b9b1 examples/chrony-wait.service + 2d01b94bc1a7b7fb70cbee831488d121 examples/chrony.conf.example2 + 96999221eeef476bd49fe97b97503126 examples/chrony.keys.example + 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate + c3992e2f985550739cd1cd95f98c9548 examples/chrony.nm-dispatcher.dhcp + 2b81c60c020626165ac655b2633608eb examples/chrony.nm-dispatcher.onoffline + 619dd00009ea312c7201beefde10341a examples/chronyd.service +EOF + +# don't allow packaging without vendor zone +test -n "%{vendorzone}" + +# use example chrony.conf as the default config with some modifications: +# - use our vendor zone (2.*pool.ntp.org names include IPv6 addresses) +# - enable leapsectz to get TAI-UTC offset and leap seconds from tzdata +# - enable keyfile +# - use NTP servers from DHCP +sed -e 's|^\(pool \)\(pool.ntp.org\)|\12.%{vendorzone}\2|' \ + -e 's|#\(leapsectz\)|\1|' \ + -e 's|#\(keyfile\)|\1|' \ + -e 's|^pool.*pool.ntp.org.*|&\n\n# Use NTP servers from DHCP.\nsourcedir /run/chrony-dhcp|' \ + < examples/chrony.conf.example2 > chrony.conf + +touch -r examples/chrony.conf.example2 chrony.conf + +# regenerate the file from getdate.y +rm -f getdate.c + +mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim + +%build +%configure \ +%{?with_debug: --enable-debug} \ + --enable-ntp-signd \ +%{?with_seccomp: --enable-scfilter} \ +%{!?with_nts: --disable-nts} \ + --chronyrundir=/run/chrony \ + --docdir=%{_docdir} \ + --with-ntp-era=$(date -d '1970-01-01 00:00:00+00:00' +'%s') \ + --with-user=chrony \ + --with-hwclockfile=%{_sysconfdir}/adjtime \ + --with-pidfile=/run/chrony/chronyd.pid \ + --with-sendmail=%{_sbindir}/sendmail \ + --without-nettle \ + --without-nss \ + --without-tomcrypt +%make_build + +%install +%make_install + +rm -rf $RPM_BUILD_ROOT%{_docdir} + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,logrotate.d} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d +mkdir -p $RPM_BUILD_ROOT{%{_unitdir},%{_prefix}/lib/systemd/ntp-units.d} + +install -m 644 -p chrony.conf $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf + +install -m 640 -p examples/chrony.keys.example \ + $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys +install -m 755 -p %{SOURCE3} \ + $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d/chrony.sh +install -m 644 -p examples/chrony.logrotate \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/chrony + +install -m 644 -p examples/chronyd.service \ + $RPM_BUILD_ROOT%{_unitdir}/chronyd.service +install -m 755 -p examples/chrony.nm-dispatcher.onoffline \ + $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-onoffline +install -m 755 -p examples/chrony.nm-dispatcher.dhcp \ + $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-dhcp +install -m 644 -p examples/chrony-wait.service \ + $RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service + +cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd < \ + $RPM_BUILD_ROOT%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list + +%check +# set random seed to get deterministic results +export CLKNETSIM_RANDOM_SEED=24505 +%make_build -C test/simulation/clknetsim +make quickcheck + +%pre +getent group chrony > /dev/null || /usr/sbin/groupadd -r chrony +getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \ + -d %{_localstatedir}/lib/chrony -s /sbin/nologin chrony +: + +%post +# migrate from chrony-helper to sourcedir directive +if test -a %{_libexecdir}/chrony-helper; then + grep -qi 'sourcedir /run/chrony-dhcp$' %{_sysconfdir}/chrony.conf 2> /dev/null || \ + echo -e '\n# Use NTP servers from DHCP.\nsourcedir /run/chrony-dhcp' >> \ + %{_sysconfdir}/chrony.conf + mkdir -p /run/chrony-dhcp + for f in %{_localstatedir}/lib/dhclient/chrony.servers.*; do + sed 's|.*|server &|' < $f > /run/chrony-dhcp/"${f##*servers.}.sources" + done 2> /dev/null +fi +%systemd_post chronyd.service chrony-wait.service + +%preun +%systemd_preun chronyd.service chrony-wait.service + +%postun +%systemd_postun_with_restart chronyd.service + +%files +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc FAQ NEWS README +%config(noreplace) %{_sysconfdir}/chrony.conf +%config(noreplace) %verify(not md5 size mtime) %attr(640,root,chrony) %{_sysconfdir}/chrony.keys +%config(noreplace) %{_sysconfdir}/logrotate.d/chrony +%config(noreplace) %{_sysconfdir}/sysconfig/chronyd +%{_sysconfdir}/dhcp/dhclient.d/chrony.sh +%{_bindir}/chronyc +%{_sbindir}/chronyd +%{_prefix}/lib/NetworkManager +%{_prefix}/lib/systemd/ntp-units.d/*.list +%{_unitdir}/chrony*.service +%{_mandir}/man[158]/%{name}*.[158]* +%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony +%ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift +%ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/rtc +%dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony + +%changelog +* Wed Mar 23 2022 Miroslav Lichvar 4.2-1 +- update to 4.2 (#2051441) +- fully switch from nettle to gnutls (#1953463 #1954483) +- use NTP servers from DHCPv6 NTP server option (#2047415) +- drop obsolete workaround in scriptlet + +* Tue Aug 10 2021 Miroslav Lichvar 4.1-3 +- update seccomp filter for new glibc (#1990589) +- remove unnecessary build requirement + +* Mon Aug 09 2021 Mohan Boddu - 4.1-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu May 13 2021 Miroslav Lichvar 4.1-1 +- update to 4.1 +- enable seccomp filter by default (incompatible with mailonchange directive) + +* Thu Apr 22 2021 Miroslav Lichvar 4.1-0.1.pre1 +- update to 4.1-pre1 +- rework NM-dispatcher/dhclient detection +- enable LTO on s390x + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.0-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Feb 02 2021 Miroslav Lichvar 4.0-3 +- update NM DHCP dispatcher script + +* Tue Jan 26 2021 Fedora Release Engineering - 4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +- Add BuildRequires: make +- drop dnssrv service and timer + +* Wed Oct 07 2020 Miroslav Lichvar 4.0-1 +- update to 4.0 +- update directory permissions to follow upstream + +* Wed Sep 16 2020 Miroslav Lichvar 4.0-0.9.pre4 +- update to 4.0-pre4 + +* Wed Aug 26 2020 Miroslav Lichvar 4.0-0.8.pre3 +- update to 4.0-pre3 +- switch to sourcedir directive for loading servers from DHCP +- add NetworkManager dispatcher script to save servers from DHCP when + dhclient is not installed (Robert Fairley) +- drop old migration code from scriptlet +- move default paths in /var/run to /run + +* Mon Aug 10 2020 Jeff Law - 4.0-0.7.pre2 +- Disable LTO on s390x + +* Sat Aug 01 2020 Fedora Release Engineering - 4.0-0.6.pre2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 4.0-0.5.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard 4.0-0.4.pre2 +- use make macros + +* Mon May 04 2020 Miroslav Lichvar 4.0-0.3.pre2 +- rebuild for new nettle + +* Mon Apr 20 2020 Miroslav Lichvar 4.0-0.2.pre2 +- update to 4.0-pre2 + +* Tue Mar 17 2020 Miroslav Lichvar 4.0-0.1.pre1 +- update to 4.0-pre1 +- add net-tools to build requirements for testing +- add missing dependency on coreutils + +* Tue Jan 28 2020 Fedora Release Engineering - 3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Miroslav Lichvar 3.5-7 +- fix testing with new glibc (#1792854) + +* Wed Oct 09 2019 Miroslav Lichvar 3.5-6 +- drop timedatex recommendation +- verify upstream signatures + +* Thu Aug 22 2019 Lubomir Rintel - 3.5-5 +- Move the NetworkManager dispatcher script out of /etc + +* Wed Jul 24 2019 Fedora Release Engineering - 3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 16 2019 Miroslav Lichvar 3.5-3 +- rebuild for new nettle + +* Thu May 23 2019 Miroslav Lichvar 3.5-2 +- fix shellcheck warnings in helper scripts + +* Tue May 14 2019 Miroslav Lichvar 3.5-1 +- update to 3.5 + +* Thu May 02 2019 Miroslav Lichvar 3.5-0.1.pre1 +- update to 3.5-pre1 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Sep 19 2018 Miroslav Lichvar 3.4-1 +- update to 3.4 + +* Fri Aug 31 2018 Miroslav Lichvar 3.4-0.1.pre1 +- update to 3.4-pre1 + +* Mon Aug 13 2018 Miroslav Lichvar 3.3-5 +- fix PIDFile in local chronyd.service on upgrades from chrony < 3.3-2 +- add workaround for late reload of unit file (#1614751) + +* Mon Jul 16 2018 Miroslav Lichvar 3.3-4 +- add gcc-c++ to build requirements + +* Thu Jul 12 2018 Fedora Release Engineering - 3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miroslav Lichvar 3.3-2 +- move pidfile to /var/run/chrony to allow chronyd to remove it on exit +- avoid blocking in getrandom system call + +* Wed Apr 04 2018 Miroslav Lichvar 3.3-1 +- update to 3.3 +- enable keyfile by default again + +* Thu Mar 15 2018 Miroslav Lichvar 3.3-0.1.pre1 +- update to 3.3-pre1 +- switch to nettle for crypto hashing +- add gcc to build requirements + +* Wed Feb 07 2018 Fedora Release Engineering - 3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 30 2018 Miroslav Lichvar 3.2-3 +- use systemd macro for scriptlet dependencies + +* Thu Jan 25 2018 Miroslav Lichvar 3.2-2 +- fix chronyc getting stuck in infinite loop after clock step +- don't allow packaging without vendor zone +- suggest ntp-refclock +- remove obsolete dependency +- update description + +* Fri Sep 15 2017 Miroslav Lichvar 3.2-1 +- update to 3.2 +- get TAI-UTC offset and leap seconds from tzdata by default + +* Tue Aug 29 2017 Miroslav Lichvar 3.2-0.4.pre2 +- update to 3.2-pre2 + +* Wed Aug 02 2017 Fedora Release Engineering - 3.2-0.3.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2-0.2.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jul 25 2017 Miroslav Lichvar 3.2-0.1.pre1 +- update to 3.2-pre1 + +* Thu May 04 2017 Miroslav Lichvar 3.1-5 +- check PEERNTP variable before loading existing dhclient files + +* Thu Apr 20 2017 Miroslav Lichvar 3.1-4 +- use ID from /etc/os-release to set pool.ntp.org vendor zone (#1443599) +- fix seccomp filter for new glibc once again +- don't drop PHC samples with zero delay + +* Mon Mar 13 2017 Miroslav Lichvar 3.1-3 +- fix seccomp filter for new glibc + +* Fri Feb 10 2017 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Miroslav Lichvar 3.1-1 +- update to 3.1 +- enable seccomp support on more archs +- package chronyd sysconfig file + +* Tue Jan 24 2017 Miroslav Lichvar 3.1-0.1.pre1 +- update to 3.1-pre1 + +* Mon Jan 16 2017 Miroslav Lichvar 3.0-1 +- update to 3.0 + +* Fri Jan 06 2017 Miroslav Lichvar 3.0-0.3.pre3 +- update to 3.0-pre3 + +* Thu Dec 15 2016 Miroslav Lichvar 3.0-0.2.pre2 +- update to 3.0-pre2 +- enable support for MS-SNTP authentication in Samba + +* Fri Dec 09 2016 Miroslav Lichvar 3.0-0.1.pre1 +- update to 3.0-pre1 + +* Mon Nov 21 2016 Miroslav Lichvar 2.4.1-1 +- update to 2.4.1 + +* Thu Oct 27 2016 Miroslav Lichvar 2.4-4 +- avoid AVC denials in chrony-wait service (#1350815) + +* Tue Sep 13 2016 Miroslav Lichvar 2.4-3 +- fix chrony-helper to escape names of systemd units (#1374767) + +* Tue Jun 28 2016 Miroslav Lichvar 2.4-2 +- fix chrony-helper to exit with correct status (#1350531) + +* Tue Jun 07 2016 Miroslav Lichvar 2.4-1 +- update to 2.4 +- don't require info + +* Mon May 16 2016 Miroslav Lichvar 2.4-0.1.pre1 +- update to 2.4-pre1 +- extend chrony-helper to allow management of static sources (#1331655) + +* Tue Feb 16 2016 Miroslav Lichvar 2.3-1 +- update to 2.3 + +* Tue Feb 02 2016 Miroslav Lichvar 2.3-0.1.pre1 +- update to 2.3-pre1 + +* Thu Jan 21 2016 Miroslav Lichvar 2.2.1-1 +- update to 2.2.1 (CVE-2016-1567) +- set NTP era split explicitly + +* Mon Oct 19 2015 Miroslav Lichvar 2.2-1 +- update to 2.2 + +* Fri Oct 09 2015 Miroslav Lichvar 2.2-0.2.pre2 +- update to 2.2-pre2 +- require libseccomp-devel on supported archs only + +* Fri Oct 02 2015 Miroslav Lichvar 2.2-0.1.pre1 +- update to 2.2-pre1 +- enable seccomp support +- use weak dependency for timedatex on Fedora 24 and later + +* Tue Jun 23 2015 Miroslav Lichvar 2.1.1-1 +- update to 2.1.1 +- add -n option to gzip command to not save timestamp + +* Mon Jun 22 2015 Miroslav Lichvar 2.1-1 +- update to 2.1 +- extend chrony-helper to allow using servers from DNS SRV records (#1234406) +- set random seed in testing to get deterministic results + +* Wed Jun 17 2015 Fedora Release Engineering - 2.1-0.2.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 10 2015 Miroslav Lichvar 2.1-0.1.pre1 +- update to 2.1-pre1 + +* Mon Apr 27 2015 Miroslav Lichvar 2.0-1 +- update to 2.0 + +* Wed Apr 08 2015 Miroslav Lichvar 2.0-0.3.pre2 +- update to 2.0-pre2 (CVE-2015-1853 CVE-2015-1821 CVE-2015-1822) + +* Thu Jan 29 2015 Miroslav Lichvar 2.0-0.2.pre1 +- require timedatex (#1136905) + +* Tue Jan 27 2015 Miroslav Lichvar 2.0-0.1.pre1 +- update to 2.0-pre1 + +* Thu Sep 11 2014 Miroslav Lichvar 1.31-1 +- update to 1.31 +- add servers from DHCP with iburst option by default +- use upstream configuration files and scripts +- don't package configuration examples +- compress chrony.txt + +* Thu Aug 21 2014 Miroslav Lichvar 1.31-0.1.pre1 +- update to 1.31-pre1 +- use license macro if available + +* Sat Aug 16 2014 Fedora Release Engineering - 1.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Aug 15 2014 Miroslav Lichvar 1.30-2 +- reconnect client sockets (#1124059) + +* Tue Jul 01 2014 Miroslav Lichvar 1.30-1 +- update to 1.30 +- enable debug messages + +* Mon Jun 09 2014 Miroslav Lichvar 1.30-0.1.pre1 +- update to 1.30-pre1 +- execute test suite +- avoid calling systemctl in helper script +- call chronyc directly from logrotate and NM dispatcher scripts +- add conflict with systemd-timesyncd service + +* Sat Jun 07 2014 Fedora Release Engineering - 1.29.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Jan 31 2014 Miroslav Lichvar 1.29.1-1 +- update to 1.29.1 (CVE-2014-0021) +- replace hardening build flags with _hardened_build + +* Tue Nov 19 2013 Miroslav Lichvar 1.29-3 +- let systemd remove pid file (#974305) + +* Thu Oct 03 2013 Miroslav Lichvar 1.29-2 +- add ordering dependency to not start chronyd before ntpd stopped + +* Thu Aug 08 2013 Miroslav Lichvar 1.29-1 +- update to 1.29 (CVE-2012-4502, CVE-2012-4503) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Miroslav Lichvar 1.28-1 +- update to 1.28 +- change default makestep limit to 10 seconds + +* Mon Jun 24 2013 Miroslav Lichvar 1.28-0.2.pre1 +- buildrequire systemd-units + +* Fri Jun 21 2013 Miroslav Lichvar 1.28-0.1.pre1 +- update to 1.28-pre1 +- listen for commands only on localhost by default + +* Thu May 09 2013 Miroslav Lichvar 1.27-3 +- disable chrony-wait service by default (#961047) +- drop old systemd scriptlets +- don't own ntp-units.d directory +- move files from /lib +- remove unncessary dependency on syslog target + +* Tue Mar 12 2013 Miroslav Lichvar 1.27-2 +- suppress error messages from tr when generating key (#907914) +- fix delta calculation with extreme frequency offsets + +* Fri Feb 01 2013 Miroslav Lichvar 1.27-1 +- update to 1.27 +- start chrony-wait service with chronyd +- start chronyd service after sntp +- remove obsolete macros + +* Tue Sep 11 2012 Miroslav Lichvar 1.27-0.5.pre1.git1ca844 +- update to git snapshot 1ca844 +- update systemd integration (#846303) +- use systemd macros if available (#850151) +- use correct vendor pool.ntp.org zone on RHEL (#845981) +- don't log output of chrony-wait service + +* Wed Jul 18 2012 Fedora Release Engineering - 1.27-0.4.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Apr 27 2012 Miroslav Lichvar 1.27-0.3.pre1 +- update service file for systemd-timedated-ntp target (#816493) + +* Fri Apr 06 2012 Miroslav Lichvar 1.27-0.2.pre1 + use systemctl is-active instead of status in chrony-helper (#794771) + +* Tue Feb 28 2012 Miroslav Lichvar 1.27-0.1.pre1 +- update to 1.27-pre1 +- generate SHA1 command key instead of MD5 + +* Wed Feb 15 2012 Miroslav Lichvar 1.26-6.20110831gitb088b7 +- remove old servers on DHCP update (#787042) + +* Fri Feb 10 2012 Miroslav Lichvar 1.26-5.20110831gitb088b7 +- improve chrony-helper to keep track of servers added from DHCP (#787042) +- fix dhclient script to always return with zero exit code (#767859) + +* Thu Jan 12 2012 Fedora Release Engineering - 1.26-4.20110831gitb088b7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 06 2011 Miroslav Lichvar 1.26-3.20110831gitb088b7 +- update to git snapshot 20110831gitb088b7 +- on first start generate password with 16 chars +- change systemd service type to forking +- add forced-command to chrony-helper (#735821) + +* Mon Aug 15 2011 Miroslav Lichvar 1.26-2 +- fix iburst with very high jitters and long delays +- use timepps header from pps-tools-devel + +* Wed Jul 13 2011 Miroslav Lichvar 1.26-1 +- update to 1.26 +- read options from sysconfig file if it exists + +* Fri Jun 24 2011 Miroslav Lichvar 1.26-0.1.pre1 +- update to 1.26-pre1 +- fix service name in %%triggerun +- drop SysV init script +- add chrony-wait service + +* Fri May 06 2011 Bill Nottingham 1.25-2 +- fix systemd scriptlets for the upgrade case + +* Wed May 04 2011 Miroslav Lichvar 1.25-1 +- update to 1.25 + +* Wed Apr 20 2011 Miroslav Lichvar 1.25-0.3.pre2 +- update to 1.25-pre2 +- link with -Wl,-z,relro,-z,now options + +* Tue Feb 08 2011 Fedora Release Engineering - 1.25-0.2.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Feb 01 2011 Miroslav Lichvar 1.25-0.1.pre1 +- update to 1.25-pre1 +- use iburst, four pool servers, rtcsync, stratumweight in default config +- add systemd support +- drop sysconfig file +- suppress install-info errors + +* Thu Apr 29 2010 Miroslav Lichvar 1.24-4.20100428git73d775 +- update to 20100428git73d775 +- replace initstepslew directive with makestep in default config +- add NetworkManager dispatcher script +- add dhclient script +- retry server/peer name resolution at least once to workaround + NetworkManager race condition on boot +- don't verify chrony.keys + +* Fri Mar 12 2010 Miroslav Lichvar 1.24-3.20100302git5fb555 +- update to snapshot 20100302git5fb555 +- compile with PPS API support + +* Thu Feb 04 2010 Miroslav Lichvar 1.24-1 +- update to 1.24 (#555367, CVE-2010-0292 CVE-2010-0293 CVE-2010-0294) +- modify default config + - step clock on start if it is off by more than 100 seconds + - disable client log +- build with -fPIE on sparc + +* Tue Dec 15 2009 Miroslav Lichvar 1.24-0.1.pre1 +- update to 1.24-pre1 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.23-7.20081106gitbe42b4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 17 2009 Miroslav Lichvar 1.23-6.20081106gitbe42b4 +- switch to editline +- support arbitrary chronyc commands in init script + +* Mon Jun 08 2009 Dan Horak 1.23-5.20081106gitbe42b4 +- add patch with support for s390/s390x + +* Mon Mar 09 2009 Miroslav Lichvar 1.23-4.20081106gitbe42b4 +- fix building with broken libcap header (#483548) + +* Mon Feb 23 2009 Fedora Release Engineering - 1.23-3.20081106gitbe42b4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Nov 19 2008 Miroslav Lichvar 1.23-2.20081106gitbe42b4 +- fix info uninstall +- generate random command key in init script +- support cyclelogs, online, offline commands in init script +- add logrotate script + +* Tue Nov 11 2008 Miroslav Lichvar 1.23-1.20081106gitbe42b4 +- initial release