Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-05-17 19:32:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Thu May 17 19:32:17 2018 rev:192 rq:607617 version:4.0.22 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-02-12 10:07:36.793942399 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2018-05-17 19:32:21.749359231 +0200 @@ -1,0 +2,12 @@ +Tue May 15 12:36:33 UTC 2018 - [email protected] + +- Do not use opensuse ntp pool servers for SLE (bsc#1090168) +- 4.0.22 + +------------------------------------------------------------------- +Mon May 14 10:26:11 UTC 2018 - [email protected] + +- handle setting locale in firstboot (bsc#1092979) +- 4.0.21 + +------------------------------------------------------------------- Old: ---- yast2-country-4.0.20.tar.bz2 New: ---- yast2-country-4.0.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.fie6zr/_old 2018-05-17 19:32:22.341337604 +0200 +++ /var/tmp/diff_new_pack.fie6zr/_new 2018-05-17 19:32:22.341337604 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.20 +Version: 4.0.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-4.0.20.tar.bz2 -> yast2-country-4.0.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.20/language/src/modules/Language.rb new/yast2-country-4.0.22/language/src/modules/Language.rb --- old/yast2-country-4.0.20/language/src/modules/Language.rb 2018-02-09 18:26:18.000000000 +0100 +++ new/yast2-country-4.0.22/language/src/modules/Language.rb 2018-05-15 15:49:08.000000000 +0200 @@ -918,6 +918,8 @@ def Save loc = GetLocaleString(@language) + @localed_conf = {} if @localed_conf.nil? + if Builtins.find(loc, "zh_HK") == 0 @localed_conf["LC_MESSAGES"] = "zh_TW" elsif @localed_conf["LC_MESSAGES"] == "zh_TW" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.20/package/yast2-country.changes new/yast2-country-4.0.22/package/yast2-country.changes --- old/yast2-country-4.0.20/package/yast2-country.changes 2018-02-09 18:26:18.000000000 +0100 +++ new/yast2-country-4.0.22/package/yast2-country.changes 2018-05-15 15:49:08.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue May 15 12:36:33 UTC 2018 - [email protected] + +- Do not use opensuse ntp pool servers for SLE (bsc#1090168) +- 4.0.22 + +------------------------------------------------------------------- +Mon May 14 10:26:11 UTC 2018 - [email protected] + +- handle setting locale in firstboot (bsc#1092979) +- 4.0.21 + +------------------------------------------------------------------- Fri Feb 9 16:41:49 UTC 2018 - [email protected] - Keyboard: don't try to set the keyboard map for AMBA devices, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.20/package/yast2-country.spec new/yast2-country-4.0.22/package/yast2-country.spec --- old/yast2-country-4.0.20/package/yast2-country.spec 2018-02-09 18:26:18.000000000 +0100 +++ new/yast2-country-4.0.22/package/yast2-country.spec 2018-05-15 15:49:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.20 +Version: 4.0.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.20/timezone/src/include/timezone/dialogs.rb new/yast2-country-4.0.22/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-4.0.20/timezone/src/include/timezone/dialogs.rb 2018-02-09 18:26:18.000000000 +0100 +++ new/yast2-country-4.0.22/timezone/src/include/timezone/dialogs.rb 2018-05-15 15:49:08.000000000 +0200 @@ -47,6 +47,7 @@ Yast.import "NetworkService" Yast.import "Package" Yast.import "Popup" + Yast.import "Product" Yast.import "ProductFeatures" Yast.import "Service" Yast.import "Stage" @@ -572,22 +573,21 @@ # true by default (fate#303520) @ntp_used = true # configure NTP client - Builtins.srandom - @ntp_server = Builtins.sformat( - "%1.opensuse.pool.ntp.org", - Builtins.random(4) - ) + # to prevent misusage of ntp.org we need to distinguish opensuse and SLE usage + base_products = Product.FindBaseProducts + if base_products.any? { |p| p["name"] =~ /openSUSE/i } + servers = (0..3).map { |i| "#{i}.opensuse.pool.ntp.org" } + else + servers = (0..3).map { |i| "#{i}.novell.pool.ntp.org" } + end + @ntp_server = servers.sample argmap = { "server" => @ntp_server, # FIXME ntp-client_proposal doesn't understand 'servers' yet - "servers" => [ - "0.opensuse.pool.ntp.org", - "1.opensuse.pool.ntp.org", - "2.opensuse.pool.ntp.org", - "3.opensuse.pool.ntp.org" - ], + "servers" => servers, "ntpdate_only" => true } + rv = Convert.to_symbol(ntp_call("Write", argmap)) if rv == :invalid_hostname Builtins.y2warning("Invalid NTP server hostname %1", @ntp_server)
