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# 883836 : "Changing DHCP to DHCPv4+v6 in yast lan set 'DHCLIENT_SET_DEFAULT_ROUTE' to 'no' & breaks IPv4 routing" (RESOLVED/FIXED)
## BNC# 887406 : "Build0559: AutoYaST doesn't clone firewall settings" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-12 14:13:24.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-13 10:49:41.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Aug 13 08:40:28 UTC 2014 - mvidner@suse.com
+
+- Fixed network_autoconfiguration_test stubbing on s390 (bnc#883836).
+- 3.1.79
+
+-------------------------------------------------------------------
+Tue Aug 12 16:58:55 CEST 2014 - locilka@suse.com
+
+- Reading and adjusting the SuSEfirewall2 configuration has been
+ moved from inst_finish to inst_proposal because AutoYast export
+ can be already requested in inst_proposal (bnc#887406)
+- 3.1.78
+
+-------------------------------------------------------------------
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:42569 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-network-3.1.77.tar.bz2
New:
----
yast2-network-3.1.79.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Zdhs0Z/_old 2014-08-13 13:05:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Zdhs0Z/_new 2014-08-13 13:05:22.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.77
+Version: 3.1.79
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,8 @@
# yast2 v3.1.86: Added ServicesProposal library
BuildRequires: yast2 >= 3.1.86
-Requires: yast2 >= 3.1.86
+# yast2 v3.1.97: Fixed checking whether SuSEfirewall2 package is installed/selected
+Requires: yast2 >= 3.1.97
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.80.0
++++++ yast2-network-3.1.77.tar.bz2 -> yast2-network-3.1.79.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.77/package/yast2-network.changes new/yast2-network-3.1.79/package/yast2-network.changes
--- old/yast2-network-3.1.77/package/yast2-network.changes 2014-08-11 10:49:58.000000000 +0200
+++ new/yast2-network-3.1.79/package/yast2-network.changes 2014-08-13 11:19:55.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed Aug 13 08:40:28 UTC 2014 - mvidner@suse.com
+
+- Fixed network_autoconfiguration_test stubbing on s390 (bnc#883836).
+- 3.1.79
+
+-------------------------------------------------------------------
+Tue Aug 12 16:58:55 CEST 2014 - locilka@suse.com
+
+- Reading and adjusting the SuSEfirewall2 configuration has been
+ moved from inst_finish to inst_proposal because AutoYast export
+ can be already requested in inst_proposal (bnc#887406)
+- 3.1.78
+
+-------------------------------------------------------------------
Thu Aug 7 12:20:44 UTC 2014 - mvidner@suse.com
- Do not lose default route when editing an interface (bnc#883836).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.77/package/yast2-network.spec new/yast2-network-3.1.79/package/yast2-network.spec
--- old/yast2-network-3.1.77/package/yast2-network.spec 2014-08-11 10:49:58.000000000 +0200
+++ new/yast2-network-3.1.79/package/yast2-network.spec 2014-08-13 11:19:55.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.77
+Version: 3.1.79
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,8 @@
# yast2 v3.1.86: Added ServicesProposal library
BuildRequires: yast2 >= 3.1.86
-Requires: yast2 >= 3.1.86
+# yast2 v3.1.97: Fixed checking whether SuSEfirewall2 package is installed/selected
+Requires: yast2 >= 3.1.97
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.80.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.77/src/clients/firewall_stage1_finish.rb new/yast2-network-3.1.79/src/clients/firewall_stage1_finish.rb
--- old/yast2-network-3.1.77/src/clients/firewall_stage1_finish.rb 2014-08-11 10:49:58.000000000 +0200
+++ new/yast2-network-3.1.79/src/clients/firewall_stage1_finish.rb 2014-08-13 11:19:55.000000000 +0200
@@ -26,6 +26,8 @@
# at the end of 1st stage
# Author: Bubli
#
+require "yast"
+
module Yast
class FirewallStage1FinishClient < Client
def main
@@ -34,7 +36,6 @@
Yast.import "Service"
Yast.import "SuSEFirewall"
Yast.import "SuSEFirewall4Network"
- Yast.import "SuSEFirewallProposal"
@ret = nil
@func = ""
@@ -54,13 +55,8 @@
Builtins.y2debug("func=%1", @func)
Builtins.y2debug("param=%1", @param)
- #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"
+ case @func
+ when "Info"
return {
"steps" => 1,
# progress step title
@@ -69,46 +65,11 @@
),
"when" => [:installation, :autoinst]
}
- elsif @func == "Write"
- Builtins.y2milestone(
- "After installation, firewall will be %1",
- @fw_enabled ?
- Builtins.sformat(
- "enabled, ssh port will be %1",
- @ssh_enabled ? "open" : "closed"
- ) :
- "disabled"
- )
-
- #now read the config from SuSEfirewall2 RPM
- SuSEFirewall.Read
-
- #and merge
- SuSEFirewall.SetEnableService(@fw_enabled)
- SuSEFirewall.SetStartService(@fw_enabled)
-
- #only if we have openssh package - proposal takes care
- #it gets installed if the user wants to open ssh port
- if @ssh_enabled
- SuSEFirewall.SetServicesForZones(
- ["service:sshd"],
- SuSEFirewall.GetKnownFirewallZones,
- true
- )
- end
-
- if @sshd_enabled
- #enable SSH service independent of port open (bnc#865056)
- Service.Enable("sshd")
- end
-
- Builtins.foreach(SuSEFirewall.GetKnownFirewallZones) do |zone|
- # This VNC service doesn't have firewall services defined by package thus using ports
- # Ports taken from yast2-installation:/startup/common/vnc.sh (function startVNCServer)
- SuSEFirewall.SetAdditionalServices("TCP", zone, ["5801", "5901"])
- end if @vnc_enabled
+ when "Write"
+ # Enable SSH service independent of port open (bnc#865056)
+ Service.Enable("sshd") if SuSEFirewall4Network.EnabledSshd
- #this is equivalent to write-only, do not attempt to restart the service
+ # This is equivalent to write-only, do not attempt to restart the service
SuSEFirewall.WriteConfiguration
else
Builtins.y2error("unknown function: %1", @func)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.77/src/clients/firewall_stage1_proposal.rb new/yast2-network-3.1.79/src/clients/firewall_stage1_proposal.rb
--- old/yast2-network-3.1.77/src/clients/firewall_stage1_proposal.rb 2014-08-11 10:49:58.000000000 +0200
+++ new/yast2-network-3.1.79/src/clients/firewall_stage1_proposal.rb 2014-08-13 11:19:55.000000000 +0200
@@ -26,6 +26,8 @@
# Summary: Configuration of fw in 1st stage
# Author: Bubli
#
+require "yast"
+
module Yast
class FirewallStage1ProposalClient < Client
PROPOSAL_ID = "fw_1ststage"
@@ -40,6 +42,7 @@
LINK_DISABLE_VNC = "firewall--disable_vnc_in_proposal"
LINK_FIREWALL_DIALOG = "firewall_stage1"
+ include Yast::Logger
def main
Yast.import "UI"
@@ -49,6 +52,8 @@
Yast.import "Linuxrc"
Yast.import "PackagesProposal"
Yast.import "ProductControl"
+ Yast.import "Progress"
+ Yast.import "SuSEFirewall"
Yast.import "SuSEFirewall4Network"
Yast.import "SuSEFirewallProposal"
Yast.import "Wizard"
@@ -75,6 +80,8 @@
LINK_DISABLE_VNC
]
}
+
+ adjust_configuration
elsif @func == "AskUser"
@chosen_link = Ops.get(@param, "chosen_id")
@result = :next
@@ -84,19 +91,11 @@
when LINK_ENABLE_FIREWALL
Builtins.y2milestone("Enabling FW")
SuSEFirewall4Network.SetEnabled1stStage(true)
- PackagesProposal.AddResolvables(
- PROPOSAL_ID,
- :package,
- ["SuSEfirewall2"]
- )
+ PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEfirewall2.FIREWALL_PACKAGE])
when LINK_DISABLE_FIREWALL
Builtins.y2milestone("Disabling FW")
SuSEFirewall4Network.SetEnabled1stStage(false)
- PackagesProposal.RemoveResolvables(
- PROPOSAL_ID,
- :package,
- ["SuSEfirewall2"]
- )
+ PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEfirewall2.FIREWALL_PACKAGE])
when LINK_OPEN_SSH_PORT
Builtins.y2milestone("Opening SSH port")
SuSEFirewall4Network.SetSshEnabled1stStage(true)
@@ -110,11 +109,7 @@
when LINK_DISABLE_SSHD
Builtins.y2milestone("Disabling SSHD")
SuSEFirewall4Network.SetSshdEnabled(false)
- PackagesProposal.RemoveResolvables(
- PROPOSAL_ID,
- :package,
- ["openssh"]
- )
+ PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, ["openssh"])
when LINK_ENABLE_VNC
Builtins.y2milestone("Enabling VNC")
SuSEFirewall4Network.SetVncEnabled1stStage(true)
@@ -131,6 +126,7 @@
@ret = { "workflow_sequence" => @result }
+ adjust_configuration
elsif @func == "Description"
@ret = {
# Proposal title
@@ -339,6 +335,49 @@
"<ul>\n" + proposals.map {|prop| "<li>#{prop}</li>\n" }.join + "</ul>\n"
end
+ # Reads and adjust the configuration for SuSEfirewall2 according to the current proposal.
+ # bnc#887406: This needs to be done before user exports any configuration
+ # to AutoYast profile.
+ def adjust_configuration
+ enable_fw = SuSEFirewall4Network.Enabled1stStage
+ 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'} " <<
+ "VNC port will be #{open_vnc_port ? 'open':'closed'}"
+
+ # Read the configuration from sysconfig
+ # bnc#887406: The file is in inst-sys
+ previous_state = Progress.set(false)
+ SuSEFirewall.Read
+ Progress.set(previous_state)
+
+ 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
+ )
+ end
+
+ if open_vnc_port
+ SuSEFirewall.SetServicesForZones(
+ ["service:xorg-x11-Xvnc"],
+ SuSEFirewall.GetKnownFirewallZones,
+ true
+ )
+ end
+
+ # Writing the configuration including adjusting services
+ # is done in firewall_stage1_finish
+ end
+
end unless defined? FirewallStage1ProposalClient
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.77/test/network_autoconfiguration_test.rb new/yast2-network-3.1.79/test/network_autoconfiguration_test.rb
--- old/yast2-network-3.1.77/test/network_autoconfiguration_test.rb 2014-08-11 10:49:58.000000000 +0200
+++ new/yast2-network-3.1.79/test/network_autoconfiguration_test.rb 2014-08-13 11:19:55.000000000 +0200
@@ -115,7 +115,7 @@
allow(Yast::NetworkInterfaces).
to receive(:GetType). with(/eth\d+/). and_return "eth"
allow(Yast::NetworkInterfaces).
- to receive(:GetType). with(""). and_return nil
+ to receive(:GetType). with(""). and_return nil
# stub program execution
# - interfaces are up
@@ -152,6 +152,7 @@
# miscellaneous uninteresting but hard to avoid stuff
+ allow(Yast::Arch).to receive(:architecture).and_return "x86_64"
allow(Yast::Confirm).to receive(:Detection).and_return true
expect(Yast::SCR).
to receive(:Read).
continue with "q"...
Checked in at Wed Aug 13 13:05:44 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