Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at 2018-02-02 22:19:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-mail (Old) and /work/SRC/openSUSE:Factory/.yast2-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-mail" Fri Feb 2 22:19:19 2018 rev:85 rq:572094 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-mail/yast2-mail.changes 2018-01-17 21:42:04.532800442 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-mail.new/yast2-mail.changes 2018-02-02 22:19:21.258076940 +0100 @@ -1,0 +2,6 @@ +Fri Feb 2 16:24:48 UTC 2018 - knut.anderssen@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- Old: ---- yast2-mail-4.0.0.tar.bz2 New: ---- yast2-mail-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.ZquwFt/_old 2018-02-02 22:19:21.798051731 +0100 +++ /var/tmp/diff_new_pack.ZquwFt/_new 2018-02-02 22:19:21.798051731 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-mail # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-mail -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,10 +30,8 @@ PreReq: %fillup_prereq -# new firewall interface -# Wizard::SetDesktopTitleAndIcon -# cfg_mail.scr -Requires: yast2 >= 3.1.179 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-ldap Requires: yast2-users BuildArch: noarch ++++++ yast2-mail-4.0.0.tar.bz2 -> yast2-mail-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.0.0/package/yast2-mail.changes new/yast2-mail-4.0.1/package/yast2-mail.changes --- old/yast2-mail-4.0.0/package/yast2-mail.changes 2017-11-30 11:34:41.000000000 +0100 +++ new/yast2-mail-4.0.1/package/yast2-mail.changes 2018-02-02 17:55:10.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 2 16:24:48 UTC 2018 - knut.anderssen@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- Thu Nov 30 06:38:15 UTC 2017 - rbrown@suse.com - Replace references to /var/adm/fillup-templates with new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.0.0/package/yast2-mail.spec new/yast2-mail-4.0.1/package/yast2-mail.spec --- old/yast2-mail-4.0.0/package/yast2-mail.spec 2017-11-30 11:34:41.000000000 +0100 +++ new/yast2-mail-4.0.1/package/yast2-mail.spec 2018-02-02 17:55:10.000000000 +0100 @@ -16,7 +16,7 @@ # Name: yast2-mail -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,10 +29,8 @@ PreReq: %fillup_prereq -# new firewall interface -# Wizard::SetDesktopTitleAndIcon -# cfg_mail.scr -Requires: yast2 >= 3.1.179 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-ldap Requires: yast2-users BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.0.0/src/include/mail/ui.rb new/yast2-mail-4.0.1/src/include/mail/ui.rb --- old/yast2-mail-4.0.0/src/include/mail/ui.rb 2017-11-30 11:34:41.000000000 +0100 +++ new/yast2-mail-4.0.1/src/include/mail/ui.rb 2018-02-02 17:55:10.000000000 +0100 @@ -468,7 +468,7 @@ widgets = [:listen_remote] # firewall widget using CWM fw_settings = { - "services" => ["service:smtp"], + "services" => ["smtp"], "display_details" => true } fw_cwm_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.0.0/src/modules/Mail.rb new/yast2-mail-4.0.1/src/modules/Mail.rb --- old/yast2-mail-4.0.0/src/modules/Mail.rb 2017-11-30 11:34:41.000000000 +0100 +++ new/yast2-mail-4.0.1/src/modules/Mail.rb 2018-02-02 17:55:10.000000000 +0100 @@ -18,6 +18,7 @@ # Input and output routines. # require "yast" +require "y2firewall/firewalld" module Yast class MailClass < Module @@ -34,8 +35,6 @@ Yast.import "Package" Yast.import "PackageSystem" - Yast.import "SuSEFirewall" - # ---------------------------------------------------------------- @@ -341,9 +340,7 @@ # open port @listen_remote = SCR.Read(path(".sysconfig.mail.SMTPD_LISTEN_REMOTE")) == "yes" - progress_orig = Progress.set(false) - SuSEFirewall.Read - Progress.set(progress_orig) + Y2Firewall::Firewalld.instance.read # connection_type: nc = false @@ -624,9 +621,7 @@ path(".sysconfig.mail.SMTPD_LISTEN_REMOTE"), @listen_remote ? "yes" : "no" ) - progress_orig = Progress.set(false) - SuSEFirewall.WriteOnly - Progress.set(progress_orig) + Y2Firewall::Firewalld.instance.write_only # connection_type # nocanonify/nodns @@ -997,8 +992,7 @@ end # ServiceAdjust enable/disable is done in WriteGeneral - - SuSEFirewall.ActivateConfiguration + Y2Firewall::Firewalld.instance.reload end # Update the SCR according to mail settings