Hello community,
here is the log from the commit of package yast2-ntp-client for
openSUSE:Factory checked in at 2017-10-19 19:31:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client"
Thu Oct 19 19:31:01 2017 rev:99 rq:534402 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes
2017-08-04 11:57:45.241398248 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes
2017-10-19 19:31:02.331958635 +0200
@@ -1,0 +2,7 @@
+Wed Oct 11 08:40:26 UTC 2017 - mvid...@suse.com
+
+- Avoid Internal Error during AutoYaST cloning
+ when fudge records are present (bsc#1058510)
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-3.3.3.tar.bz2
New:
----
yast2-ntp-client-4.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.f1ztpD/_old 2017-10-19 19:31:02.839934866 +0200
+++ /var/tmp/diff_new_pack.f1ztpD/_new 2017-10-19 19:31:02.843934679 +0200
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 3.3.3
+Version: 4.0.0
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
++++++ yast2-ntp-client-3.3.3.tar.bz2 -> yast2-ntp-client-4.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ntp-client-3.3.3/package/yast2-ntp-client.changes
new/yast2-ntp-client-4.0.0/package/yast2-ntp-client.changes
--- old/yast2-ntp-client-3.3.3/package/yast2-ntp-client.changes 2017-08-03
10:56:07.595219746 +0200
+++ new/yast2-ntp-client-4.0.0/package/yast2-ntp-client.changes 2017-10-17
13:00:17.885239663 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 11 08:40:26 UTC 2017 - mvid...@suse.com
+
+- Avoid Internal Error during AutoYaST cloning
+ when fudge records are present (bsc#1058510)
+- 4.0.0
+
+-------------------------------------------------------------------
Thu Aug 3 08:51:24 UTC 2017 - jreidin...@suse.com
- fix crash in ntp-client (bsc#1051899)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-3.3.3/package/yast2-ntp-client.spec
new/yast2-ntp-client-4.0.0/package/yast2-ntp-client.spec
--- old/yast2-ntp-client-3.3.3/package/yast2-ntp-client.spec 2017-08-03
10:56:07.595219746 +0200
+++ new/yast2-ntp-client-4.0.0/package/yast2-ntp-client.spec 2017-10-17
13:00:17.885239663 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-ntp-client
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,30 @@
Name: yast2-ntp-client
-Version: 3.3.3
+Version: 4.0.0
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+BuildRequires: augeas-lenses
+BuildRequires: autoyast2-installation
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 3.2.21
BuildRequires: yast2-country-data
BuildRequires: yast2-devtools >= 3.1.10
-BuildRequires: autoyast2-installation
+BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
-BuildRequires: augeas-lenses
-BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
# proper acting TargetFile when scr is switched
+Requires: augeas-lenses
Requires: yast2 >= 3.2.21
Requires: yast2-country-data
Requires: yast2-ruby-bindings >= 1.0.0
Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
-Requires: augeas-lenses
BuildArch: noarch
# New sntp command line syntax
Conflicts: ntp < 4.2.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-3.3.3/src/modules/NtpClient.rb
new/yast2-ntp-client-4.0.0/src/modules/NtpClient.rb
--- old/yast2-ntp-client-3.3.3/src/modules/NtpClient.rb 2017-08-03
10:56:07.603219746 +0200
+++ new/yast2-ntp-client-4.0.0/src/modules/NtpClient.rb 2017-10-17
13:00:17.897239663 +0200
@@ -711,7 +711,10 @@
end
peers = @ntp_records.dup
- peers.each { |peer| peer.delete("cfa_record") } # not needed for export
+ peers.each do |peer|
+ peer.delete("cfa_record")
+ peer.delete("cfa_fudge_record")
+ end
{
"synchronize_time" => @synchronize_time,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-3.3.3/test/ntp_client_test.rb
new/yast2-ntp-client-4.0.0/test/ntp_client_test.rb
--- old/yast2-ntp-client-3.3.3/test/ntp_client_test.rb 2017-08-03
10:56:07.607219746 +0200
+++ new/yast2-ntp-client-4.0.0/test/ntp_client_test.rb 2017-10-17
13:00:17.901239663 +0200
@@ -2,6 +2,7 @@
require "fileutils"
require "cfa/memory_file"
+require "cfa/ntp_conf"
Yast.import "NtpClient"
Yast.import "NetworkInterfaces"
@@ -129,11 +130,27 @@
describe "#Export" do
let(:profile_name) { "autoinst.xml" }
+ let(:ntp_conf) do
+ path = File.expand_path("../fixtures/cfa/ntp.conf", __FILE__)
+ text = File.read(path)
+ file = CFA::MemoryFile.new(text)
+ CFA::NtpConf.new(file_handler: file)
+ end
it "produces an output equivalent to #Import" do
subject.Import(ntp_client_section)
expect(subject.Export()).to eq ntp_client_section
end
+
+ it "clones without encountering a CFA object" do
+ allow(subject).to receive(:ntp_conf).and_return(ntp_conf)
+ subject.config_has_been_read = false
+ subject.ProcessNtpConf
+ exported = subject.Export
+ # This passes the exported value thru the component system.
+ # It would blow up if we forgot a CFA object inside, bsc#1058510
+ expect { Yast::WFM.Execute(path(".foo"), exported) }.to_not raise_error
+ end
end
end
