Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 893126 : "Default FW/SSHD config + Minimal SW selection = No SSHD installed and running" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-21 15:10:35.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-22 17:10:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 22 16:43:24 CEST 2014 - locilka@suse.com + +- Fixed requesting sshd/firewall packages in case of the default + configuration together with minimal installation (bnc#893126) +- 3.1.86 + +------------------------------------------------------------------- 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:43064 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.85.tar.bz2 New: ---- yast2-network-3.1.86.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.KzukUG/_old 2014-08-25 15:38:02.000000000 +0200 +++ /var/tmp/diff_new_pack.KzukUG/_new 2014-08-25 15:38:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.85 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.85.tar.bz2 -> yast2-network-3.1.86.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/package/yast2-network.changes new/yast2-network-3.1.86/package/yast2-network.changes --- old/yast2-network-3.1.85/package/yast2-network.changes 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/package/yast2-network.changes 2014-08-22 17:04:36.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 22 16:43:24 CEST 2014 - locilka@suse.com + +- Fixed requesting sshd/firewall packages in case of the default + configuration together with minimal installation (bnc#893126) +- 3.1.86 + +------------------------------------------------------------------- Thu Aug 21 14:20:20 CEST 2014 - locilka@suse.com - Fixed firewall proposal in case of VNC installation: using diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/package/yast2-network.spec new/yast2-network-3.1.86/package/yast2-network.spec --- old/yast2-network-3.1.85/package/yast2-network.spec 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/package/yast2-network.spec 2014-08-22 17:04:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.85 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/src/clients/firewall_stage1_proposal.rb new/yast2-network-3.1.86/src/clients/firewall_stage1_proposal.rb --- old/yast2-network-3.1.85/src/clients/firewall_stage1_proposal.rb 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/src/clients/firewall_stage1_proposal.rb 2014-08-22 17:04:36.000000000 +0200 @@ -42,6 +42,13 @@ LINK_DISABLE_VNC = "firewall--disable_vnc_in_proposal" LINK_FIREWALL_DIALOG = "firewall_stage1" + module ID + SSH_PORT = "open_ssh_port" + VNC_PORT = "open_vnc_port" + ENABLE_FW = "enable_fw" + ENABLE_SSHD = "enable_sshd" + end + include Yast::Logger def main @@ -58,15 +65,18 @@ Yast.import "SuSEFirewallProposal" Yast.import "Wizard" - @func = Convert.to_string(WFM.Args(0)) - @param = Convert.to_map(WFM.Args(1)) - @ret = {} + script_command = WFM.Args(0) + params = WFM.Args(1) || {} + script_return = {} - if @func == "MakeProposal" + case script_command + when "MakeProposal" # Don't override users settings SuSEFirewall4Network.prepare_proposal unless SuSEFirewallProposal.GetChangedByUser - @ret = { + adjust_configuration + + script_return = { "preformatted_proposal" => preformatted_proposal, "warning_level" => :warning, "links" => [ @@ -80,66 +90,62 @@ LINK_DISABLE_VNC ] } + when "AskUser" + chosen_link = params["chosen_id"] + result = :next + log.info "User clicked #{chosen_link}" - adjust_configuration - elsif @func == "AskUser" - @chosen_link = Ops.get(@param, "chosen_id") - @result = :next - Builtins.y2milestone("User clicked %1", @chosen_link) - - case @chosen_link + case chosen_link when LINK_ENABLE_FIREWALL - Builtins.y2milestone("Enabling FW") + log.info "Enabling FW" SuSEFirewall4Network.SetEnabled1stStage(true) - PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) when LINK_DISABLE_FIREWALL - Builtins.y2milestone("Disabling FW") + log.info "Disabling FW" SuSEFirewall4Network.SetEnabled1stStage(false) - PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) when LINK_OPEN_SSH_PORT - Builtins.y2milestone("Opening SSH port") + log.info "Opening SSH port" SuSEFirewall4Network.SetSshEnabled1stStage(true) when LINK_BLOCK_SSH_PORT - Builtins.y2milestone("Blocking SSH port") + log.info "Blocking SSH port" SuSEFirewall4Network.SetSshEnabled1stStage(false) when LINK_ENABLE_SSHD - Builtins.y2milestone("Enabling SSHD") - PackagesProposal.AddResolvables(PROPOSAL_ID, :package, ["openssh"]) + log.info "Enabling SSHD" SuSEFirewall4Network.SetSshdEnabled(true) when LINK_DISABLE_SSHD - Builtins.y2milestone("Disabling SSHD") + log.info "Disabling SSHD" SuSEFirewall4Network.SetSshdEnabled(false) - PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, ["openssh"]) when LINK_ENABLE_VNC - Builtins.y2milestone("Enabling VNC") + log.info "Enabling VNC" SuSEFirewall4Network.SetVncEnabled1stStage(true) when LINK_DISABLE_VNC - Builtins.y2milestone("Disabling VNC") + log.info "Disabling VNC" SuSEFirewall4Network.SetVncEnabled1stStage(false) when LINK_FIREWALL_DIALOG - @result = FirewallDialogSimple() + result = FirewallDialogSimple() else raise "INTERNAL ERROR: unknown action '#{@chosen_link}' for proposal client" end SuSEFirewallProposal.SetChangedByUser(true) - @ret = { "workflow_sequence" => @result } - adjust_configuration - elsif @func == "Description" - @ret = { + + script_return = { "workflow_sequence" => result } + when "Description" + script_return = { # Proposal title "rich_text_title" => _("Firewall and SSH"), # Menu entry label "menu_title" => _("&Firewall and SSH"), "id" => LINK_FIREWALL_DIALOG } - elsif @func == "Write" - @ret = { "success" => true } + when "Write" + script_return = { "success" => true } + else + log.error "Unknown command #{script_command}" end - deep_copy(@ret) + deep_copy(script_return) end def FirewallDialogSimple @@ -147,7 +153,7 @@ vnc_support = Left( CheckBox( - Id("open_vnc_port"), + Id(ID::VNC_PORT), # TRANSLATORS: check-box label _("Open &VNC Ports"), SuSEFirewall4Network.EnabledVnc1stStage @@ -165,7 +171,7 @@ VBox( Left( CheckBox( - Id("enable_fw"), + Id(ID::ENABLE_FW), Opt(:notify), # TRANSLATORS: check-box label _("Enable Firewall"), @@ -174,7 +180,7 @@ ), Left( CheckBox( - Id("open_ssh_port"), + Id(ID::SSH_PORT), # TRANSLATORS: check-box label _("Open SSH Port"), SuSEFirewall4Network.EnabledSsh1stStage @@ -182,7 +188,7 @@ ), Left( CheckBox( - Id("enable_sshd"), + Id(ID::ENABLE_SSHD), # TRANSLATORS: check-box label _("Enable SSH Service"), SuSEFirewall4Network.EnabledSshd @@ -233,12 +239,12 @@ Wizard.HideBackButton UI.ChangeWidget( - Id("open_ssh_port"), + Id(ID::SSH_PORT), :Enabled, SuSEFirewall4Network.Enabled1stStage ) UI.ChangeWidget( - Id("open_vnc_port"), + Id(ID::VNC_PORT), :Enabled, SuSEFirewall4Network.Enabled1stStage ) @@ -247,21 +253,15 @@ while true dialog_ret = UI.UserInput - enable_firewall = Convert.to_boolean( - UI.QueryWidget(Id("enable_fw"), :Value) - ) + enable_firewall = UI.QueryWidget(Id(ID::ENABLE_FW), :Value) - if dialog_ret == "enable_fw" - UI.ChangeWidget(Id("open_ssh_port"), :Enabled, enable_firewall) - UI.ChangeWidget(Id("open_vnc_port"), :Enabled, enable_firewall) + if dialog_ret == ID::ENABLE_FW + UI.ChangeWidget(Id(ID::SSH_PORT), :Enabled, enable_firewall) + UI.ChangeWidget(Id(ID::VNC_PORT), :Enabled, enable_firewall) next elsif dialog_ret == :next || dialog_ret == :ok - open_ssh_port = Convert.to_boolean( - UI.QueryWidget(Id("open_ssh_port"), :Value) - ) - open_vnc_port = Convert.to_boolean( - UI.QueryWidget(Id("open_vnc_port"), :Value) - ) + open_ssh_port = UI.QueryWidget(Id(ID::SSH_PORT), :Value) + open_vnc_port = UI.QueryWidget(Id(ID::VNC_PORT), :Value) SuSEFirewall4Network.SetEnabled1stStage(enable_firewall) @@ -271,7 +271,7 @@ end SuSEFirewall4Network.SetSshdEnabled( - UI::QueryWidget(Id("enable_sshd"), :Value) + UI::QueryWidget(Id(ID::ENABLE_SSHD), :Value) ) end @@ -340,11 +340,13 @@ # to AutoYast profile. def adjust_configuration enable_fw = SuSEFirewall4Network.Enabled1stStage + enable_sshd = SuSEFirewall4Network.EnabledSshd open_ssh_port = SuSEFirewall4Network.EnabledSsh1stStage open_vnc_port = SuSEFirewall4Network.EnabledVnc1stStage log.info "After installation, firewall will be #{enable_fw ? 'enabled':'disabled'}, " << - "SSH port will be #{open_ssh_port ? 'open':'closed'} " << + "SSHD will be #{enable_sshd ? 'enabled':'disabled'}, " << + "SSH port will be #{open_ssh_port ? 'open':'closed'}, " << "VNC port will be #{open_vnc_port ? 'open':'closed'}" # Read the configuration from sysconfig @@ -356,24 +358,35 @@ SuSEFirewall.SetEnableService(enable_fw) SuSEFirewall.SetStartService(enable_fw) - # only if we have openssh package - proposal takes care - # it gets installed if the user wants to open ssh port - if open_ssh_port - SuSEFirewall.SetServicesForZones( - ["service:sshd"], - SuSEFirewall.GetKnownFirewallZones, - true - ) + # Request needed packages to be installed + # bnc#893126 + if enable_fw + PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) + else + PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) end - if open_vnc_port - SuSEFirewall.SetServicesForZones( - ["service:vnc-httpd", "service:vnc-server"], - SuSEFirewall.GetKnownFirewallZones, - true - ) + if enable_sshd + PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall4NetworkClass::SSH_PACKAGE]) + else + PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall4NetworkClass::SSH_PACKAGE]) end + # Open or close FW ports depending on user decision + # This can raise an exception if requested service-files are not part of the current system + # For that reason, these files have to be part of the inst-sys + SuSEFirewall.SetServicesForZones( + SuSEFirewall4NetworkClass::SSH_SERVICES, + SuSEFirewall.GetKnownFirewallZones, + open_ssh_port + ) + + SuSEFirewall.SetServicesForZones( + SuSEFirewall4NetworkClass::VNC_SERVICES, + SuSEFirewall.GetKnownFirewallZones, + open_vnc_port + ) + # Writing the configuration including adjusting services # is done in firewall_stage1_finish end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/src/modules/SuSEFirewall4Network.rb new/yast2-network-3.1.86/src/modules/SuSEFirewall4Network.rb --- old/yast2-network-3.1.85/src/modules/SuSEFirewall4Network.rb 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/src/modules/SuSEFirewall4Network.rb 2014-08-22 17:04:37.000000000 +0200 @@ -38,6 +38,10 @@ include Yast::Logger + SSH_PACKAGE = "openssh" + SSH_SERVICES = ["service:sshd"] + VNC_SERVICES = ["service:vnc-httpd", "service:vnc-server"] + def main textdomain "network" continue with "q"... Checked in at Mon Aug 25 15:38:29 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org