Hello community,
here is the log from the commit of package yast2-samba-server for
openSUSE:Factory checked in at 2017-09-23 21:32:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Sat Sep 23 21:32:02 2017 rev:76 rq:528162 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes
2017-04-12 17:09:26.928741258 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes
2017-09-23 21:32:02.724729261 +0200
@@ -1,0 +2,6 @@
+Wed Jul 26 07:23:28 UTC 2017 - [email protected]
+
+- Drop NT style PDC/BDC configuration wizard (fate#323806)
+- 3.2.2
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-3.2.1.tar.bz2
New:
----
yast2-samba-server-3.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.QTsu6z/_old 2017-09-23 21:32:03.300648238 +0200
+++ /var/tmp/diff_new_pack.QTsu6z/_new 2017-09-23 21:32:03.304647675 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-server-3.2.1.tar.bz2 -> yast2-samba-server-3.2.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.2.1/package/yast2-samba-server.changes
new/yast2-samba-server-3.2.2/package/yast2-samba-server.changes
--- old/yast2-samba-server-3.2.1/package/yast2-samba-server.changes
2017-04-04 12:34:16.947904660 +0200
+++ new/yast2-samba-server-3.2.2/package/yast2-samba-server.changes
2017-09-22 04:06:51.176440424 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 26 07:23:28 UTC 2017 - [email protected]
+
+- Drop NT style PDC/BDC configuration wizard (fate#323806)
+- 3.2.2
+
+-------------------------------------------------------------------
Thu Apr 3 18:42:42 UTC 2017 - [email protected]
- fix duplicated key warnings (bsc#1031613).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.2.1/package/yast2-samba-server.spec
new/yast2-samba-server-3.2.2/package/yast2-samba-server.spec
--- old/yast2-samba-server-3.2.1/package/yast2-samba-server.spec
2017-04-04 12:34:16.947904660 +0200
+++ new/yast2-samba-server-3.2.2/package/yast2-samba-server.spec
2017-09-22 04:06:51.176440424 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.2.1/src/include/samba-server/dialogs.rb
new/yast2-samba-server-3.2.2/src/include/samba-server/dialogs.rb
--- old/yast2-samba-server-3.2.1/src/include/samba-server/dialogs.rb
2017-04-04 12:34:16.951904660 +0200
+++ new/yast2-samba-server-3.2.2/src/include/samba-server/dialogs.rb
2017-09-22 04:06:51.176440424 +0200
@@ -168,7 +168,7 @@
def Installation_Step1
- caption = _("Samba Installation") + ": " + _("Step 1 of 2")
+ caption = _("Samba Installation") + ": " + _("Step 1 of 1")
# feature dropped
# list <string> workgroups = SambaNmbLookup::GetAvailableNeighbours(nil);
@@ -231,85 +231,6 @@
deep_copy(ret)
end
-
- def Installation_Step2
- caption = _("Samba Installation") + ": " + _("Step 2 of 2")
-
- workgroup = SambaConfig.GlobalGetStr("workgroup", "")
- has_pdc = SambaNmbLookup.HasPDC(workgroup)
- has_bdc = SambaNmbLookup.HasBDC(workgroup)
-
- contents = VBox(
- #header of status-like information. followed by domain name
- VSquash(
- Left(Label(Ops.add(_("Current Domain Name:") + " ", workgroup)))
- ),
- VSpacing(1),
- VSquash(
- Frame(
- _("Samba Server Type"),
- VBox(
- RadioButtonGroup(
- Id("samba_server_type"),
- VBox(
- VSpacing(1),
- Left(RadioButton(Id("PDC"), @pdc, false)),
- HBox(
- HSpacing(4),
- # appears on new line after Primary Domain Controller
radio button
- Left(
- Label(
- has_pdc ?
- _("Not available because a PDC is present.") :
- ""
- )
- )
- ),
- VBox(
- Left(RadioButton(Id("BDC"), @bdc, false)),
- HBox(HSpacing(4), Left(Label("")))
- ),
- Left(RadioButton(Id("Standalone"), @standalone, true)),
- VSpacing(1)
- )
- )
- )
- )
- ),
- VStretch()
- )
-
- help = Ops.get_string(@HELPS, "inst_step2", "")
-
- Wizard.SetContents(caption, contents, help, true, true)
-
- UI.ChangeWidget(Id("PDC"), :Enabled, !has_pdc)
-
- ret = nil
- while true
- ret = UI.UserInput
- if ret == :abort || ret == :cancel
- break if confirmAbort
- next
- end
- if ret == :back || ret == :next || ret == :abort || ret == :cancel
- if ret == :next
- # store the value
- SambaRole.SetRole(
- Convert.to_string(
- UI.QueryWidget(Id("samba_server_type"), :CurrentButton)
- )
- )
- end
- break
- else
- Builtins.y2error("unexpected retcode: %1", ret)
- next
- end
- end
-
- deep_copy(ret)
- end
def getRole
role = SambaRole.GetRole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.2.1/src/include/samba-server/helps.rb
new/yast2-samba-server-3.2.2/src/include/samba-server/helps.rb
--- old/yast2-samba-server-3.2.1/src/include/samba-server/helps.rb
2017-04-04 12:34:16.951904660 +0200
+++ new/yast2-samba-server-3.2.2/src/include/samba-server/helps.rb
2017-09-22 04:06:51.176440424 +0200
@@ -58,24 +58,6 @@
"Select existing name of workgroup or domain or type your own new
name and click <b>Next</b>.\n" +
"</p>\n"
),
- # Samba select Samba Server type - Installation step 2
- "inst_step2" => _(
- "<p><b><big>Samba Server Type</big></b></p>\n" +
- "<p>A domain controller allows Windows clients to log in to a
Windows NT style domain.</p>\n" +
- "<p>The backup controller uses another domain controller for
validation.\n" +
- "The primary controller uses its own information about users and
their passwords.</p>\n" +
- "<p>The options available in the configuration dialogs depend on "
+
- "the settings in this selection. Windows NT style domain " +
- "controller functionality will be phased out in future " +
- "releases.</p>"
- ),
- # Samba select Samba Server type - Installation step 2
- "inst_step2_no_bdc" => _(
- "<p><b><big>Samba Server Type</big></b></p>\n" +
- "<p>A domain controller allows Windows clients to log in to a
Windows domain.</p>\n" +
- "<p>The options available in the configuration dialogs \n" +
- "depend on the settings in this selection.</p>"
- ),
# Share list dialog help 1/4
"smb_conf_tab_shares" => _(
"<p><b><big>Shares</big></b></p>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.2.1/src/include/samba-server/wizards.rb
new/yast2-samba-server-3.2.2/src/include/samba-server/wizards.rb
--- old/yast2-samba-server-3.2.1/src/include/samba-server/wizards.rb
2017-04-04 12:34:16.951904660 +0200
+++ new/yast2-samba-server-3.2.2/src/include/samba-server/wizards.rb
2017-09-22 04:06:51.176440424 +0200
@@ -48,7 +48,6 @@
def MainSequence
aliases = {
"inst_step1" => lambda { Installation_Step1() },
- "inst_step2" => lambda { Installation_Step2() },
"conf_tab" => lambda { Installation_Conf_Tab() },
"share_edit" => lambda { EditShareDialog() },
"share_add" => lambda { AddShareDialog() },
@@ -63,12 +62,6 @@
"inst_step1" => {
:cancel => :cancel,
:abort => :abort,
- :next => "inst_step2"
- },
- "inst_step2" => {
- :back => "inst_step1",
- :cancel => :cancel,
- :abort => :abort,
:next => "conf_tab"
},
"conf_tab" => {
