Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-07-07 15:10:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-06-29 15:04:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-07-07 15:10:02.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 30 06:54:57 UTC 2016 - [email protected] + +- fix cyclic dependencies caused by split of firewall classes + (bsc#987059) +- 3.1.195 + +------------------------------------------------------------------- Old: ---- yast2-3.1.194.tar.bz2 New: ---- yast2-3.1.195.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.HnjaiP/_old 2016-07-07 15:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.HnjaiP/_new 2016-07-07 15:10:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.194 +Version: 3.1.195 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.1.194.tar.bz2 -> yast2-3.1.195.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.194/library/network/src/lib/network/susefirewall2.rb new/yast2-3.1.195/library/network/src/lib/network/susefirewall2.rb --- old/yast2-3.1.194/library/network/src/lib/network/susefirewall2.rb 2016-06-22 11:23:47.000000000 +0200 +++ new/yast2-3.1.195/library/network/src/lib/network/susefirewall2.rb 2016-07-01 08:54:01.000000000 +0200 @@ -48,7 +48,6 @@ Yast.import "Mode" Yast.import "Service" Yast.import "NetworkInterfaces" - Yast.import "SuSEFirewallServices" Yast.import "PortAliases" Yast.import "Report" Yast.import "Message" @@ -798,6 +797,8 @@ # @param [String] service id # @param [String] zone def RemoveServiceSupportFromZone(service, zone) + Yast.import "SuSEFirewallServices" # lazy import due to circular dependencies + needed = SuSEFirewallServices.GetNeededPortsAndProtocols(service) # unknown service if needed.nil? @@ -844,6 +845,8 @@ # @param [String] service id # @param [String] zone def AddServiceSupportIntoZone(service, zone) + Yast.import "SuSEFirewallServices" # lazy import due to circular dependencies + needed = SuSEFirewallServices.GetNeededPortsAndProtocols(service) # unknown service if needed.nil? @@ -1360,6 +1363,8 @@ def IsServiceSupportedInZone(service, zone) return nil if !IsKnownZone(zone) + Yast.import "SuSEFirewallServices" # lazy import due to circular dependencies + needed = SuSEFirewallServices.GetNeededPortsAndProtocols(service) # SuSEFirewall feature FW_PROTECT_FROM_INT @@ -1832,6 +1837,8 @@ # all ports or services used by known service all_used_services = [] + Yast.import "SuSEFirewallServices" # lazy import due to circular dependencies + # trying all possible (known) services Builtins.foreach(SuSEFirewallServices.GetSupportedServices) do |service_id, _service_name| # only when the service is allowed in zone - remove all its needed ports @@ -2573,6 +2580,8 @@ Builtins.y2milestone("Current conf: %1", current_conf) + Yast.import "SuSEFirewallServices" # lazy import due to circular dependencies + Builtins.foreach(GetKnownFirewallZones()) do |zone| Builtins.foreach(SuSEFirewallServices.OLD_SERVICES) do |old_service_id, old_service_def| Builtins.y2milestone("Checking %1 in %2 zone", old_service_id, zone) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.194/library/network/src/modules/SuSEFirewallServices.rb new/yast2-3.1.195/library/network/src/modules/SuSEFirewallServices.rb --- old/yast2-3.1.194/library/network/src/modules/SuSEFirewallServices.rb 2016-06-22 11:23:47.000000000 +0200 +++ new/yast2-3.1.195/library/network/src/modules/SuSEFirewallServices.rb 2016-07-01 08:54:01.000000000 +0200 @@ -37,7 +37,6 @@ module Yast class FirewallServicesClass < Module include Yast::Logger - Yast.import "SuSEFirewall" # Create appropriate firewall services class based on factors such as which # backend is selected by user or running on the system. @@ -48,6 +47,8 @@ # @param backend_sym [Symbol] if not nil, explicitely select :sf2 or :fwd # @return SuSEFirewall2ServicesClass or SuSEfirewalldServicesClass instance def self.create(backend_sym = nil) + Yast.import "SuSEFirewall" + # If backend is specificed, go ahead and create an instance. Otherwise, try # to detect which backend is enabled and create the appropriate instance. case backend_sym @@ -72,7 +73,7 @@ end end end - - SuSEFirewallServices = FirewallServicesClass.create - SuSEFirewallServices.main if SuSEFirewallServices.is_a?(SuSEFirewall2ServicesClass) end + +Yast::SuSEFirewallServices = Yast::FirewallServicesClass.create +Yast::SuSEFirewallServices.main if Yast::SuSEFirewallServices.is_a?(Yast::SuSEFirewall2ServicesClass) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.194/package/yast2.changes new/yast2-3.1.195/package/yast2.changes --- old/yast2-3.1.194/package/yast2.changes 2016-06-22 11:23:47.000000000 +0200 +++ new/yast2-3.1.195/package/yast2.changes 2016-07-01 08:54:01.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 30 06:54:57 UTC 2016 - [email protected] + +- fix cyclic dependencies caused by split of firewall classes + (bsc#987059) +- 3.1.195 + +------------------------------------------------------------------- Wed Jun 22 08:39:50 UTC 2016 - [email protected] - Use a high resolution window icon (64x64) instead of the low diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.194/package/yast2.spec new/yast2-3.1.195/package/yast2.spec --- old/yast2-3.1.194/package/yast2.spec 2016-06-22 11:23:47.000000000 +0200 +++ new/yast2-3.1.195/package/yast2.spec 2016-07-01 08:54:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.194 +Version: 3.1.195 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0
