Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2018-08-18 00:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server" Sat Aug 18 00:02:14 2018 rev:84 rq:629342 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2018-08-12 20:54:37.217375555 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2018-08-18 00:02:34.670802045 +0200 @@ -1,0 +2,8 @@ +Tue Aug 14 11:04:38 UTC 2018 - [email protected] + +- Fixed PHP support (use PHP7 instead of dropped PHP5) + (bsc#1099106) +- Fixed also the other renamed packages (for Python and apparmor) +- 4.1.1 + +------------------------------------------------------------------- Old: ---- yast2-http-server-4.1.0.tar.bz2 New: ---- yast2-http-server-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.KGo3E1/_old 2018-08-18 00:02:35.202803633 +0200 +++ /var/tmp/diff_new_pack.KGo3E1/_new 2018-08-18 00:02:35.206803645 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 4.1.0 +Version: 4.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-4.1.0.tar.bz2 -> yast2-http-server-4.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/.travis.yml new/yast2-http-server-4.1.1/.travis.yml --- old/yast2-http-server-4.1.0/.travis.yml 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/.travis.yml 2018-08-15 08:57:46.000000000 +0200 @@ -9,3 +9,4 @@ # the "yast-travis-ruby" script is included in the base yastdevel/ruby image # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-http-server-image yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-http-server-image ./travis_package_check.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/package/yast2-http-server.changes new/yast2-http-server-4.1.1/package/yast2-http-server.changes --- old/yast2-http-server-4.1.0/package/yast2-http-server.changes 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/package/yast2-http-server.changes 2018-08-15 08:57:46.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Aug 14 11:04:38 UTC 2018 - [email protected] + +- Fixed PHP support (use PHP7 instead of dropped PHP5) + (bsc#1099106) +- Fixed also the other renamed packages (for Python and apparmor) +- 4.1.1 + +------------------------------------------------------------------- Wed Aug 8 14:58:09 UTC 2018 - [email protected] - Use new Yast2::ServiceWidget to manage the service status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/package/yast2-http-server.spec new/yast2-http-server-4.1.1/package/yast2-http-server.spec --- old/yast2-http-server-4.1.0/package/yast2-http-server.spec 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/package/yast2-http-server.spec 2018-08-15 08:57:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 4.1.0 +Version: 4.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/src/include/http-server/wizard-dialog.rb new/yast2-http-server-4.1.1/src/include/http-server/wizard-dialog.rb --- old/yast2-http-server-4.1.0/src/include/http-server/wizard-dialog.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/src/include/http-server/wizard-dialog.rb 2018-08-15 08:57:46.000000000 +0200 @@ -145,8 +145,8 @@ { :abort => fun_ref(method(:ReallyAbort), "boolean ()") } ) if ret == :next - enable_php5 = Convert.to_boolean( - UI.QueryWidget(Id(:scr_mod_php5), :Value) + enable_php = Convert.to_boolean( + UI.QueryWidget(Id(:scr_mod_php), :Value) ) enable_perl = Convert.to_boolean( UI.QueryWidget(Id(:scr_mod_perl), :Value) @@ -157,7 +157,7 @@ # boolean enable_ruby=(boolean) UI::QueryWidget( `id(`scr_mod_ruby), `Value ); Builtins.y2milestone("Saving script modules") - Builtins.y2milestone("PHP5 support %1", enable_php5) + Builtins.y2milestone("PHP support %1", enable_php) Builtins.y2milestone("Perl support %1", enable_perl) Builtins.y2milestone("Python support %1", enable_python) # y2milestone("Ruby support %1", enable_ruby); @@ -169,9 +169,9 @@ ) end # add selected modules to that list - YaST::HTTPDData.ModifyModuleList(["php5"], enable_php5) + YaST::HTTPDData.ModifyModuleList(["php#{YaST::HTTPDData.PhpVersion}"], enable_php) YaST::HTTPDData.ModifyModuleList(["perl"], enable_perl) - YaST::HTTPDData.ModifyModuleList(["python"], enable_python) + YaST::HTTPDData.ModifyModuleList(["wsgi-python3"], enable_python) # YaST::HTTPDData::ModifyModuleList ([ "ruby" ], enable_ruby); HttpServer.modified = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/src/modules/HttpServerWidgets.rb new/yast2-http-server-4.1.1/src/modules/HttpServerWidgets.rb --- old/yast2-http-server-4.1.0/src/modules/HttpServerWidgets.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/src/modules/HttpServerWidgets.rb 2018-08-15 08:57:46.000000000 +0200 @@ -3463,15 +3463,10 @@ end end def initScriptModules(key) - enable_php5 = false - enable_perl = false - enable_python = false - # boolean enable_ruby=false; modules = YaST::HTTPDData.GetModuleList - enable_php5 = true if Builtins.contains(modules, "php5") - enable_perl = true if Builtins.contains(modules, "perl") - enable_python = true if Builtins.contains(modules, "python") - # if (contains(modules, "ruby")) enable_ruby = true; + enable_php = modules.include?("php#{YaST::HTTPDData.PhpVersion}") + enable_perl = modules.include?("perl") + enable_python = modules.include?("wsgi-python3") UI.ReplaceWidget( Id(:scr_mod_replace), @@ -3481,9 +3476,9 @@ VSpacing(3), #translators: checkbox - support for php script language Left( CheckBox( - Id(:scr_mod_php5), - _("Enable &PHP5 Scripting"), - enable_php5 + Id(:scr_mod_php), + _("Enable &PHP Scripting"), + enable_php ) ), VSpacing(1), #translators: checkbox - support for perl script language diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/src/modules/YaPI/HTTPDModules.pm new/yast2-http-server-4.1.1/src/modules/YaPI/HTTPDModules.pm --- old/yast2-http-server-4.1.0/src/modules/YaPI/HTTPDModules.pm 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/src/modules/YaPI/HTTPDModules.pm 2018-08-15 08:57:46.000000000 +0200 @@ -1,5 +1,6 @@ package YaPI::HTTPDModules; use YaPI; +use YaST::HTTPDData; textdomain "http-server"; %modules = ( # (without_leading mod_) module name = { @@ -706,9 +707,9 @@ { option =>"VirtualScriptAliasIP", "context" => [ "Server", "Virtual", "Directory" ] } ] }, - 'php5' => { - summary => __("Provides support for PHP5 dynamically generated pages"), - packages => ["apache2-mod_php5"], + 'php' . YaST::HTTPDData->PhpVersion() => { + summary => __("Provides support for PHP dynamically generated pages"), + packages => ["apache2-mod_php" . YaST::HTTPDData->PhpVersion()], default => 0, position => 490 }, @@ -718,15 +719,15 @@ default => 0, position => 500 }, - 'python' => { + 'wsgi-python3' => { summary => __("Provides support for Python dynamically generated pages"), - packages => ["apache2-mod_python"], + packages => ["apache2-mod_wsgi-python3"], default => 0, position => 510 }, 'apparmor' => { summary => __("Provides support for AppArmor subprocess confinement within apache"), - packages => ["mod-apparmor"], + packages => ["apache2-mod_apparmor"], default => 0, position => 530 }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/src/modules/YaST/HTTPDData.pm new/yast2-http-server-4.1.1/src/modules/YaST/HTTPDData.pm --- old/yast2-http-server-4.1.0/src/modules/YaST/HTTPDData.pm 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/src/modules/YaST/HTTPDData.pm 2018-08-15 08:57:46.000000000 +0200 @@ -23,6 +23,12 @@ 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.0/testsuite/tests/getCurrentListen.rb new/yast2-http-server-4.1.1/testsuite/tests/getCurrentListen.rb --- old/yast2-http-server-4.1.0/testsuite/tests/getCurrentListen.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/testsuite/tests/getCurrentListen.rb 2018-08-15 08:57:46.000000000 +0200 @@ -10,8 +10,8 @@ @READ = { "http_server" => { "listen" => ["80", "127.0.0.1:99"] } } TESTSUITE_INIT([@READ, {}, {}], nil) - Yast.import "YaST::HTTPDData" Yast.import "YaPI::HTTPD" + Yast.import "YaST::HTTPDData" TEST(lambda { YaST::HTTPDData.ReadListen }, [@READ, {}, {}], nil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/testsuite/tests/parseDirOption.rb new/yast2-http-server-4.1.1/testsuite/tests/parseDirOption.rb --- old/yast2-http-server-4.1.0/testsuite/tests/parseDirOption.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/testsuite/tests/parseDirOption.rb 2018-08-15 08:57:46.000000000 +0200 @@ -7,6 +7,7 @@ def main Yast.include self, "testsuite.rb" + Yast.import "YaPI::HTTPD" Yast.import "YaST::HTTPDData" TEST(lambda do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/testsuite/tests/readHosts.rb new/yast2-http-server-4.1.1/testsuite/tests/readHosts.rb --- old/yast2-http-server-4.1.0/testsuite/tests/readHosts.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/testsuite/tests/readHosts.rb 2018-08-15 08:57:46.000000000 +0200 @@ -190,8 +190,8 @@ TESTSUITE_INIT([@READ, {}, {}], nil) - Yast.import "YaST::HTTPDData" Yast.import "YaPI::HTTPD" + Yast.import "YaST::HTTPDData" TEST(lambda { YaST::HTTPDData.ReadHosts }, [@READ, {}, {}], nil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/testsuite/tests/readListen.rb new/yast2-http-server-4.1.1/testsuite/tests/readListen.rb --- old/yast2-http-server-4.1.0/testsuite/tests/readListen.rb 2018-08-10 15:01:50.000000000 +0200 +++ new/yast2-http-server-4.1.1/testsuite/tests/readListen.rb 2018-08-15 08:57:46.000000000 +0200 @@ -10,8 +10,8 @@ @READ = { "http_server" => { "listen" => ["80", "127.0.0.1:99"] } } TESTSUITE_INIT([@READ, {}, {}], nil) - Yast.import "YaST::HTTPDData" Yast.import "YaPI::HTTPD" + Yast.import "YaST::HTTPDData" TEST(lambda { YaST::HTTPDData.ReadListen }, [@READ, {}, {}], nil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/travis_package_check.rb new/yast2-http-server-4.1.1/travis_package_check.rb --- old/yast2-http-server-4.1.0/travis_package_check.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-4.1.1/travis_package_check.rb 2018-08-15 08:57:46.000000000 +0200 @@ -0,0 +1,47 @@ +#! /usr/bin/env ruby + +require "yast" + +Yast.import "YaPI::HTTPD" +Yast.import "YaST::HTTPDData" +Yast.import "Pkg" + +# +# Initialize the package manager +# +def init_pkg + # Initialize the target + Yast::Pkg.TargetInitialize("/") + # Load the installed packages into the pool. + Yast::Pkg.TargetLoad + # Load the repository configuration. Refreshes the repositories if needed. + Yast::Pkg.SourceRestore + # Load the available packages in the repositories to the pool. + Yast::Pkg.SourceLoad +end + +# +# Collect all needed packages +# +# @return [Array<String>] package list +# +def apache_packages + packages = Yast::YaST::HTTPDData.GetKnownModules.reduce([]) do |acc, m| + acc.concat(m["packages"]) + end + packages.uniq +end + +puts "Checking the package availability..." +puts + +init_pkg +packages = apache_packages + +success = packages.reduce(true) do |acc, p| + available = Yast::Pkg.PkgAvailable(p) + puts "Package #{p} " + (available ? "OK" : "missing!") + acc &&= available +end + +exit(1) unless success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-4.1.0/travis_package_check.sh new/yast2-http-server-4.1.1/travis_package_check.sh --- old/yast2-http-server-4.1.0/travis_package_check.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-4.1.1/travis_package_check.sh 2018-08-15 08:57:46.000000000 +0200 @@ -0,0 +1,6 @@ +#! /bin/sh + +set -e +make -f Makefile.cvs +make install +./travis_package_check.rb
