Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-08-30 16:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-25 11:03:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-08-30 16:04:16.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 27 13:24:34 CEST 2014 - loci...@suse.com + +- Lazy-loading SuSEfirewall2 services - some new services can be + added when Yast is already running, and the config has been read + already (bnc#872960) +- Preventing from showing incorrect service name or description if + they are coming from TEMPLATE file (bnc#893583) +- Fixed service file parsing - comments starting with more than one + '#' characters were reported as unexpected input (just warning) +- 3.1.102 + +------------------------------------------------------------------- Old: ---- yast2-3.1.101.tar.bz2 New: ---- yast2-3.1.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.02OEJQ/_old 2014-08-30 16:04:17.000000000 +0200 +++ /var/tmp/diff_new_pack.02OEJQ/_new 2014-08-30 16:04:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.101 +Version: 3.1.102 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.101.tar.bz2 -> yast2-3.1.102.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb new/yast2-3.1.102/library/network/src/modules/SuSEFirewall.rb --- old/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/library/network/src/modules/SuSEFirewall.rb 2014-08-27 14:27:18.000000000 +0200 @@ -2480,7 +2480,7 @@ Progress.New( read_caption, " ", - 4, + 3, [ # TRANSLATORS: Progress step _("Check for network devices"), @@ -2488,8 +2488,6 @@ _("Read current configuration"), # TRANSLATORS: Progress step _("Check possibly conflicting services"), - # TRANSLATORS: Progress step - _("Read dynamic definitions of installed services") ], [ # TRANSLATORS: Progress step @@ -2498,8 +2496,6 @@ _("Reading current configuration..."), # TRANSLATORS: Progress step _("Checking possibly conflicting services..."), - # TRANSLATORS: Progress step - _("Reading dynamic definitions of installed services..."), Message.Finished ], "" @@ -2545,10 +2541,6 @@ Progress.NextStage if have_progress - SuSEFirewallServices.ReadServicesDefinedByRPMPackages - - Progress.NextStage if have_progress - # bnc #399217 # Converting built-in service definitions to services defined by packages ConvertToServicesDefinedByPackages() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/library/network/src/modules/SuSEFirewallServices.rb new/yast2-3.1.102/library/network/src/modules/SuSEFirewallServices.rb --- old/yast2-3.1.101/library/network/src/modules/SuSEFirewallServices.rb 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/library/network/src/modules/SuSEFirewallServices.rb 2014-08-27 14:27:18.000000000 +0200 @@ -65,6 +65,9 @@ IGNORED_SERVICES = ["TEMPLATE", "..", "."] + TEMPLATE_SERVICE_NAME = "template service" + TEMPLATE_SERVICE_DESCRIPTION = "opens ports for foo in order to allow bar" + def main textdomain "base" @@ -312,15 +315,22 @@ "comments" => [ # jail followed by anything but jail (immediately) "^[ \t]*#[^#].*$", + # comments that are not commented key:value pairs (see "params") + # they always use two jails + "^[ \t]*##[ \t]*[^([a-zA-Z0-9_]+:.*)]$", + # comments with three jails and more + "^[ \t]*###.*$", # jail alone - "^[ \t]*\#$", + "^[ \t]*#[ \t]*$", # (empty space) "^[ \t]*$", # sysconfig entries "^[ \t]*[a-zA-Z0-9_]+.*" ], "params" => [ - { "match" => ["^##[ \t]*([^:]+):[ \t]*(.*)[ \t]*$", "%s: %s"] } + # commented key:value pairs + # e.g.: ## Name: service name + { "match" => ["^##[ \t]*([a-zA-Z0-9_]+):[ \t]*(.*)[ \t]*$", "%s: %s"] } ] } ) @@ -360,6 +370,7 @@ # # @return [Boolean] if successful def ReadServicesDefinedByRPMPackages + log.info "Reading SuSEfirewall2 services from #{SERVICES_DIR}" @services ||= {} if !FileUtils.Exists(SERVICES_DIR) || @@ -434,9 +445,17 @@ ) ) ) - next if definition.nil? || definition == "" + next if definition.nil? || definition.empty? # call gettext to translate the metadata @services[service_name][metadata_key] = Builtins.dgettext(SERVICES_TEXTDOMAIN, definition) + + # bnc#893583: Sanitize metadata, do not allow using texts from template service + case metadata_key + when "name" + @services[service_name][metadata_key] = filename if definition == TEMPLATE_SERVICE_NAME + when "description" + @services[service_name][metadata_key] = "" if definition == TEMPLATE_SERVICE_DESCRIPTION + end end SCR.UnregisterAgent(path(".firewall_service_metadata")) @@ -445,6 +464,8 @@ end end + log.info "Services found: #{@services.keys.sort}" + true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/package/yast2.changes new/yast2-3.1.102/package/yast2.changes --- old/yast2-3.1.101/package/yast2.changes 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/package/yast2.changes 2014-08-27 14:27:18.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 27 13:24:34 CEST 2014 - loci...@suse.com + +- Lazy-loading SuSEfirewall2 services - some new services can be + added when Yast is already running, and the config has been read + already (bnc#872960) +- Preventing from showing incorrect service name or description if + they are coming from TEMPLATE file (bnc#893583) +- Fixed service file parsing - comments starting with more than one + '#' characters were reported as unexpected input (just warning) +- 3.1.102 + +------------------------------------------------------------------- Thu Aug 21 13:29:52 CEST 2014 - loci...@suse.com - Fixed checking whether SuSEfirewall2 package is selected or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/package/yast2.spec new/yast2-3.1.102/package/yast2.spec --- old/yast2-3.1.101/package/yast2.spec 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/package/yast2.spec 2014-08-27 14:27:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.101 +Version: 3.1.102 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
