Accepting request 834313 from network:time

- Adjust and rename the sysconfig file, so that it matches the
  expectations of chronyd.service (bsc#1173277).

- Update to 3.5.1:
  * Create new file when writing pidfile (CVE-2020-14367, bsc#1174911)

OBS-URL: https://build.opensuse.org/request/show/834313
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=26

chrony-3.5.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ba82f70db85d414cd7420c39858e3ceca4b9eb8b028cbe869512c3a14a2dca7
+size 459902

chrony-3.5.1.tar.gz.sig

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQSLH0qa2nPUAeMIWgtf8G8puh4BOwUCXz083QAKCRBf8G8puh4B
+O3kZAJ9ZKwXDF0Qod8SfUuRgWAv/sECWrACghttWUPbzpfncbMVwwMnZVibXKLM=
+=4in4
+-----END PGP SIGNATURE-----

chrony-3.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5
-size 458226

chrony-3.5.tar.gz.sig

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iEYEABECAAYFAlzan7cACgkQX/BvKboeATtxzQCffUevHEDrRWPbdK9drojf97s1
-9kIAn0onspGVxrj21mhFtd1vNjsSG+8f
-=AveM
------END PGP SIGNATURE-----

chrony.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Sep 14 10:41:58 UTC 2020 - Reinhard Max <max@suse.com>
+
+- Adjust and rename the sysconfig file, so that it matches the
+  expectations of chronyd.service (bsc#1173277).
+
+-------------------------------------------------------------------
+Sun Sep 13 20:22:46 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- Update to 3.5.1:
+  * Create new file when writing pidfile (CVE-2020-14367, bsc#1174911)
+
 -------------------------------------------------------------------
 Sun Aug  2 21:27:45 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 

chrony.spec

@@ -23,14 +23,14 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           chrony
-Version:        3.5
+Version:        3.5.1
 Release:        0
 Summary:        System Clock Synchronization Client and Server
 License:        GPL-2.0-only
 Group:          Productivity/Networking/Other
 URL:            https://chrony.tuxfamily.org/
 Source:         https://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
-Source2:        chrony.sysconfig
+Source2:        chronyd.sysconfig
 Source3:        chrony.dhclient
 Source4:        chrony.helper
 Source5:        chrony-dnssrv@.service
@@ -218,7 +218,7 @@ echo 'chronyd.service' > \
         %{buildroot}%{_systemdutildir}/ntp-units.d/50-chronyd.list
 
 install -Dpm 0644 %{SOURCE2} \
-  %{buildroot}%{_fillupdir}/sysconfig.chrony
+  %{buildroot}%{_fillupdir}/sysconfig.chronyd
 install -Dpm 755 %{SOURCE4} \
   %{buildroot}%{_libexecdir}/%name/helper
 
@@ -277,7 +277,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
 %{_unitdir}/chrony*.timer
 %{_sbindir}/rcchrony*
 %{_tmpfilesdir}/%{name}.conf
-%{_fillupdir}/sysconfig.chrony
+%{_fillupdir}/sysconfig.chronyd
 %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
 %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift
 %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc

chrony.sysconfig

@@ -1,26 +0,0 @@
-## Path:	Network/Chrony
-## Description:	Chrony time synchronization settings
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Resolve hostnames with IPv4
-#
-CHRONY_IPV4="yes"
-
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Resolve hostnames with IPv6
-#
-CHRONY_IPV6="yes"
-
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Lock the chrony daemon process into RAM, preventing it from swapping out
-#
-CHRONY_LOCK_IN_RAM="no"
-

chronyd.sysconfig

@@ -0,0 +1,9 @@
+## Path:	Network/Chrony
+## Description:	Chrony time synchronization settings
+## Type:	string
+## Default:	""
+## ServiceRestart: chronyd
+#
+# Command line options for chronyd
+#
+OPTIONS=""