Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2018-06-13 15:38:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Wed Jun 13 15:38:50 2018 rev:29 rq:615438 version:5.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2017-12-21 11:30:23.664475108 +0100 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2018-06-13 15:39:32.776216258 +0200 @@ -1,0 +2,6 @@ +Thu Jun 7 12:24:38 UTC 2018 - [email protected] + +- Fix BuildRequires for collectd-web +- Make apache configuration files compatible with Apache v2.2 and v2.4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.sc0dgF/_old 2018-06-13 15:39:33.936173575 +0200 +++ /var/tmp/diff_new_pack.sc0dgF/_new 2018-06-13 15:39:33.940173427 +0200 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -45,7 +45,7 @@ Version: 5.7.2 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files -License: GPL-2.0 +License: GPL-2.0-only Group: System/Monitoring Url: http://collectd.org/ Source: http://collectd.org/files/collectd-%{version}.tar.bz2 @@ -156,6 +156,7 @@ Requires: perl(CGI) Requires: perl(Data::Dumper) Requires: perl(HTML::Entities) +Requires: perl(RRDs) Requires: perl(URI::Escape) %description web ++++++ collectd-js.apache2.conf ++++++ --- /var/tmp/diff_new_pack.sc0dgF/_old 2018-06-13 15:39:34.040169748 +0200 +++ /var/tmp/diff_new_pack.sc0dgF/_new 2018-06-13 15:39:34.040169748 +0200 @@ -3,29 +3,33 @@ # Access control: <Directory "/srv/www/collectd-js"> - Order allow,deny - - # You might want to change this to avoid giving everyone - # access to the collectd statistics, e.g.: - # Allow from all - # Allow from localhost - # Allow from 192.168. - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> <Directory "/srv/www/collectd-js/bin"> Options +ExecCGI AddHandler cgi-script .cgi - - Order allow,deny - - # You might want to change this to give access from - # different hosts to the collectd statistics, e.g.: - # - # Allow from all - # Allow from 192.168. - Allow from localhost - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> </IfModule> ++++++ collectd.apache2.conf ++++++ --- /var/tmp/diff_new_pack.sc0dgF/_old 2018-06-13 15:39:34.104167393 +0200 +++ /var/tmp/diff_new_pack.sc0dgF/_new 2018-06-13 15:39:34.108167246 +0200 @@ -3,15 +3,17 @@ # Access control: <Directory "/srv/www/collectd"> - Order allow,deny - - # You might want to change this to give access from - # different hosts to the collectd statistics, e.g.: - # - # Allow from all - # Allow from 192.168. - Allow from localhost - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> </IfModule>
