Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 865056 : "sshd should be started by default on SLES" (NEEDINFO/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-03-31 10:48:38.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-04-02 11:34:53.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 2 09:22:07 UTC 2014 - jreidinger@suse.com + +- split enabling sshd and opening firewall port in installation + (bnc#865056) +- 3.1.42 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 15 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:35348 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.41.tar.bz2 New: ---- yast2-network-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.ZThuEH/_old 2014-04-02 12:26:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ZThuEH/_new 2014-04-02 12:26:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.41.tar.bz2 -> yast2-network-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.41/package/yast2-network.changes new/yast2-network-3.1.42/package/yast2-network.changes --- old/yast2-network-3.1.41/package/yast2-network.changes 2014-03-31 08:58:24.000000000 +0200 +++ new/yast2-network-3.1.42/package/yast2-network.changes 2014-04-02 11:30:29.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 2 09:22:07 UTC 2014 - jreidinger@suse.com + +- split enabling sshd and opening firewall port in installation + (bnc#865056) +- 3.1.42 + +------------------------------------------------------------------- Mon Mar 31 08:53:01 CEST 2014 - locilka@suse.com - Fixed calling logging function in inst_lan (bnc#871091) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.41/package/yast2-network.spec new/yast2-network-3.1.42/package/yast2-network.spec --- old/yast2-network-3.1.41/package/yast2-network.spec 2014-03-31 08:58:24.000000000 +0200 +++ new/yast2-network-3.1.42/package/yast2-network.spec 2014-04-02 11:30:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.41/src/clients/firewall_stage1_finish.rb new/yast2-network-3.1.42/src/clients/firewall_stage1_finish.rb --- old/yast2-network-3.1.41/src/clients/firewall_stage1_finish.rb 2014-03-31 08:58:24.000000000 +0200 +++ new/yast2-network-3.1.42/src/clients/firewall_stage1_finish.rb 2014-04-02 11:30:29.000000000 +0200 @@ -57,6 +57,7 @@ #we have those from the proposal @fw_enabled = SuSEFirewall4Network.Enabled1stStage @ssh_enabled = SuSEFirewall4Network.EnabledSsh1stStage + @sshd_enabled = SuSEFirewall4Network.EnabledSshd @vnc_enabled = SuSEFirewall4Network.EnabledVnc1stStage if @func == "Info" @@ -94,7 +95,10 @@ SuSEFirewall.GetKnownFirewallZones, true ) - #enable SSH service if the port is to be opened (bnc#537980) + end + + if @sshd_enabled + #enable SSH service independent of port open (bnc#865056) Service.Enable("sshd") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.41/src/clients/firewall_stage1_proposal.rb new/yast2-network-3.1.42/src/clients/firewall_stage1_proposal.rb --- old/yast2-network-3.1.41/src/clients/firewall_stage1_proposal.rb 2014-03-31 08:58:24.000000000 +0200 +++ new/yast2-network-3.1.42/src/clients/firewall_stage1_proposal.rb 2014-04-02 11:30:29.000000000 +0200 @@ -28,6 +28,19 @@ # module Yast class FirewallStage1ProposalClient < Client + PROPOSAL_ID = "fw_1ststage" + + LINK_ENABLE_FIREWALL = "firewall--enable_firewall_in_proposal" + LINK_DISABLE_FIREWALL = "firewall--disable_firewall_in_proposal" + LINK_OPEN_SSH_PORT = "firewall--enable_ssh_port_in_proposal" + LINK_BLOCK_SSH_PORT = "firewall--disable_ssh_port_in_proposal" + LINK_ENABLE_SSHD = "firewall--enable_sshd_in_proposal" + LINK_DISABLE_SSHD = "firewall--disable_sshd_in_proposal" + LINK_ENABLE_VNC = "firewall--enable_vnc_in_proposal" + LINK_DISABLE_VNC = "firewall--disable_vnc_in_proposal" + LINK_FIREWALL_DIALOG = "firewall_stage1" + + def main Yast.import "UI" textdomain "network" @@ -41,39 +54,34 @@ Yast.import "SuSEFirewallProposal" Yast.import "Wizard" - @PROPOSAL_ID = "fw_1ststage" - - @LINK_ENABLE_FIREWALL = "firewall--enable_firewall_in_proposal" - @LINK_DISABLE_FIREWALL = "firewall--disable_firewall_in_proposal" - @LINK_ENABLE_SSH = "firewall--enable_ssh_in_proposal" - @LINK_DISABLE_SSH = "firewall--disable_ssh_in_proposal" - @LINK_ENABLE_VNC = "firewall--enable_vnc_in_proposal" - @LINK_DISABLE_VNC = "firewall--disable_vnc_in_proposal" - @LINK_FIREWALL_DIALOG = "firewall_stage1" - # run this only once if !SuSEFirewallProposal.GetProposalInitialized # variables from control file Builtins.y2milestone( - "Default firewall values: enable_firewall=%1, enable_ssh=%2", + "Default firewall values: enable_firewall=%1, enable_ssh=%2 enable_sshd=%3", ProductFeatures.GetBooleanFeature("globals", "enable_firewall"), - ProductFeatures.GetBooleanFeature("globals", "firewall_enable_ssh") + ProductFeatures.GetBooleanFeature("globals", "firewall_enable_ssh"), + ProductFeatures.GetBooleanFeature("globals", "enable_sshd") ) SuSEFirewall4Network.SetEnabled1stStage( ProductFeatures.GetBooleanFeature("globals", "enable_firewall") ) - #we're installing over SSH, propose opening SSH port (bnc#535206) + # we're installing over SSH, propose opening SSH port (bnc#535206) if Linuxrc.usessh SuSEFirewall4Network.SetSshEnabled1stStage(true) + SuSEFirewall4Network.SetSshdEnabled(true) else SuSEFirewall4Network.SetSshEnabled1stStage( ProductFeatures.GetBooleanFeature("globals", "firewall_enable_ssh") ) + SuSEFirewall4Network.SetSshdEnabled1stStage( + ProductFeatures.GetBooleanFeature("globals", "enable_sshd") + ) end - #we're installing over VNC, propose opening VNC port (bnc#734264) + # we're installing over VNC, propose opening VNC port (bnc#734264) SuSEFirewall4Network.SetVncEnabled1stStage(true) if Linuxrc.vnc SuSEFirewallProposal.SetProposalInitialized(true) @@ -88,82 +96,64 @@ if @func == "MakeProposal" # Summary is visible only if installing over VNC # and if firewall is enabled - otherwise port could not be blocked - @vnc_proposal = Linuxrc.vnc && SuSEFirewall4Network.Enabled1stStage ? - Ops.add( - Ops.add( - "<li>", - SuSEFirewall4Network.EnabledVnc1stStage ? - Builtins.sformat( - _("VNC ports will be open (<a href=\"%1\">close</a>)"), - @LINK_DISABLE_VNC - ) : - Builtins.sformat( - _("VNC ports will be blocked (<a href=\"%1\">open</a>)"), - @LINK_ENABLE_VNC - ) - ), - "</li>\n" - ) : - "" + vnc_proposal_element = "" + if Linuxrc.vnc && SuSEFirewall4Network.Enabled1stStage + vnc_proposal = SuSEFirewall4Network.EnabledVnc1stStage ? + _("VNC ports will be open (<a href=\"%s\">close</a>)") % + LINK_DISABLE_VNC + : _("VNC ports will be blocked (<a href=\"%s\">open</a>)") % + LINK_ENABLE_VNC + vnc_proposal_element = "<li>#{vnc_proposal}</li>" + end + + firewall_proposal = SuSEFirewall4Network.Enabled1stStage ? + _( + "Firewall will be enabled (<a href=\"%s\">disable</a>)" + ) % LINK_DISABLE_FIREWALL + : + _( + "Firewall will be disabled (<a href=\"%s\">enable</a>)" + ) % LINK_ENABLE_FIREWALL + + ssh_proposal = SuSEFirewall4Network.EnabledSsh1stStage ? + _( + "SSH port will be open (<a href=\"%s\">block</a>)" + ) % LINK_BLOCK_SSH_PORT + : + _( + "SSH port will be blocked (<a href=\"%s\">open</a>)" + ) % LINK_OPEN_SSH_PORT + + sshd_proposal = SuSEFirewall4Network.EnabledSsh ? + _( + "SSH service will be enabled (<a href=\"%s\">disable</a>)" + ) % LINK_DISABLE_SSHD + : + _( + "SSH service will be disabled (<a href=\"%s\">enable</a>)" + ) % LINK_ENABLE_SSHD - @output = Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - "<ul>\n" + "<li>", - SuSEFirewall4Network.Enabled1stStage ? - Builtins.sformat( - _( - "Firewall will be enabled (<a href=\"%1\">disable</a>)" - ), - @LINK_DISABLE_FIREWALL - ) : - Builtins.sformat( - _( - "Firewall will be disabled (<a href=\"%1\">enable</a>)" - ), - @LINK_ENABLE_FIREWALL - ) - ), - "</li>\n" - ), - # Summary is visible even if firewall is disabled - it also installs and enables the SSHD service - "<li>" - ), - SuSEFirewall4Network.EnabledSsh1stStage ? - Builtins.sformat( - _( - "SSH service will be enabled, SSH port will be open (<a href=\"%1\">disable and close</a>)" - ), - @LINK_DISABLE_SSH - ) : - Builtins.sformat( - _( - "SSH service will be disabled, SSH port will be blocked (<a href=\"%1\">enable and open</a>)" - ), - @LINK_ENABLE_SSH - ) - ), - "</li>\n" - ), - @vnc_proposal - ), - "</ul>\n" - ) + + + + @output = "<ul>\n<li>#{firewall_proposal}</li>\n" + + "<li>#{ssh_proposal}</li>\n" + + "<li>#{sshd_proposal}</li>\n" + + vnc_proposal_element + + "</ul>\n" @ret = { "preformatted_proposal" => @output, "warning_level" => :warning, "links" => [ - @LINK_ENABLE_FIREWALL, - @LINK_DISABLE_FIREWALL, - @LINK_ENABLE_SSH, - @LINK_DISABLE_SSH, - @LINK_ENABLE_VNC, - @LINK_DISABLE_VNC + LINK_ENABLE_FIREWALL, + LINK_DISABLE_FIREWALL, + LINK_OPEN_SSH_PORT, + LINK_BLOCK_SSH_PORT, + LINK_ENABLE_SSHD, + LINK_DISABLE_SSHD, + LINK_ENABLE_VNC, + LINK_DISABLE_VNC ] } elsif @func == "AskUser" @@ -171,42 +161,51 @@ @result = :next Builtins.y2milestone("User clicked %1", @chosen_link) - if @chosen_link == @LINK_ENABLE_FIREWALL + case @chosen_link + when LINK_ENABLE_FIREWALL Builtins.y2milestone("Enabling FW") SuSEFirewall4Network.SetEnabled1stStage(true) PackagesProposal.AddResolvables( - @PROPOSAL_ID, + PROPOSAL_ID, :package, ["SuSEfirewall2"] ) - elsif @chosen_link == @LINK_DISABLE_FIREWALL + when LINK_DISABLE_FIREWALL Builtins.y2milestone("Disabling FW") SuSEFirewall4Network.SetEnabled1stStage(false) PackagesProposal.RemoveResolvables( - @PROPOSAL_ID, + PROPOSAL_ID, :package, ["SuSEfirewall2"] ) - elsif @chosen_link == @LINK_ENABLE_SSH - Builtins.y2milestone("Enabling SSH") - PackagesProposal.AddResolvables(@PROPOSAL_ID, :package, ["openssh"]) + when LINK_OPEN_SSH_PORT + Builtins.y2milestone("Opening SSH port") SuSEFirewall4Network.SetSshEnabled1stStage(true) - elsif @chosen_link == @LINK_DISABLE_SSH - Builtins.y2milestone("Disabling SSH") + when LINK_BLOCK_SSH_PORT + Builtins.y2milestone("Blocking SSH port") SuSEFirewall4Network.SetSshEnabled1stStage(false) + when LINK_ENABLE_SSHD + Builtins.y2milestone("Enabling SSHD") + PackagesProposal.AddResolvables(PROPOSAL_ID, :package, ["openssh"]) + SuSEFirewall4Network.SetSshdEnabled(true) + when LINK_DISABLE_SSHD + Builtins.y2milestone("Disabling SSHD") + SuSEFirewall4Network.SetSshdEnabled(false) PackagesProposal.RemoveResolvables( - @PROPOSAL_ID, + PROPOSAL_ID, :package, ["openssh"] ) - elsif @chosen_link == @LINK_ENABLE_VNC + when LINK_ENABLE_VNC Builtins.y2milestone("Enabling VNC") SuSEFirewall4Network.SetVncEnabled1stStage(true) - elsif @chosen_link == @LINK_DISABLE_VNC + when LINK_DISABLE_VNC Builtins.y2milestone("Disabling VNC") SuSEFirewall4Network.SetVncEnabled1stStage(false) - elsif @chosen_link == @LINK_FIREWALL_DIALOG + when LINK_FIREWALL_DIALOG @result = FirewallDialogSimple() + else + raise "INTERNAL ERROR: unknown action '#{@chosen_link}' for proposal client" end SuSEFirewallProposal.SetChangedByUser(true) @@ -219,7 +218,7 @@ "rich_text_title" => _("Firewall and SSH"), # Menu entry label "menu_title" => _("&Firewall and SSH"), - "id" => @LINK_FIREWALL_DIALOG + "id" => LINK_FIREWALL_DIALOG } elsif @func == "Write" @ret = { "success" => true } @@ -262,10 +261,19 @@ CheckBox( Id("open_ssh_port"), # TRANSLATORS: check-box label - _("Open SSH Port and Enable SSH Service"), + _("Open SSH Port"), SuSEFirewall4Network.EnabledSsh1stStage ) ), + Left( + CheckBox( + Id("enable_sshd"), + # TRANSLATORS: check-box label + _("Enable SSH Service"), + SuSEFirewall4Network.EnabledSshd + ) + ), + Linuxrc.vnc ? vnc_support : Empty() ) ) @@ -284,7 +292,7 @@ ) + _( "<p>With enabled firewall, you can decide whether to open firewall port for SSH\n" + - "service and allow remote SSH logins. This will also enable SSH service (i.e. it\n" + + "service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n" + "will be started on computer boot).</p>" ) + (Linuxrc.vnc ? @@ -346,6 +354,10 @@ SuSEFirewall4Network.SetSshEnabled1stStage(open_ssh_port) SuSEFirewall4Network.SetVncEnabled1stStage(open_vnc_port) end + + SuSEFirewall4Network.SetSshdEnabled( + UI::QueryWidget(Id("enable_sshd"), :Value) + ) end # anything but enabling the firewall closes this dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.41/src/modules/SuSEFirewall4Network.rb new/yast2-network-3.1.42/src/modules/SuSEFirewall4Network.rb --- old/yast2-network-3.1.41/src/modules/SuSEFirewall4Network.rb 2014-03-31 08:58:24.000000000 +0200 +++ new/yast2-network-3.1.42/src/modules/SuSEFirewall4Network.rb 2014-04-02 11:30:29.000000000 +0200 @@ -44,6 +44,7 @@ @firewall_enabled_1st_stage = false @ssh_enabled_1st_stage = false + @sshd_enabled = false @vnc_enabled_1st_stage = false end @@ -249,6 +250,19 @@ @ssh_enabled_1st_stage end + # Sets whether start sshd + # @param boolean new state + def SetSshdEnabled(enabled) + @sshd_enabled = enabled + + nil + end + + # Returns whether sshd will be enabled + def EnabledSshd + @sshd_enabled + end + # Sets whether VNC ports should be opened in firewall # @param boolean new state def SetVncEnabled1stStage(enabled) @@ -276,6 +290,8 @@ publish :function => :Enabled1stStage, :type => "boolean ()" publish :function => :SetSshEnabled1stStage, :type => "void (boolean)" publish :function => :EnabledSsh1stStage, :type => "boolean ()" + publish :function => :SetSshdEnabled, :type => "void (boolean)" + publish :function => :EnabledSshd, :type => "boolean ()" publish :function => :SetVncEnabled1stStage, :type => "void (boolean)" publish :function => :EnabledVnc1stStage, :type => "boolean ()" end continue with "q"... Checked in at Wed Apr 2 12:26:41 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org