Hello community, here is the log from the commit of package icingaweb2 for openSUSE:Factory checked in at 2018-11-27 10:42:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icingaweb2 (Old) and /work/SRC/openSUSE:Factory/.icingaweb2.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icingaweb2" Tue Nov 27 10:42:24 2018 rev:9 rq:651960 version:2.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/icingaweb2/icingaweb2.changes 2018-09-28 08:53:03.245759147 +0200 +++ /work/SRC/openSUSE:Factory/.icingaweb2.new.19453/icingaweb2.changes 2018-11-27 10:43:03.140156935 +0100 @@ -1,0 +2,28 @@ +Wed Nov 21 12:33:40 UTC 2018 - [email protected] + +- update to 2.6.2 + You can find issues and features related to this release on our Roadmap. + This bugfix release addresses the following topics: + * Database connections to MySQL 8 no longer fail + * LDAP connections now have a timeout configuration which defaults to 5 seconds + * User groups are now correctly loaded for externally authenticated users + * Filters are respected for all links in the host and service group overviews + * Fixed permission problems where host and service actions provided by modules were missing + * Fixed an SQL error in the contact list view when filtering for host groups + * Fixed time zone (DST) detection + * Fixed the contact details view if restrictions are active + * Doc parser and documentation fixes + +------------------------------------------------------------------- +Wed Nov 21 12:17:42 UTC 2018 - [email protected] + +- Use current spec file from upstream. +- Insert missing things from old spec file in new upstream spec file. +- Remove setuid from new upstream spec file for following dirs: + /etc/icingaweb2, + /etc/icingaweb/modules, + /etc/icingaweb2/modules/setup, + /etc/icingaweb2/modules/translation, + /var/log/icingaweb2 + +------------------------------------------------------------------- Old: ---- v2.6.1.tar.gz New: ---- v2.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icingaweb2.spec ++++++ --- /var/tmp/diff_new_pack.gaoGVW/_old 2018-11-27 10:43:06.964153014 +0100 +++ /var/tmp/diff_new_pack.gaoGVW/_new 2018-11-27 10:43:06.968153010 +0100 @@ -2,7 +2,7 @@ # spec file for package icingaweb2 # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2013-2015 Icinga Development Team | GPLv2+ +# Copyright (c) 2013-2017 Icinga Development Team | GPLv2+ # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,64 +17,96 @@ # -%define sversion 2.6.1 +%define revision 1 Name: icingaweb2 -Version: 2.6.1 -Release: 0 +Version: 2.6.2 +Release: %{revision}%{?dist} Summary: Icinga Web 2 License: GPL-2.0-or-later AND MIT AND BSD-3-Clause Group: System/Monitoring -Url: https://icinga.org -Source: https://github.com/Icinga/icingaweb2/archive/v%{sversion}.tar.gz +URL: https://icinga.com +Source0: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source90: README.SUSE Source99: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} -%define php php -%define php_cli php-cli +%if 0%{?rhel} == 7 +%define php_scl rh-php71 +%endif +%if 0%{?rhel} == 6 +%define php_scl rh-php70 +%endif + +%if 0%{?el5}%{?el6}%{?amzn} +%define use_selinux 0 +%else +%define use_selinux 1 +%endif + +%if 0%{?php_scl:1} +%define php_scl_prefix %{php_scl}- +%define php_runtime %{php_scl_prefix}php-fpm +%define php_bin /opt/rh/%{php_scl}/root/usr/bin/php +%define php_fpm 1 +%else +%define php_runtime %{php} +%endif + +%define php %{?php_scl_prefix}php +%define php_cli %{php}-cli +%define php_common %{php}-common %define wwwconfigdir %{_sysconfdir}/httpd/conf.d -%define wwwdir %{_sysconfdir}/httpd %define wwwuser apache -#%%define zend php-ZendFramework + +# extra requirements on RHEL +Requires: %{php}-ldap +Requires: %{php}-mysqlnd +Requires: %{php}-pgsql %endif +# minimum required PHP version +%define php_version 5.6.0 + %if 0%{?suse_version} -%if 0%{?suse_version} > 1500 -BuildRequires: user(wwwrun) -Requires(pre): user(wwwrun) -%endif -BuildRequires: apache2-devel -BuildRequires: fdupes -BuildRequires: nagios-rpm-macros %define wwwconfigdir %{_sysconfdir}/apache2/conf.d -%define wwwdir %{_sysconfdir}/apache2 %define wwwuser wwwrun -#%%define zend php-ZendFramework %define php php -Requires: mod_php_any +%define php_runtime mod_php_any +%define php_common %{php} +%define php_cli %{php} +# extra requirements on openSUSE +BuildRequires: fdupes +Requires: %{php}-ldap +Requires: %{php}-mysql +Requires: %{php}-pgsql +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 %endif -Requires: %{name}-common = %{version} -Requires: %{name}-vendor-HTMLPurifier -Requires: %{name}-vendor-JShrink -Requires: %{name}-vendor-Parsedown -Requires: %{name}-vendor-dompdf -Requires: %{name}-vendor-lessphp -Requires: %{name}-vendor-zf1 -Recommends: %{name}-icingacli = %{version} -Requires: php-Icinga = %{version} %{?amzn:Requires(pre): shadow-utils} %{?fedora:Requires(pre): shadow-utils} %{?rhel:Requires(pre): shadow-utils} %{?suse_version:Requires(pre): pwdutils} -%description -Icinga Web 2 is the a monitoring web interface, framework and -command-line interface supporting Icinga 2, Icinga Core and any other -monitoring backend compatible with the IDO database. +Requires: %{php_common} >= %{php_version} +Requires: %{php_runtime} >= %{php_version} +%if 0%{?suse_version} +Requires: apache2 +%endif + +Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-vendor-HTMLPurifier = %{version}-%{release} +Requires: %{name}-vendor-JShrink = %{version}-%{release} +Requires: %{name}-vendor-Parsedown = %{version}-%{release} +Requires: %{name}-vendor-dompdf = %{version}-%{release} +Requires: %{name}-vendor-lessphp = %{version}-%{release} +Requires: icingacli = %{version}-%{release} +Requires: php-Icinga = %{version}-%{release} %define basedir %{_datadir}/%{name} %define bindir %{_bindir} @@ -84,6 +116,10 @@ %define icingawebgroup icingaweb2 %define docsdir %{_datadir}/doc/%{name} +%description +Icinga Web 2 is the monitoring web interface for icinga2. + + %package common Summary: Common files for Icinga Web 2 and the Icinga CLI License: GPL-2.0-or-later AND MIT AND BSD-3-Clause @@ -92,158 +128,205 @@ %{?fedora:Requires(pre): shadow-utils} %{?rhel:Requires(pre): shadow-utils} %{?suse_version:Requires(pre): pwdutils} +%if 0%{?suse_version} > 1320 +Requires(pre): system-user-wwwrun +%endif %description common -Common files for Icinga Web 2 and the Icinga CLI that are shared -between all other icingaweb2 packages. +Common files for Icinga Web 2 and the Icinga CLI. + %package -n php-Icinga -Summary: PHP bindings for Icinga +Summary: Icinga Web 2 PHP library License: GPL-2.0-or-later AND MIT AND BSD-3-Clause -Group: System/Monitoring -Requires: %{php} >= 5.6.0 -Requires: %{php}-gd -Requires: %{php}-intl -#Requires: %%{zend} >= 1.12.18 -#Requires: %%{zend}-Db-Adapter-Pdo-Mysql -#Requires: %%{zend}-Db-Adapter-Pdo-Pgsql +Group: Development/Libraries/Other +Requires: %{php_common} >= %{php_version} +Requires: %{php}-gd %{php}-intl %{php}-mbstring +%{?rhel:Requires: %{php}-pdo %{php}-xml} +Requires: %{name}-vendor-zf1 = %{version}-%{release} %{?amzn:Requires: %{php}-pecl-imagick} %{?fedora:Requires: php-pecl-imagick} -%{?rhel:Requires: php-pecl-imagick} -%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix %{php}-ctype} +%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix %{php}-ctype %{php}-pdo %{php}-xml} %description -n php-Icinga -PHP bindings library for Icinga2 Web. +Icinga Web 2 PHP library. -%package icingacli -Summary: Icinga2 CLI + +%package -n icingacli +Summary: Icinga CLI License: GPL-2.0-or-later AND MIT AND BSD-3-Clause Group: System/Monitoring -Requires: %{name}-common = %{version} -Requires: php-Icinga = %{version} -%{?amzn:Requires: %{php_cli} >= 5.6.0 bash-completion} -%{?fedora:Requires: %{php_cli} >= 5.6.0 bash-completion} -%{?rhel:Requires: %{php_cli} >= 5.6.0 bash-completion} -%{?suse_version:Requires: %{php} >= 5.6.0} +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_cli} >= %{php_version} +Requires: bash-completion +Requires: php-Icinga = %{version}-%{release} +%if 0%{?suse_version} +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 +Obsoletes: %{name}-icingacli < %{version} +Provides: %{name}-icingacli = %{version} +%endif + +%description -n icingacli +Icinga CLI. + -%description icingacli -Command line interface for Icinga2. +%if 0%{?use_selinux} +%define selinux_variants mls targeted + +%package selinux +Summary: SELinux policy for Icinga Web 2 +License: GPL-2.0-or-later AND MIT AND BSD-3-Clause +Group: System/Base +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel +Requires: %{name} = %{version}-%{release} +Requires(post): policycoreutils +Requires(postun): policycoreutils + +%description selinux +SELinux policy for Icinga Web 2. +%endif %package vendor-dompdf -Version: 0.6.1 -Release: 0 -Summary: Vendor lib dompdf for Icinga Web 2 +Summary: Icinga Web 2 vendor library dompdf License: LGPL-2.1-only -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Group: Development/Libraries/Other +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_common} >= %{php_version} %description vendor-dompdf -Vendor library dompdf for Icinga Web 2. +Icinga Web 2 vendor library dompdf. + %package vendor-HTMLPurifier -Version: 4.6.0 -Release: 0 -Summary: Vendor lib HTMLPurifier for Icinga Web 2 +Summary: Icinga Web 2 vendor library HTMLPurifier License: LGPL-2.1-only -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Group: Development/Libraries/Other +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_common} >= %{php_version} %description vendor-HTMLPurifier -Vendor library HTMLPurifier for Icinga Web 2. +Icinga Web 2 vendor library HTMLPurifier. + %package vendor-JShrink -Version: 1.0.1 -Release: 0 -Summary: Vendor lib JShrink for Icinga Web 2 +Summary: Icinga Web 2 vendor library JShrink License: BSD-3-Clause -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Group: Development/Libraries/Other +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_common} >= %{php_version} %description vendor-JShrink -Vendor library JShrink for Icinga Web 2. +Icinga Web 2 vendor library JShrink. + %package vendor-lessphp -Version: 0.4.0 -Release: 0 -Summary: Vendor lib lessphp for Icinga Web 2 +Summary: Icinga Web 2 vendor library lessphp License: MIT -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Group: Development/Libraries/Other +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_common} >= %{php_version} %description vendor-lessphp -Vendor library lessphp for Icinga Web 2. +Icinga Web 2 vendor library lessphp. + %package vendor-Parsedown -Version: 1.0.0 -Release: 0 -Summary: Vendor lib Parsedown for Icinga Web 2 +Summary: Icinga Web 2 vendor library Parsedown License: MIT -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Group: Development/Libraries/Other +Requires: %{name}-common = %{version}-%{release} +Requires: %{php_common} >= %{php_version} %description vendor-Parsedown -Vendor library Parsedown for Icinga Web 2. +Icinga Web 2 vendor library Parsedown. + %package vendor-zf1 -Version: 1.12.20 -Release: 0 -Summary: Vendor lib zf1 for Icinga Web 2 -License: MIT -Group: System/Monitoring -Requires: %{php} >= 5.6.0 +Summary: Icinga Web 2's fork of Zend Framework 1 +License: BSD-3-Clause +Group: Development/Libraries/Other +Requires: %{php_common} >= %{php_version} +Obsoletes: %{name}-vendor-Zend < 1.12.20 +Provides: %{name}-vendor-Zend = %{version} +Requires: %{name}-common = %{version}-%{release} %description vendor-zf1 -Vendor library zf1 for Icinga Web 2. +Icinga Web 2's fork of Zend Framework 1. + %prep -%setup -q -n %{name}-%{sversion} +%setup -q +%if 0%{?use_selinux} +mkdir selinux +cp -p packages/selinux/icingaweb2.{fc,if,te} selinux +%endif +%if 0%{?suse_version} # rpmlint -chmod -x ./library/vendor/HTMLPurifier/DefinitionCache/Serializer/README -chmod -x ./application/fonts/fontello-ifont/LICENSE.txt -chmod -x ./application/fonts/fontello-ifont/README.txt -chmod -x ./application/fonts/fontello-ifont/config.json -chmod -x ./application/fonts/fontello-ifont/demo.html -find . -type f -name *svg | xargs chmod -x -find . -type f -name *css | xargs chmod -x +find . -type f "(" -name "*.css" -o -name "*.html" -o -name "*.json" -o -name "*.svg" -o -name "*.txt" -o -name "README" ")" -exec chmod -x "{}" "+" +%endif %build +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv icingaweb2.pp icingaweb2.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - +%endif %install -mkdir -p %{buildroot}{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} -cp -prv application doc %{buildroot}%{basedir} -cp -pv etc/bash_completion.d/icingacli %{buildroot}%{_sysconfdir}/bash_completion.d/icingacli -cp -prv modules/{doc,monitoring,setup,test,translation} %{buildroot}%{basedir}/modules -cp -prv library/Icinga %{buildroot}%{phpdir} -cp -prv library/vendor/{HTMLPurifier,JShrink,Parsedown,dompdf,lessphp,HTMLPurifier.autoload.php,HTMLPurifier.php,Zend} %{buildroot}%{basedir}/library/vendor -cp -prv public/{css,font,img,js,error_norewrite.html,index.php} %{buildroot}%{basedir}/public -cp -pv packages/files/apache/icingaweb2.conf %{buildroot}%{wwwconfigdir}/icingaweb2.conf -cp -pv packages/files/bin/icingacli %{buildroot}%{bindir} -cp -pv packages/files/public/index.php %{buildroot}%{basedir}/public -cp -prv etc/schema %{buildroot}%{docsdir} -cp -prv packages/files/config/modules/{setup,translation} %{buildroot}%{configdir}/modules +rm -rf %{buildroot} +mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} +cp -prv application doc %{buildroot}/%{basedir} +cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli +cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules +cp -prv library/Icinga %{buildroot}/%{phpdir} +cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor +cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public +%if 0%{?php_fpm:1} +cp -pv packages/files/apache/icingaweb2.fpm.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%else +cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%endif +cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir} +%if 0%{?php_bin:1} +sed -i '1 s~#!.*~#!%{php_bin}~' %{buildroot}/%{bindir}/icingacli +%endif +cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public +cp -prv etc/schema %{buildroot}/%{docsdir} +cp -prv packages/files/config/modules/{setup,translation} %{buildroot}/%{configdir}/modules +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 icingaweb2.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp +done +cd - +# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 +#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux +%endif %if 0%{?suse_version} %fdupes %{buildroot}/%{basedir}/library -%endif %find_lang icinga +%endif %pre getent group icingacmd >/dev/null || groupadd -r icingacmd -%if 0%{?suse_version} - %if 0%{?suse_version} == 1110 - usermod -A icingacmd,%{icingawebgroup} %{wwwuser} - %else - usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser} - %endif -if [ "$1" = "1" ]; then - # enable env, php5 and rewrite in apache on new installations - if [ -x %{_sbindir}/a2enmod ]; then - %{_sbindir}/a2enmod env >/dev/null - %{_sbindir}/a2enmod php5 >/dev/null - %{_sbindir}/a2enmod php7 >/dev/null - %{_sbindir}/a2enmod rewrite >/dev/null - fi -fi +%if 0%{?suse_version} && 0%{?suse_version} < 01200 +usermod -A icingacmd,%{icingawebgroup} %{wwwuser} +%else +usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser} %endif +exit 0 %files %defattr(-,root,root) @@ -256,8 +339,11 @@ %{basedir}/doc %{basedir}/modules %{basedir}/public -%dir %{wwwdir} +%if 0%{?suse_version} +# for lint on OBS +%dir %{dirname:%{wwwconfigdir}} %dir %{wwwconfigdir} +%endif %config(noreplace) %{wwwconfigdir}/icingaweb2.conf %attr(0775,root,%{icingawebgroup}) %dir %{logdir} %attr(0770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup @@ -269,29 +355,60 @@ %pre common getent group %{icingawebgroup} >/dev/null || groupadd -r %{icingawebgroup} +exit 0 %files common -f icinga.lang %defattr(-,root,root) -%{basedir}/application/locale %dir %{basedir} %dir %{basedir}/application -%dir %{basedir}/modules %dir %{basedir}/library %dir %{basedir}/library/vendor +%dir %{basedir}/modules +%{basedir}/application/locale %attr(0770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir} %attr(0770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules %files -n php-Icinga %defattr(-,root,root) +%if 0%{?suse_version} +# for lint on OBS %dir %{phpdir} +%endif %{phpdir}/Icinga -%files icingacli +%files -n icingacli %defattr(-,root,root) %{basedir}/application/clicommands -%config %{_sysconfdir}/bash_completion.d/icingacli +%{_sysconfdir}/bash_completion.d/icingacli %attr(0755,root,root) %{bindir}/icingacli +%if 0%{?use_selinux} +%post selinux +for selinuxvariant in %{selinux_variants} +do + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp &> /dev/null || : +done +%{_sbindir}/restorecon -R %{basedir} &> /dev/null || : +%{_sbindir}/restorecon -R %{configdir} &> /dev/null || : +%{_sbindir}/restorecon -R %{logdir} &> /dev/null || : + +%postun selinux +if [ $1 -eq 0 ] ; then + for selinuxvariant in %{selinux_variants} + do + %{_sbindir}/semodule -s ${selinuxvariant} -r icingaweb2 &> /dev/null || : + done + [ -d %{basedir} ] && %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : + [ -d %{configdir} ] && %{_sbindir}/restorecon -R %{configdir} &> /dev/null || : + [ -d %{logdir} ] && %{_sbindir}/restorecon -R %{logdir} &> /dev/null || : +fi + +%files selinux +%defattr(-,root,root,0755) +%doc selinux/* +%{_datadir}/selinux/*/icingaweb2.pp +%endif + %files vendor-dompdf %defattr(-,root,root) %{basedir}/library/vendor/dompdf @@ -299,7 +416,8 @@ %files vendor-HTMLPurifier %defattr(-,root,root) %{basedir}/library/vendor/HTMLPurifier -%{basedir}/library/vendor/HTMLPurifier*.php +%{basedir}/library/vendor/HTMLPurifier.autoload.php +%{basedir}/library/vendor/HTMLPurifier.php %files vendor-JShrink %defattr(-,root,root) ++++++ icingaweb2-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.gaoGVW/_old 2018-11-27 10:43:07.004152973 +0100 +++ /var/tmp/diff_new_pack.gaoGVW/_new 2018-11-27 10:43:07.008152969 +0100 @@ -1,3 +1,4 @@ # wrong fsf-adress +addFilter("description-shorter-than-summary"); +addFilter("files-duplicate"); addFilter("incorrect-fsf-address"); - ++++++ v2.6.1.tar.gz -> v2.6.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/icingaweb2/v2.6.1.tar.gz /work/SRC/openSUSE:Factory/.icingaweb2.new.19453/v2.6.2.tar.gz differ: char 13, line 1
