Hello community, here is the log from the commit of package viewvc for openSUSE:Factory checked in at 2016-05-24 09:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/viewvc (Old) and /work/SRC/openSUSE:Factory/.viewvc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "viewvc" Changes: -------- --- /work/SRC/openSUSE:Factory/viewvc/viewvc.changes 2016-03-26 15:27:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.viewvc.new/viewvc.changes 2016-05-24 09:35:22.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 20 20:32:45 UTC 2016 - [email protected] + +- Update viewvc.conf for Apache 2.4 syntax. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewvc.spec ++++++ --- /var/tmp/diff_new_pack.Qwf4VI/_old 2016-05-24 09:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Qwf4VI/_new 2016-05-24 09:35:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package viewvc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ viewvc.conf ++++++ --- /var/tmp/diff_new_pack.Qwf4VI/_old 2016-05-24 09:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Qwf4VI/_new 2016-05-24 09:35:23.000000000 +0200 @@ -3,6 +3,9 @@ # put the string SVN_VIEWCVS in /etc/sysconfig/apache2 APACHE_SERVER_FLAGS # to enable the URL # http://localhost/viewvc +# - OR - +# add SVN_VIEWCVS_MODPYTHON to APACHE_SERVER_FLAGS to use mod_python +# instead of CGI Python <IfDefine SVN_VIEWCVS> <IfModule mod_rewrite.c> RewriteEngine On @@ -14,16 +17,26 @@ <Directory "/srv/viewvc/bin/cgi"> AllowOverride None Options +ExecCGI - Order allow,deny - Allow from all + <IfModule mod_authz_core.c> + Require all granted + </IfModule> + <IfModule !mod_authz_core.c> + Order allow,deny + Allow from all + </IfModule> </Directory> # apache can serve the static files directly Alias /viewvc-docroot "/srv/viewvc/templates/docroot" <Directory /srv/viewvc/templates/docroot/> - AllowOverride None + AllowOverride None + <IfModule mod_authz_core.c> + Require all granted + </IfModule> + <IfModule !mod_authz_core.c> Order allow,deny Allow from all + </IfModule> </Directory> </IfDefine> @@ -38,8 +51,13 @@ <Directory "/srv/viewvc/bin/mod_python"> AllowOverride None #Options +ExecCGI - Order allow,deny - Allow from all + <IfModule mod_authz_core.c> + Require all granted + </IfModule> + <IfModule !mod_authz_core.c> + Order allow,deny + Allow from all + </IfModule> </Directory> ScriptAlias /viewvc "/srv/viewvc/bin/mod_python/myviewvc.py" @@ -54,9 +72,14 @@ # apache can serve the static files directly Alias /viewvc-docroot "/srv/viewvc/templates/docroot" <Directory /srv/viewvc/templates/docroot/> - AllowOverride None + AllowOverride None + <IfModule mod_authz_core.c> + Require all granted + </IfModule> + <IfModule !mod_authz_core.c> Order allow,deny Allow from all + </IfModule> </Directory> </IfDefine>
