Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2019-03-13 09:09:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server" Wed Mar 13 09:09:14 2019 rev:86 rq:684258 version:4.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2018-12-31 09:43:26.914361111 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new.28833/yast2-http-server.changes 2019-03-13 09:09:16.799423586 +0100 @@ -1,0 +2,6 @@ +Fri Feb 22 07:51:52 UTC 2019 - mfilka@suse.com + +- bnc#1119455 + - updated list of known modules to guarantee correct load order +- 4.1.4 +------------------------------------------------------------------- Old: ---- yast2-http-server-4.1.3.tar.bz2 New: ---- yast2-http-server-4.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.r8HSeA/_old 2019-03-13 09:09:17.411423523 +0100 +++ /var/tmp/diff_new_pack.r8HSeA/_new 2019-03-13 09:09:17.415423522 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-http-server # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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-http-server -Version: 4.1.3 +Version: 4.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-4.1.3.tar.bz2 -> yast2-http-server-4.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/package/yast2-http-server.changes new/yast2-http-server-4.1.4/package/yast2-http-server.changes --- old/yast2-http-server-4.1.3/package/yast2-http-server.changes 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/package/yast2-http-server.changes 2019-03-12 12:29:54.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 22 07:51:52 UTC 2019 - mfilka@suse.com + +- bnc#1119455 + - updated list of known modules to guarantee correct load order +- 4.1.4 +------------------------------------------------------------------- Tue Dec 11 13:04:16 UTC 2018 - jreidinger@suse.com - always use absolute path to binaries (bsc#1118291) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/package/yast2-http-server.spec new/yast2-http-server-4.1.4/package/yast2-http-server.spec --- old/yast2-http-server-4.1.3/package/yast2-http-server.spec 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/package/yast2-http-server.spec 2019-03-12 12:29:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 4.1.3 +Version: 4.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/Makefile.am new/yast2-http-server-4.1.4/src/Makefile.am --- old/yast2-http-server-4.1.3/src/Makefile.am 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/Makefile.am 2019-03-12 12:29:54.000000000 +0100 @@ -12,6 +12,7 @@ module2dir = @moduledir@/YaST module2_DATA = \ modules/YaST/HTTPDData.pm \ + modules/YaST/HTTPDPhpModule.pm \ modules/YaST/httpdUtils.pm client_DATA = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/include/http-server/wizard-dialog.rb new/yast2-http-server-4.1.4/src/include/http-server/wizard-dialog.rb --- old/yast2-http-server-4.1.3/src/include/http-server/wizard-dialog.rb 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/include/http-server/wizard-dialog.rb 2019-03-12 12:29:54.000000000 +0100 @@ -169,7 +169,7 @@ ) end # add selected modules to that list - YaST::HTTPDData.ModifyModuleList(["php#{YaST::HTTPDData.PhpVersion}"], enable_php) + YaST::HTTPDData.ModifyModuleList(["php#{YaST::HTTPDPhpModule.Version}"], enable_php) YaST::HTTPDData.ModifyModuleList(["perl"], enable_perl) YaST::HTTPDData.ModifyModuleList(["wsgi-python3"], enable_python) # YaST::HTTPDData::ModifyModuleList ([ "ruby" ], enable_ruby); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/modules/HttpServerWidgets.rb new/yast2-http-server-4.1.4/src/modules/HttpServerWidgets.rb --- old/yast2-http-server-4.1.3/src/modules/HttpServerWidgets.rb 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/modules/HttpServerWidgets.rb 2019-03-12 12:29:54.000000000 +0100 @@ -32,6 +32,7 @@ Yast.import "TablePopup" Yast.import "HttpServer" Yast.import "YaST::HTTPDData" + Yast.import "YaST::HTTPDPhpModule" Yast.import "Confirm" Yast.import "CWMFirewallInterfaces" Yast.import "Punycode" @@ -3461,7 +3462,7 @@ end def initScriptModules(key) modules = YaST::HTTPDData.GetModuleList - enable_php = modules.include?("php#{YaST::HTTPDData.PhpVersion}") + enable_php = modules.include?("php#{YaST::HTTPDPhpModule.Version}") enable_perl = modules.include?("perl") enable_python = modules.include?("wsgi-python3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/modules/YaPI/HTTPDModules.pm new/yast2-http-server-4.1.4/src/modules/YaPI/HTTPDModules.pm --- old/yast2-http-server-4.1.3/src/modules/YaPI/HTTPDModules.pm 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/modules/YaPI/HTTPDModules.pm 2019-03-12 12:29:54.000000000 +0100 @@ -1,13 +1,14 @@ package YaPI::HTTPDModules; use YaPI; -use YaST::HTTPDData; +use YaST::HTTPDPhpModule; + textdomain "http-server"; %modules = ( # (without_leading mod_) module name = { # summary => __("Translatable text with module description - will be shown in YaST table"), # packages => [ list of rpm packages needed for particular module ], # default => 0 or 1 if this module should be enabled by default -# postition => order in /etc/sysconfig/apache2 (lowest numbew, ... , higher number) +# postition => order in /etc/sysconfig/apache2 (lowest numbew, ... , higher number) # requires => required modulename (this is used in YaST dialog validation) # } 'authz_host' => { @@ -707,9 +708,9 @@ { option =>"VirtualScriptAliasIP", "context" => [ "Server", "Virtual", "Directory" ] } ] }, - 'php' . YaST::HTTPDData->PhpVersion() => { + 'php' . YaST::HTTPDPhpModule->Version() => { summary => __("Provides support for PHP dynamically generated pages"), - packages => ["apache2-mod_php" . YaST::HTTPDData->PhpVersion()], + packages => ["apache2-mod_php" . YaST::HTTPDPhpModule->Version()], default => 0, position => 490 }, @@ -741,10 +742,31 @@ 'authz_svn' => { summary => __("Provides support for subversion"), packages => ["subversion-server"], - requires => "dav_svn", + requires => "dav_svn", default => 0, position => 550 + }, + 'session' => { + summary => __("Session support"), + packages => [], + default => 0, + position => 600 + }, + 'session_cookie' => { + summary => __("Cookie based session support"), + packages => [], + requires => "session", + default => 0, + position => 610 + }, + 'session_dbd' => { + summary => __("DBD/SQL based session support"), + packages => [], + requires => "session", + default => 0, + position => 620 } + ); %selection = ( TestSel => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/modules/YaST/HTTPDData.pm new/yast2-http-server-4.1.4/src/modules/YaST/HTTPDData.pm --- old/yast2-http-server-4.1.3/src/modules/YaST/HTTPDData.pm 2018-12-11 17:06:11.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/modules/YaST/HTTPDData.pm 2019-03-12 12:29:54.000000000 +0100 @@ -23,12 +23,6 @@ return YaPI::HTTPD->SetError( @_ ); } -# Define globally the current PHP version -BEGIN { $TYPEINFO{PhpVersion} = ["function", "string" ]; } -sub PhpVersion { - return "7"; -} - BEGIN { $TYPEINFO{Error} = ["function", [ "map", "string", "string" ] ]; } sub Error { return YaPI::HTTPD->Error(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.3/src/modules/YaST/HTTPDPhpModule.pm new/yast2-http-server-4.1.4/src/modules/YaST/HTTPDPhpModule.pm --- old/yast2-http-server-4.1.3/src/modules/YaST/HTTPDPhpModule.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-4.1.4/src/modules/YaST/HTTPDPhpModule.pm 2019-03-12 12:29:54.000000000 +0100 @@ -0,0 +1,11 @@ +package YaST::HTTPDPhpModule; + +our %TYPEINFO; + +# Define globally the current PHP version +BEGIN { $TYPEINFO{Version} = ["function", "string" ]; } +sub Version { + return "7"; +} + +1;