Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-dns-server for
openSUSE:Factory checked in at 2022-02-03 23:15:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dns-server.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server"
Thu Feb 3 23:15:55 2022 rev:86 rq:950789 version:4.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes
2021-05-02 18:36:11.644927855 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-dns-server.new.1898/yast2-dns-server.changes
2022-02-03 23:16:19.380679719 +0100
@@ -1,0 +2,9 @@
+Wed Feb 2 12:29:59 UTC 2022 - Michal Filka <mfi...@suse.com>
+
+- jsc#SLE-22015
+ - Master/Slave servers and zones renamed to conform to inclusive
+ naming. According to RFC8499 primary/secondary names are used
+ now.
+- 4.4.1
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-4.4.0.tar.bz2
New:
----
yast2-dns-server-4.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.PkQJue/_old 2022-02-03 23:16:19.808676798 +0100
+++ /var/tmp/diff_new_pack.PkQJue/_new 2022-02-03 23:16:19.812676771 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dns-server
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-dns-server
-Version: 4.4.0
+Version: 4.4.1
Release: 0
URL: https://github.com/yast/yast-dns-server
Summary: YaST2 - DNS Server Configuration
++++++ yast2-dns-server-4.4.0.tar.bz2 -> yast2-dns-server-4.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.4.0/.github/workflows/ci.yml
new/yast2-dns-server-4.4.1/.github/workflows/ci.yml
--- old/yast2-dns-server-4.4.0/.github/workflows/ci.yml 2021-04-30
18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/.github/workflows/ci.yml 2022-02-02
18:11:41.000000000 +0100
@@ -8,7 +8,14 @@
jobs:
Tests:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -27,6 +34,8 @@
# send the coverage report to coveralls.io
- name: Coveralls Report
+ # send it only from the TW build to avoid duplicate submits
+ if: ${{ matrix.distro == 'tumbleweed' }}
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +55,14 @@
Package:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -58,7 +74,14 @@
Yardoc:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -72,7 +95,14 @@
# checks into one job avoids that overhead
Checks:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/package/yast2-dns-server.changes
new/yast2-dns-server-4.4.1/package/yast2-dns-server.changes
--- old/yast2-dns-server-4.4.0/package/yast2-dns-server.changes 2021-04-30
18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/package/yast2-dns-server.changes 2022-02-02
18:11:41.000000000 +0100
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Feb 2 12:29:59 UTC 2022 - Michal Filka <mfi...@suse.com>
+
+- jsc#SLE-22015
+ - Master/Slave servers and zones renamed to conform to inclusive
+ naming. According to RFC8499 primary/secondary names are used
+ now.
+- 4.4.1
+
+-------------------------------------------------------------------
Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
- 4.4.0 (bsc#1185510)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.4.0/package/yast2-dns-server.spec
new/yast2-dns-server-4.4.1/package/yast2-dns-server.spec
--- old/yast2-dns-server-4.4.0/package/yast2-dns-server.spec 2021-04-30
18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/package/yast2-dns-server.spec 2022-02-02
18:11:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-dns-server
-Version: 4.4.0
+Version: 4.4.1
Release: 0
Url: https://github.com/yast/yast-dns-server
Summary: YaST2 - DNS Server Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/src/include/dns-server/cmdline.rb
new/yast2-dns-server-4.4.1/src/include/dns-server/cmdline.rb
--- old/yast2-dns-server-4.4.0/src/include/dns-server/cmdline.rb
2021-04-30 18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/src/include/dns-server/cmdline.rb
2022-02-02 18:11:41.000000000 +0100
@@ -65,11 +65,11 @@
),
"example" => [
"zones show",
- "zones add name=example.org zonetype=master",
- "zones add name=example.com zonetype=slave
masterserver=192.168.0.1",
+ "zones add name=example.org zonetype=primary",
+ "zones add name=example.com zonetype=secondary
primaryserver=192.168.0.1",
"zones add name=example.com zonetype=forward
forwarders=192.168.0.1,192.168.0.2",
"zones remove name=example.org",
- "zones set name=example.com masterserver=192.168.10.1",
+ "zones set name=example.com primaryserver=192.168.10.1",
"zones set name=example.com forwarders=192.168.0.3"
]
},
@@ -257,16 +257,24 @@
"type" => "string",
# TRANSLATORS: commandline short help for command
"help" => _(
- "Zone type, master or slave"
+ "Zone type, primary or secondary"
)
},
"masterserver" => {
"type" => "ip4",
# TRANSLATORS: commandline short help for command
+ # TRANSLATORS: obsolete option, primaryserver should be used
instead
"help" => _(
"DNS zone master server"
)
},
+ "primaryserver" => {
+ "type" => "ip4",
+ # TRANSLATORS: commandline short help for command
+ "help" => _(
+ "DNS zone primary server"
+ )
+ },
"zone" => {
"type" => "string",
# TRANSLATORS: commandline short help for command
@@ -432,6 +440,7 @@
"set",
"name",
"masterserver",
+ "primaryserver",
"zonetype",
"forwarders"
],
@@ -814,7 +823,7 @@
Builtins.foreach(DnsServerAPI.GetZones) do |zone_name, zone|
masterservers = []
forwarders = []
- if Ops.get(zone, "type") == "slave"
+ if ["slave", "secondary"].include?(zone)
masterservers = DnsServerAPI.GetZoneMasterServers(zone_name)
elsif Ops.get(zone, "type") == "forward"
forwarders = DnsServerAPI.GetZoneForwarders(zone_name)
@@ -859,6 +868,7 @@
Builtins.y2milestone("Options: %1", options)
# Show current settings
+ primaryserver = options["masterserver"] || options["primaryserver"]
if Ops.get(options, "show") != nil
return DNSHandlerZonesShow()
@@ -872,7 +882,7 @@
if DnsServerAPI.AddZone(
Ops.get_string(options, "name"),
Ops.get_string(options, "zonetype"),
- { "masterserver" => Ops.get_string(options, "masterserver") }
+ { "masterserver" => primaryserver }
)
if Ops.get_string(options, "zonetype") == "forward"
return DnsServerAPI.SetZoneForwarders(
@@ -897,10 +907,10 @@
# Changing settings
elsif Ops.get(options, "set") != nil
# Zone MasterServers
- if Ops.get(options, "masterserver") != nil
+ if primaryserver != nil
return DnsServerAPI.SetZoneMasterServers(
Ops.get_string(options, "name"),
- [Ops.get_string(options, "masterserver")]
+ [primaryserver]
)
# Zone Forwarders
elsif Ops.get(options, "forwarders") != nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/src/include/dns-server/dialog-main.rb
new/yast2-dns-server-4.4.1/src/include/dns-server/dialog-main.rb
--- old/yast2-dns-server-4.4.0/src/include/dns-server/dialog-main.rb
2021-04-30 18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/src/include/dns-server/dialog-main.rb
2022-02-02 18:11:41.000000000 +0100
@@ -1593,9 +1593,11 @@
_("Type"),
[
# Combobox - DNS adding zone - Type Master
- Item(Id("master"), _("Master")),
+ # TRANSLATORS: Primary is new name for Master (zone)
+ Item(Id("master"), _("Primary")),
# Combobox - DNS adding zone - Type Slave
- Item(Id("slave"), _("Slave")),
+ # TRANSLATORS: Secondary is new name for Slave (zone)
+ Item(Id("slave"), _("Secondary")),
# Combobox - DNS adding zone - Type Slave
Item(Id("forward"), _("Forward"))
]
@@ -1683,13 +1685,13 @@
case Ops.get_string(z, "type", "master")
when "master"
# TRANSLATORS: Table item - Server type
- type_trans = _("Master")
+ type_trans = _("Primary")
when "slave"
# TRANSLATORS: Table item - Server type
- type_trans = _("Slave")
+ type_trans = _("Secondary")
when "stub"
# TRANSLATORS: Table item - Server type
- type_trans = _("Slave")
+ type_trans = _("Secondary")
when "forward"
# TRANSLATORS: Table item - Server type
type_trans = _("Forward")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/src/include/dns-server/dialog-masterzone.rb
new/yast2-dns-server-4.4.1/src/include/dns-server/dialog-masterzone.rb
--- old/yast2-dns-server-4.4.0/src/include/dns-server/dialog-masterzone.rb
2021-04-30 18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/src/include/dns-server/dialog-masterzone.rb
2022-02-02 18:11:41.000000000 +0100
@@ -1185,7 +1185,7 @@
_(
"The expiration time-out is higher than the time period\n" +
"of zone refreshes. The zone will not be reachable\n" +
- "from slave name servers all the time.\n" +
+ "from secondary name servers all the time.\n" +
"Continue?"
)
)
@@ -2679,7 +2679,7 @@
VSpacing(1),
# TRANSLATORS: Text entry
Left(
- InputField(Id("master"), Opt(:hstretch), _("&Master DNS Server IP"))
+ InputField(Id("master"), Opt(:hstretch), _("&Primary DNS Server IP"))
),
VSpacing(2),
Left(
@@ -2743,11 +2743,12 @@
if Builtins.size(@current_zone_masters) == 0
if Popup.ContinueCancelHeadline(
# TRANSLATORS: Popup error headline
- _("Missing Master Server"),
+ # TRANSLATORS: Primary is new name for Master (zone)
+ _("Missing Primary Server"),
# TRANSLATORS: Popup error text
_(
- "Every slave zone must have its master server IP defined.\n"
+
- "Configuration of a DNS server without a master server
would fail.\n" +
+ "Every secondary zone must have its primary server IP
defined.\n" +
+ "Configuration of a DNS server without a primary server
would fail.\n" +
"If you continue, the current zone will be removed."
)
)
@@ -2765,7 +2766,7 @@
if ret == :next
if false
# TRANSLATORS: A popup error message
- Report.Error(_("No master DNS server defined."))
+ Report.Error(_("No primary DNS server defined."))
next
else
# controlling sever name, IP
@@ -2777,7 +2778,7 @@
UI.SetFocus(Id("master"))
# A popup error message
Popup.Error(
- _("The specified master name server is not a valid IP
address.")
+ _("The specified primary name server is not a valid IP
address.")
)
next
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/src/include/dns-server/helps.rb
new/yast2-dns-server-4.4.1/src/include/dns-server/helps.rb
--- old/yast2-dns-server-4.4.0/src/include/dns-server/helps.rb 2021-04-30
18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/src/include/dns-server/helps.rb 2022-02-02
18:11:41.000000000 +0100
@@ -66,17 +66,17 @@
),
# help 2/5 alt. 2
"zone_masters" => _(
- "<p><b><big>Master Servers</big></b><br>\n" +
- "Set the IP addresses of the master name servers for this zone.
Use <b>Add</b>\n" +
- "to add a new master name server. Select an existing one then
click <b>Delete</b>\n" +
+ "<p><b><big>Primary Servers</big></b><br>\n" +
+ "Set the IP addresses of the primary name servers for this zone.
Use <b>Add</b>\n" +
+ "to add a new primary name server. Select an existing one then
click <b>Delete</b>\n" +
"to remove an existing one.</p>"
),
# help 1/2
"zone_type" => _(
"<p><b><big>Zone Type</big></b><br>\n" +
"To make this name server the primary source of the data of the
zone,\n" +
- "select <b>Master</b>. To make it the secondary name server,
select <b>Slave</b>\n" +
- "or <b>Stub</b>, so the data of the zone will be mirrored from the
master\n" +
+ "select <b>Primary</b>. To make it the secondary name server,
select <b>Secondary</b>\n" +
+ "or <b>Stub</b>, so the data of the zone will be mirrored from the
primary\n" +
"server.</p>"
),
# help 2/2
@@ -121,26 +121,26 @@
# help text 5/9 - Serial
_(
"<p><b>Serial</b> number is used for determining if the zone has
changed on\n" +
- "the master servers (so that slave servers do not always need to
synchronize the\n" +
+ "the primary servers (so that secondary servers do not always
need to synchronize the\n" +
"entire zone).</p>\n"
) +
# help text 6/9 - Refresh
_(
- "<p><b>Refresh</b> sets how often the zone should be synchronized
from\nmaster name server to slave name servers.</p>"
+ "<p><b>Refresh</b> sets how often the zone should be synchronized
from\nprimary name server to secondary name servers.</p>"
) +
# help text 7/9 - Retry
_(
- "<p><b>Retry</b> sets how often slave servers try to
synchronize\nthe zone from the master server if synchronization fails.</p>"
+ "<p><b>Retry</b> sets how often secondary servers try to
synchronize\nthe zone from the primary server if synchronization fails.</p>"
) +
# help text 8/9 - Expiry
_(
- "<p><b>Expiry</b> means the period after which the zone expires on
slave\n" +
- "servers and slave servers stop answering replies until it is
synchronized.\n" +
+ "<p><b>Expiry</b> means the period after which the zone expires on
secondary\n" +
+ "servers and secondary servers stop answering replies until it
is synchronized.\n" +
"</p>"
) +
# help text 9/9 - Minimum
_(
- "<p><b>Minimum</b> sets for how long the slave servers should
cache\nnegative answers (name resolution failed).</p>"
+ "<p><b>Minimum</b> sets for how long the secondary servers should
cache\nnegative answers (name resolution failed).</p>"
),
# ddns keys dialog
# help text 1/1
@@ -326,7 +326,7 @@
# Zone Editor - Help
_(
"<p>\n" +
- "Reverse zone records can be generated from another master
zone.\n" +
+ "Reverse zone records can be generated from another primary
zone.\n" +
"Select the <b>Automatically Generate Records From</b>\n" +
"check-box and choose the zone to generate the records
from.</p>\n"
) +
@@ -359,7 +359,7 @@
_(
"<p><b>Serial</b> is the number used for determining if the zone
has \n" +
"changed on\n" +
- "the master servers (then slave servers do not always need to
synchronize the\n" +
+ "the primary servers (then secondary servers do not always need
to synchronize the\n" +
"entire zone).</p>\n"
) +
# Zone Editor - Help for tab - Zone (SOA) 3/7
@@ -368,21 +368,21 @@
) +
# Zone Editor - Help for tab - Zone (SOA) 4/7
_(
- "<p><b>Refresh</b> sets how often the zone should be synchronized
from\nmaster name server to slave name servers.</p>"
+ "<p><b>Refresh</b> sets how often the zone should be synchronized
from\nprimary name server to secondary name servers.</p>"
) +
# Zone Editor - Help for tab - Zone (SOA) 5/7
_(
- "<p><b>Retry</b> sets how often slave servers try to
synchronize\nthe zone from the master server if synchronization fails.</p>"
+ "<p><b>Retry</b> sets how often secondary servers try to
synchronize\nthe zone from the primary server if synchronization fails.</p>"
) +
# Zone Editor - Help for tab - Zone (SOA) 6/7
_(
- "<p><b>Expiration</b> means the period after which the zone
expires on slave\n" +
- "servers and slave servers stop answering replies until it is
synchronized.\n" +
+ "<p><b>Expiration</b> means the period after which the zone
expires on secondary\n" +
+ "servers and secondary servers stop answering replies until it
is synchronized.\n" +
"</p>"
) +
# Zone Editor - Help for tab - Zone (SOA) 7/7
_(
- "<p><b>Minimum</b> sets for how long the slave servers should
cache\nnegative answers (name resolution failed).</p>"
+ "<p><b>Minimum</b> sets for how long the secondary servers should
cache\nnegative answers (name resolution failed).</p>"
),
# Zone Editor - Help for tab - Records 1/7 or 1/5
"zone_editor_records" => _(
@@ -482,9 +482,9 @@
),
# slave zone help text 1/2
"slave_zone" => _(
- "<p><big><b>Slave DNS Zone</b></big><br>\n" +
- "Each slave zone must have the master name server defined. Use\n" +
- "<b>Master DNS Server IP</b> to define the master name server.</p>"
+ "<p><big><b>Secondary DNS Zone</b></big><br>\n" +
+ "Each slave zone must have the primary name server defined. Use\n"
+
+ "<b>Primary DNS Server IP</b> to define the primary name
server.</p>"
) +
# slave zone help text 2/2
_(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.4.0/src/modules/DnsServer.pm
new/yast2-dns-server-4.4.1/src/modules/DnsServer.pm
--- old/yast2-dns-server-4.4.0/src/modules/DnsServer.pm 2021-04-30
18:15:07.000000000 +0200
+++ new/yast2-dns-server-4.4.1/src/modules/DnsServer.pm 2022-02-02
18:11:41.000000000 +0100
@@ -1638,9 +1638,11 @@
my %zone_types = (
# type of zone to be used in summary
- "master" => __("Master"),
+ # TRANSLATORS: Primary is new name for Master (zone)
+ "master" => __("Primary"),
# type of zone to be used in summary
- "slave" => __("Slave"),
+ # TRANSLATORS: Secondary is new name for Slave (zone)
+ "slave" => __("Secondary"),
# type of zone to be used in summary
"stub" => __("Stub"),
# type of zone to be used in summary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dns-server-4.4.0/test/Makefile.am
new/yast2-dns-server-4.4.1/test/Makefile.am
--- old/yast2-dns-server-4.4.0/test/Makefile.am 2021-04-30 18:15:07.000000000
+0200
+++ new/yast2-dns-server-4.4.1/test/Makefile.am 2022-02-02 18:11:41.000000000
+0100
@@ -1,8 +1,10 @@
TESTS = \
+ dns_server_cmdline_test.rb \
dns_server_test.rb \
dns_server_ui_test.rb \
etc_named_parsing_test.rb \
- masterzone_test.rb
+ masterzone_test.rb \
+ service_widget_helpers_test.rb
TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dns-server-4.4.0/test/dns_server_cmdline_test.rb
new/yast2-dns-server-4.4.1/test/dns_server_cmdline_test.rb
--- old/yast2-dns-server-4.4.0/test/dns_server_cmdline_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-dns-server-4.4.1/test/dns_server_cmdline_test.rb 2022-02-02
18:11:41.000000000 +0100
@@ -0,0 +1,18 @@
+#! /usr/bin/env rspec
+
+require_relative "test_helper"
+
+class DnsServerCmdlineDummy < Yast::Module
+ def initialize
+ Yast.include self, "dns-server/cmdline.rb"
+ end
+end
+
+
+describe "Yast::DnsServerCmdlineInclude" do
+ subject { DnsServerCmdlineDummy.new }
+
+ it "loads" do
+ expect { subject }.to_not raise_error
+ end
+end
