Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2018-03-04 11:50:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Sun Mar 4 11:50:10 2018 rev:39 rq:580962 version:4.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
2018-02-13 10:23:37.917570428 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2018-03-04 11:50:15.447222222 +0100
@@ -1,0 +2,6 @@
+Mon Feb 12 09:45:41 UTC 2018 - knut.anders...@suse.com
+
+- Replace SuSEFirewall2 by firewalld (fate#323460)
+- 4.0.3
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-4.0.2.tar.bz2
New:
----
yast2-services-manager-4.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.SsCdYm/_old 2018-03-04 11:50:16.231193821 +0100
+++ /var/tmp/diff_new_pack.SsCdYm/_new 2018-03-04 11:50:16.243193386 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.0.2
+Version: 4.0.3
Release: 0
BuildArch: noarch
@@ -32,8 +32,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-# ServicesManager library
-Requires: yast2 >= 4.0.5
+# Firewalld interfaces helpers
+Requires: yast2 >= 4.0.51
Requires: yast2-ruby-bindings >= 1.2.0
# need new enough installation for its inst clients
Conflicts: yast2-installation < 3.1.32
@@ -44,8 +44,8 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
BuildRequires: yast2-ruby-bindings >= 1.2.0
-# ServicesManager library
-BuildRequires: yast2 >= 4.0.5
+# Firewalld interfaces helpers
+BuildRequires: yast2 >= 4.0.51
# Support for 'data' directory in rake install task
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake) >= 0.1.7
++++++ yast2-services-manager-4.0.2.tar.bz2 ->
yast2-services-manager-4.0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.0.2/package/yast2-services-manager.changes
new/yast2-services-manager-4.0.3/package/yast2-services-manager.changes
--- old/yast2-services-manager-4.0.2/package/yast2-services-manager.changes
2018-02-12 10:40:24.000000000 +0100
+++ new/yast2-services-manager-4.0.3/package/yast2-services-manager.changes
2018-02-28 14:28:18.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Feb 12 09:45:41 UTC 2018 - knut.anders...@suse.com
+
+- Replace SuSEFirewall2 by firewalld (fate#323460)
+- 4.0.3
+
+-------------------------------------------------------------------
Mon Feb 12 08:47:13 UTC 2018 - jreidin...@suse.com
- Drop xinetd service protected for xvnc as it now uses service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.0.2/package/yast2-services-manager.spec
new/yast2-services-manager-4.0.3/package/yast2-services-manager.spec
--- old/yast2-services-manager-4.0.2/package/yast2-services-manager.spec
2018-02-12 10:40:24.000000000 +0100
+++ new/yast2-services-manager-4.0.3/package/yast2-services-manager.spec
2018-02-28 14:28:18.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.0.2
+Version: 4.0.3
Release: 0
BuildArch: noarch
@@ -32,8 +32,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-# ServicesManager library
-Requires: yast2 >= 4.0.5
+# Firewalld interfaces helpers
+Requires: yast2 >= 4.0.51
Requires: yast2-ruby-bindings >= 1.2.0
# need new enough installation for its inst clients
Conflicts: yast2-installation < 3.1.32
@@ -44,8 +44,8 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
BuildRequires: yast2-ruby-bindings >= 1.2.0
-# ServicesManager library
-BuildRequires: yast2 >= 4.0.5
+# Firewalld interfaces helpers
+BuildRequires: yast2 >= 4.0.51
# Support for 'data' directory in rake install task
BuildRequires: rubygem(yast-rake) >= 0.1.7
BuildRequires: rubygem(rspec)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.0.2/src/clients/services_proposal.rb
new/yast2-services-manager-4.0.3/src/clients/services_proposal.rb
--- old/yast2-services-manager-4.0.2/src/clients/services_proposal.rb
2018-02-12 10:40:24.000000000 +0100
+++ new/yast2-services-manager-4.0.3/src/clients/services_proposal.rb
2018-02-28 14:28:18.000000000 +0100
@@ -1,4 +1,6 @@
require 'services-manager/ui_elements'
+require "y2firewall/firewalld"
+require "y2firewall/helpers/interfaces"
module Yast
import "ServicesManagerService"
@@ -9,9 +11,9 @@
import "Linuxrc"
import "Report"
import "Package"
- import "SuSEFirewall"
class ServicesProposal < Client
+ include Y2Firewall::Helpers::Interfaces
attr_reader :proposal
def initialize
@@ -92,7 +94,7 @@
@default_services = ProductFeatures.GetFeature('globals',
'services_proposal')
@default_services = [] if default_services.to_s.empty?
Builtins.y2error("Missing services_proposal") if
default_services.empty?
- SuSEFirewall.Read
+ firewalld.read
load_services_details
@proposal = {
'preformatted_proposal' => proposal_summary,
@@ -130,7 +132,7 @@
def proposal_summary
messages = []
proposed_services.each_with_index do |service, index|
- if !service['firewall_plugins'].empty? && SuSEFirewall.IsEnabled
+ if !service['firewall_plugins'].empty? && firewalld.enabled?
if service['enabled']
toggled = bold('enabled')
firewall = 'open'
@@ -244,7 +246,7 @@
handle_missing_packages(proposed_service)
success = manage_service(proposed_service)
end
- SuSEFirewall.Write
+ firewalld.write
success
end
@@ -293,7 +295,7 @@
end
firewall_plugins = service['firewall_plugins']
- if SuSEFirewall.IsEnabled && !firewall_plugins.empty?
+ if firewalld.enabled? && !firewall_plugins.empty?
Builtins.y2milestone "Firewall plugins: #{firewall_plugins}"
open_firewall_ports(firewall_plugins)
end
@@ -313,18 +315,16 @@
end
def open_firewall_ports plugins
- plugins = plugins.map { |p| "service:#{p}" }
- interfaces = SuSEFirewall.GetAllKnowInterfaces.map do |interface|
- interface['id'] unless interface['id'].to_s.empty?
- end.compact
- Builtins.y2milestone "Available firewall interfaces: #{interfaces}"
- zones = if interfaces.empty?
- SuSEFirewall.GetKnownFirewallZones
+ zone_names = known_interfaces.map { |i| i["zone"] ||
firewalld.default_zone }
+
+ zones = if zone_names.empty?
+ firewalld.zones.select { |z| !["block", "drop",
"trusted"].include?(z.name) }
else
- SuSEFirewall.GetZonesOfInterfacesWithAnyFeatureSupported(interfaces)
+ firewalld.zones.select { |z| zone_names.include?(z.name) }
end
- Builtins.y2milestone "Found firewall zones #{zones}"
- SuSEFirewall.SetServicesForZones(plugins, zones, true)
+
+ Builtins.y2milestone "Found firewall zones: #{zones.map { |z| z.name}
}"
+ zones.map { |z| plugins.map { |p| z.add_service(p) } }
end
def protected_service? service_name
