Hello community,
here is the log from the commit of package yast2-ntp-client for
openSUSE:Factory checked in at 2018-03-11 18:02:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client"
Sun Mar 11 18:02:05 2018 rev:103 rq:583846 version:4.0.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes
2018-02-24 16:35:55.056925251 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes
2018-03-11 18:02:06.673717112 +0100
@@ -1,0 +2,11 @@
+Wed Mar 7 10:57:36 UTC 2018 - jreidin...@suse.com
+
+- change cron config file name to suse-ntp_synchronize
+ (bsc#1079122)
+- convert old file to new one during upgrade, ensure that ntpd is
+ replaced by chrony (FATE#323432)
+- ghost that config file, so it is easy to find which package owns
+ it
+- 4.0.9
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-4.0.8.tar.bz2
New:
----
yast2-ntp-client-4.0.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.VM63P9/_old 2018-03-11 18:02:07.249696463 +0100
+++ /var/tmp/diff_new_pack.VM63P9/_new 2018-03-11 18:02:07.253696320 +0100
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.0.8
+Version: 4.0.9
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
@@ -61,6 +61,13 @@
%install
rake install DESTDIR="%{buildroot}"
+%post
+# upgrade old name and convert it to chrony (bsc#1079122)
+if [ -f /etc/cron.d/novell.ntp-synchronize ]; then
+ mv /etc/cron.d/novell.ntp-synchronize /etc/cron.d/suse-ntp_synchronize
+ sed -i 's:\* \* \* \* root .*:* * * * root /usr/sbin/chronyd -q
\&>/dev/null:' /etc/cron.d/suse-ntp_synchronize
+fi
+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/ntp-client
@@ -72,6 +79,7 @@
%{yast_ydatadir}/ntp_servers.yml
%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
%{yast_dir}/lib
+%ghost /etc/cron.d/suse-ntp_synchronize
%dir %{yast_docdir}
%doc %{yast_docdir}/COPYING
++++++ yast2-ntp-client-4.0.8.tar.bz2 -> yast2-ntp-client-4.0.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ntp-client-4.0.8/package/yast2-ntp-client.changes
new/yast2-ntp-client-4.0.9/package/yast2-ntp-client.changes
--- old/yast2-ntp-client-4.0.8/package/yast2-ntp-client.changes 2018-02-22
16:42:01.000000000 +0100
+++ new/yast2-ntp-client-4.0.9/package/yast2-ntp-client.changes 2018-03-07
12:22:42.000000000 +0100
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Wed Mar 7 10:57:36 UTC 2018 - jreidin...@suse.com
+
+- change cron config file name to suse-ntp_synchronize
+ (bsc#1079122)
+- convert old file to new one during upgrade, ensure that ntpd is
+ replaced by chrony (FATE#323432)
+- ghost that config file, so it is easy to find which package owns
+ it
+- 4.0.9
+
+-------------------------------------------------------------------
Thu Feb 22 15:21:04 UTC 2018 - gso...@suse.com
- Inform user when client cannot sync with NTP server after the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.0.8/package/yast2-ntp-client.spec
new/yast2-ntp-client-4.0.9/package/yast2-ntp-client.spec
--- old/yast2-ntp-client-4.0.8/package/yast2-ntp-client.spec 2018-02-22
16:42:01.000000000 +0100
+++ new/yast2-ntp-client-4.0.9/package/yast2-ntp-client.spec 2018-03-07
12:22:42.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.0.8
+Version: 4.0.9
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
@@ -61,6 +61,13 @@
%install
rake install DESTDIR="%{buildroot}"
+%post
+# upgrade old name and convert it to chrony (bsc#1079122)
+if [ -f /etc/cron.d/novell.ntp-synchronize ]; then
+ mv /etc/cron.d/novell.ntp-synchronize /etc/cron.d/suse-ntp_synchronize
+ sed -i 's:\* \* \* \* root .*:* * * * root /usr/sbin/chronyd -q
\&>/dev/null:' /etc/cron.d/suse-ntp_synchronize
+fi
+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/ntp-client
@@ -72,6 +79,7 @@
%{yast_ydatadir}/ntp_servers.yml
%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
%{yast_dir}/lib
+%ghost /etc/cron.d/suse-ntp_synchronize
%dir %{yast_docdir}
%doc %{yast_docdir}/COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.0.8/src/modules/NtpClient.rb
new/yast2-ntp-client-4.0.9/src/modules/NtpClient.rb
--- old/yast2-ntp-client-4.0.8/src/modules/NtpClient.rb 2018-02-22
16:42:01.000000000 +0100
+++ new/yast2-ntp-client-4.0.9/src/modules/NtpClient.rb 2018-03-07
12:22:42.000000000 +0100
@@ -35,6 +35,9 @@
NTP_FILE = "/etc/chrony.conf".freeze
+ # The cron file name for the synchronization.
+ CRON_FILE = "/etc/cron.d/suse-ntp_synchronize".freeze
+
UNSUPPORTED_AUTOYAST_OPTIONS = [
"configure_dhcp",
"peers",
@@ -85,9 +88,6 @@
# The interval of synchronization in minutes.
@sync_interval = DEFAULT_SYNC_INTERVAL
- # The cron file name for the synchronization.
- @cron_file = "/etc/cron.d/novell.ntp-synchronize"
-
# Service name of the NTP daemon
@service_name = "chronyd"
@@ -272,7 +272,7 @@
# synchronize_time and sync_interval variables
# Return updated value of synchronize_time
def ReadSynchronization
- crontab = SCR.Read(path(".cron"), @cron_file, "")
+ crontab = SCR.Read(path(".cron"), CRON_FILE, "")
log.info("NTP Synchronization crontab entry: #{crontab}")
cron_entry = (crontab || []).fetch(0, {}).fetch("events", []).fetch(0,
{})
@synchronize_time = cron_entry["active"] == "1"
@@ -812,13 +812,13 @@
if @synchronize_time
SCR.Write(
path(".target.string"),
- @cron_file,
+ CRON_FILE,
"-*/#{@sync_interval} * * * * root /usr/sbin/chronyd -q
&>/dev/null\n"
)
else
SCR.Execute(
path(".target.bash"),
- "test -e #{@cron_file} && rm #{@cron_file};"
+ "rm -vf #{CRON_FILE}"
)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.0.8/test/ntp_client_test.rb
new/yast2-ntp-client-4.0.9/test/ntp_client_test.rb
--- old/yast2-ntp-client-4.0.8/test/ntp_client_test.rb 2018-02-22
16:42:01.000000000 +0100
+++ new/yast2-ntp-client-4.0.9/test/ntp_client_test.rb 2018-03-07
12:22:42.000000000 +0100
@@ -388,7 +388,7 @@
end
describe "#ReadSynchronization" do
- let(:cron_job_file) { "/etc/cron.d/novell.ntp-synchronize" }
+ let(:cron_job_file) { "/etc/cron.d/suse-ntp_synchronize" }
let(:cron_entry) { [] }
before do
