Hello community, here is the log from the commit of package yast2-caasp for openSUSE:Factory checked in at 2018-01-17 21:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-caasp (Old) and /work/SRC/openSUSE:Factory/.yast2-caasp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-caasp" Wed Jan 17 21:42:27 2018 rev:4 rq:556494 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-caasp/yast2-caasp.changes 2017-09-21 12:30:38.822712208 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-caasp.new/yast2-caasp.changes 2018-01-17 21:42:28.607673553 +0100 @@ -1,0 +2,13 @@ +Tue Dec 12 13:16:49 UTC 2017 - [email protected] + +- Use chrony instead of ntp (FATE#323432) +- 4.0.3 + +------------------------------------------------------------------- +Wed Sep 27 10:03:25 UTC 2017 - [email protected] + +- fix building with roles with order (related to fix for + bsc#1049297) +- 4.0.2 + +------------------------------------------------------------------- Old: ---- yast2-caasp-4.0.1.tar.bz2 New: ---- yast2-caasp-4.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-caasp.spec ++++++ --- /var/tmp/diff_new_pack.CbogUe/_old 2018-01-17 21:42:29.195646031 +0100 +++ /var/tmp/diff_new_pack.CbogUe/_new 2018-01-17 21:42:29.195646031 +0100 @@ -17,7 +17,7 @@ Name: yast2-caasp -Version: 4.0.1 +Version: 4.0.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,9 +29,9 @@ # Overview widget Requires: yast2-installation >= 3.2.38 BuildRequires: yast2-installation >= 3.2.38 -# CFA class -Requires: yast2-ntp-client >= 3.2.6 -BuildRequires: yast2-ntp-client >= 3.2.6 +# chrony support +Requires: yast2-ntp-client >= 4.0.3 +BuildRequires: yast2-ntp-client >= 4.0.3 # System information widget Requires: yast2-tune >= 3.2.0 BuildRequires: yast2-tune >= 3.2.0 ++++++ yast2-caasp-4.0.1.tar.bz2 -> yast2-caasp-4.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/package/yast2-caasp.changes new/yast2-caasp-4.0.3/package/yast2-caasp.changes --- old/yast2-caasp-4.0.1/package/yast2-caasp.changes 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/package/yast2-caasp.changes 2017-12-12 14:43:00.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Dec 12 13:16:49 UTC 2017 - [email protected] + +- Use chrony instead of ntp (FATE#323432) +- 4.0.3 + +------------------------------------------------------------------- +Wed Sep 27 10:03:25 UTC 2017 - [email protected] + +- fix building with roles with order (related to fix for + bsc#1049297) +- 4.0.2 + +------------------------------------------------------------------- Tue Sep 12 09:03:53 UTC 2017 - [email protected] - Replace /info.txt by /README.BETA as beta file to be shown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/package/yast2-caasp.spec new/yast2-caasp-4.0.3/package/yast2-caasp.spec --- old/yast2-caasp-4.0.1/package/yast2-caasp.spec 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/package/yast2-caasp.spec 2017-12-12 14:43:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-caasp -Version: 4.0.1 +Version: 4.0.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,9 +29,9 @@ # Overview widget Requires: yast2-installation >= 3.2.38 BuildRequires: yast2-installation >= 3.2.38 -# CFA class -Requires: yast2-ntp-client >= 3.2.6 -BuildRequires: yast2-ntp-client >= 3.2.6 +# chrony support +Requires: yast2-ntp-client >= 4.0.3 +BuildRequires: yast2-ntp-client >= 4.0.3 # System information widget Requires: yast2-tune >= 3.2.0 BuildRequires: yast2-tune >= 3.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/src/lib/y2system_role_handlers/dashboard_role_finish.rb new/yast2-caasp-4.0.3/src/lib/y2system_role_handlers/dashboard_role_finish.rb --- old/yast2-caasp-4.0.1/src/lib/y2system_role_handlers/dashboard_role_finish.rb 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/src/lib/y2system_role_handlers/dashboard_role_finish.rb 2017-12-12 14:43:00.000000000 +0100 @@ -23,7 +23,7 @@ require "yast2/execute" require "installation/system_role" require "installation/services" -require "cfa/ntp_conf" +require "cfa/chrony_conf" module Y2SystemRoleHandlers # Implement finish handler for the "dashboard" role @@ -52,39 +52,28 @@ def setup_ntp return unless role["ntp_servers"] log.info "Updating the NTP daemon configuration with servers: #{role["ntp_servers"]}" - update_ntp_conf - enable_ntpd_service + update_chrony_conf + enable_service end - # Update the ntp.conf file + # Update the chrony.conf file # # Set the server specified in the role configuration ({ntp_servers}) - def update_ntp_conf + def update_chrony_conf return unless role["ntp_servers"] - ntp_conf = CFA::NtpConf.new - ntp_conf.load - ntp_conf.records.delete_if { |r| r.type == "server" } # clean-up servers if any + chrony_conf = CFA::ChronyConf.new + chrony_conf.load + chrony_conf.clear_pools role["ntp_servers"].each do |server| - ntp_conf.records << server_record(server) - end - ntp_conf.save - end - - # Options for each defined server - SERVER_OPTIONS = ["iburst"].freeze - - # Build a server record - def server_record(server) - CFA::NtpConf::Record.record_class("server").new.tap do |record| - record.value = server - record.options = SERVER_OPTIONS + chrony_conf.add_pool(server) end + chrony_conf.save end # Add the ntpd service to the list of services to enable - def enable_ntpd_service + def enable_service enabled = ::Installation::Services.enabled - enabled << "ntpd" unless enabled.include?("ntpd") + enabled << "chronyd" unless enabled.include?("chronyd") end # Dashboard role diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/fixtures/chrony.conf new/yast2-caasp-4.0.3/test/fixtures/chrony.conf --- old/yast2-caasp-4.0.1/test/fixtures/chrony.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-caasp-4.0.3/test/fixtures/chrony.conf 2017-12-12 14:43:00.000000000 +0100 @@ -0,0 +1,38 @@ +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html). +pool 2.opensuse.pool.ntp.org iburst + +# Record the rate at which the system clock gains/losses time. +driftfile /var/lib/chrony/drift + +# Allow the system clock to be stepped in the first three updates +# if its offset is larger than 1 second. +makestep 1.0 3 + +# Enable kernel synchronization of the real-time clock (RTC). +rtcsync + +# Enable hardware timestamping on all interfaces that support it. +#hwtimestamp * + +# Increase the minimum number of selectable sources required to adjust +# the system clock. +#minsources 2 + +# Allow NTP client access from local network. +#allow 192.168.0.0/16 + +# Serve time even if not synchronized to a time source. +#local stratum 10 + +# Specify file containing keys for NTP authentication. +#keyfile /etc/chrony.keys + +# Get TAI-UTC offset and leap seconds from the system tz database. +#leapsectz right/UTC + +# Specify directory for log files. +logdir /var/log/chrony + +# Select which information is logged. +#log measurements statistics tracking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/fixtures/ntp.conf new/yast2-caasp-4.0.3/test/fixtures/ntp.conf --- old/yast2-caasp-4.0.1/test/fixtures/ntp.conf 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/test/fixtures/ntp.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -################################################################################ -## /etc/ntp.conf -## -## Sample NTP configuration file. -## See package 'ntp-doc' for documentation, Mini-HOWTO and FAQ. -## Copyright (c) 1998 S.u.S.E. GmbH Fuerth, Germany. -## -## Author: Michael Andres, <[email protected]> -## Michael Skibbe, <[email protected]> -## -################################################################################ - -## -## Radio and modem clocks by convention have addresses in the -## form 127.127.t.u, where t is the clock type and u is a unit -## number in the range 0-3. -## -## Most of these clocks require support in the form of a -## serial port or special bus peripheral. The particular -## device is normally specified by adding a soft link -## /dev/device-u to the particular hardware device involved, -## where u correspond to the unit number above. -## -## Generic DCF77 clock on serial port (Conrad DCF77) -## Address: 127.127.8.u -## Serial Port: /dev/refclock-u -## -## (create soft link /dev/refclock-0 to the particular ttyS?) -## -# server 127.127.8.0 mode 5 prefer - -## -## Undisciplined Local Clock. This is a fake driver intended for backup -## and when no outside source of synchronized time is available. -## -# server 127.127.1.0 # local clock (LCL) -# fudge 127.127.1.0 stratum 10 # LCL is unsynchronized - -## -## Add external Servers using -## # rcntpd addserver <yourserver> -## The servers will only be added to the currently running instance, not -## to /etc/ntp.conf. -## - -# Access control configuration; see /usr/share/doc/packages/ntp/html/accopt.html for -# details. The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions> -# might also be helpful. -# -# Note that "restrict" applies to both servers and clients, so a configuration -# that might be intended to block requests from certain clients could also end -# up blocking replies from your own upstream servers. - -# By default, exchange time with everybody, but don't allow configuration. - -# Local users may interrogate the ntp server more closely. - -# Clients from this (example!) subnet have unlimited access, but only if -# cryptographically authenticated. -#restrict 192.168.123.0 mask 255.255.255.0 notrust - -## -## Miscellaneous stuff -## - -driftfile /var/lib/ntp/drift/ntp.drift # path for drift file - -logfile /var/log/ntp # alternate log file -# logconfig =syncstatus + sysevents -# logconfig =all - -# statsdir /tmp/ # directory for statistics files -# filegen peerstats file peerstats type day enable -# filegen loopstats file loopstats type day enable -# filegen clockstats file clockstats type day enable - -# -# Authentication stuff -# -keys /etc/ntp.keys # path for keys file -trustedkey 1 # define trusted keys -requestkey 1 # key (7) for accessing server variables -controlkey 1 # key (6) for accessing server variables - -# Fake server -server ntp.lan iburst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/lib/widgets/ntp_server_test.rb new/yast2-caasp-4.0.3/test/lib/widgets/ntp_server_test.rb --- old/yast2-caasp-4.0.1/test/lib/widgets/ntp_server_test.rb 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/test/lib/widgets/ntp_server_test.rb 2017-12-12 14:43:00.000000000 +0100 @@ -5,7 +5,7 @@ describe Y2Caasp::Widgets::NtpServer do subject(:widget) { Y2Caasp::Widgets::NtpServer.new } - let(:dashboard_role) { ::Installation::SystemRole.new(id: "dashboard_role") } + let(:dashboard_role) { ::Installation::SystemRole.new(id: "dashboard_role", order: "100") } before do allow(::Installation::SystemRole).to receive(:find) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/lib/widgets/system_role_test.rb new/yast2-caasp-4.0.3/test/lib/widgets/system_role_test.rb --- old/yast2-caasp-4.0.1/test/lib/widgets/system_role_test.rb 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/test/lib/widgets/system_role_test.rb 2017-12-12 14:43:00.000000000 +0100 @@ -12,7 +12,7 @@ let(:ntp_server_widget) { double("ntp_server_widget") } let(:test_role) do Installation::SystemRole.new( - id: "test_role", label: "Test role", description: "Test description" + id: "test_role", order: "100", label: "Test role", description: "Test description" ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/lib/y2system_role_handlers/dashboard_role_finish_test.rb new/yast2-caasp-4.0.3/test/lib/y2system_role_handlers/dashboard_role_finish_test.rb --- old/yast2-caasp-4.0.1/test/lib/y2system_role_handlers/dashboard_role_finish_test.rb 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/test/lib/y2system_role_handlers/dashboard_role_finish_test.rb 2017-12-12 14:43:00.000000000 +0100 @@ -10,12 +10,12 @@ let(:ntp_servers) { [ntp_server] } before do - stub_const("CFA::NtpConf::PATH", FIXTURES_PATH.join("ntp.conf").to_s) - allow(CFA::NtpConf).to receive(:new).and_return(ntp_conf) + stub_const("CFA::ChronyConf::PATH", FIXTURES_PATH.join("chrony.conf").to_s) + allow(CFA::ChronyConf).to receive(:new).and_return(ntp_conf) end let(:role) do - ::Installation::SystemRole.new(id: "dashboard_role").tap do |role| + ::Installation::SystemRole.new(id: "dashboard_role", order: "100").tap do |role| role["ntp_servers"] = ntp_servers end end @@ -27,7 +27,7 @@ end describe "#run" do - let(:ntp_conf) { CFA::NtpConf.new } + let(:ntp_conf) { CFA::ChronyConf.new } before do allow(ntp_conf).to receive(:save) @@ -41,9 +41,9 @@ context "when a NTP server is specified" do it "adds the server to the configuration" do handler.run - records = ntp_conf.records.select { |r| r.type == "server" } - expect(records.map(&:value)).to eq([ntp_server]) - expect(records.map(&:options)).to eq([["iburst"]]) + records = ntp_conf.pools + expect(records.keys).to eq([ntp_server]) + expect(records.values).to eq([{ "iburst" => nil }]) end it "writes the NTP configuration" do @@ -51,9 +51,9 @@ handler.run end - it "sets the ntpd service to be enabled" do + it "sets the chronyd service to be enabled" do handler.run - expect(::Installation::Services.enabled).to include("ntpd") + expect(::Installation::Services.enabled).to include("chronyd") end end @@ -61,7 +61,7 @@ let(:ntp_servers) { nil } it "does not modify NTP configuration" do - expect(CFA::NtpConf).to_not receive(:new) + expect(CFA::ChronyConf).to_not receive(:new) handler.run end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-caasp-4.0.1/test/widgets_system_role_test.rb new/yast2-caasp-4.0.3/test/widgets_system_role_test.rb --- old/yast2-caasp-4.0.1/test/widgets_system_role_test.rb 2017-09-13 10:58:39.354785342 +0200 +++ new/yast2-caasp-4.0.3/test/widgets_system_role_test.rb 2017-12-12 14:43:00.000000000 +0100 @@ -5,7 +5,7 @@ require "y2caasp/widgets/system_role" describe ::Y2Caasp::Widgets::ControllerNode do - let(:worker_role) { ::Installation::SystemRole.new(id: "worker_role") } + let(:worker_role) { ::Installation::SystemRole.new(id: "worker_role", order: "100") } before do allow(subject).to receive(:role).and_return(worker_role)
