Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2012-03-01 17:20:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2011-10-14 09:51:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-03-01 17:20:10.000000000 +0100 @@ -1,0 +2,48 @@ +Tue Feb 21 16:41:40 UTC 2012 - [email protected] + +- Added changelog entry about the icinga-api removal + +------------------------------------------------------------------- +Thu Feb 16 09:03:31 UTC 2012 - [email protected] + +- Added some detail about the last version updates + +------------------------------------------------------------------- +Mon Feb 13 10:47:45 UTC 2012 - [email protected] + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Fri Dec 2 15:32:05 UTC 2011 - [email protected] + +- Imported Upstream version 1.6.1: + * core: fix freshness checks are generating stale alerts, even + if result was received in time + +------------------------------------------------------------------- +Fri Dec 01 14:29:26 UTC 2011 - [email protected] + +- imported Upstream version 1.6.0 + * package: complete remove icinga-api as module #1935 + ** Development is being discontinued for now, 1.5.0 was last combined release. + * core: fix downtime and comments delete with wrong loop pointers + causing segfaults + * core: fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts + assigned to host|service, not only notified contacts + * core: plug memory leak in downtimes comment add + * core: make first_notification_delay depend on the first !OK hard state + change and don't reset timer for new hard states which would replace it + * core: fix memory leak in xodtemplate.c + * classic ui: fix for Classic-UI displays bad timeperiods + * classic ui: fixed wrong color in histogram and trends for unknown/unreachable + * classic ui: fixed search not returning all results, only first match + * classic ui: fixed wrong output from status.cgi with option hostservicedetail + * classic ui: fix typo in histogram.c + * idoutils: host state change last_hard_state overrides last_state, + last_hard_state always -1 + * idoutils: extend conninfo.agent_version field to varchar(16) + * idoutils: terminate threads cleanly, including db connection + * install: rework the version updates in icinga and idoutils + - See ChangeLog for more details + +------------------------------------------------------------------- Old: ---- icinga-1.5.1.tar.gz icinga-remove-obsolete-api.patch New: ---- icinga-1.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.Nb4BY2/_old 2012-03-01 17:20:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Nb4BY2/_new 2012-03-01 17:20:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icinga # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +16,11 @@ # -# set to 1 to also build the obsolete api packages -%define build_api 0 - %define logdir %{_localstatedir}/log/icinga Name: icinga -Version: 1.5.1 -Release: 2 -License: GPLv2 +Version: 1.6.1 +Release: 0 %define nsusr icinga %define nsgrp icinga %define cmdgrp icingacmd @@ -34,8 +30,9 @@ %define apacheuser wwwrun %define apachegroup www Summary: Host/service/network monitoring program -Url: http://www.icinga.org/ +License: GPL-2.0 Group: System/Monitoring +Url: http://www.icinga.org/ Source0: %{name}-%{version}.tar.gz Source1: rc%{name} Source2: rcido2db @@ -49,10 +46,6 @@ Source12: htpasswd.users # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch Patch0: icinga-add-ifdefine-to-apache.patch -%if 0%{?build_api} == 0 -# PATCH-FIX-OPENSUSE icinga-remove-obsolete-api.patch -Patch1: icinga-remove-obsolete-api.patch -%endif BuildRequires: apache2-devel %if 0%{?suse_version} >= 1110 BuildRequires: fdupes @@ -214,44 +207,9 @@ monitoring, redundancy and disabling and enabling service checks and notifications. -%if 0%{?build_api} != 0 - -%package api -Summary: PHP api for icinga -Group: System/Monitoring -Recommends: %{name}-idoutils -Recommends: php5-mysql -Recommends: php5-pgsql -Requires(pre): %{name} = %{version} - -%description api -PHP based, the Icinga API is free from complex data schemas, and has no -dependencies on other libraries or frameworks. It also supports various -interfaces, from database PHP-PDO output to pipe and SSH input. - -Data collected from the IDODB by the Icinga API is then presented in the Icinga -Web or any other portal interface addon. Writing addons and plugins for Icinga -is made much easier through this structure as the API acts as an interpreter -for the extensions, saving a lot of coding stress. - -In short: This package provides the API needed to access idoutils and -livestatus information from PHP. - -%package api-doc -Summary: Online documentation for %{name}-api -Group: System/Monitoring -Recommends: %{name}-web = %{version} - -%description api-doc -This package provides the online documentation for %{name}-api. -%endif - %prep %setup -q %patch0 -p1 -%if 0%{?build_api} == 0 -%patch1 -p1 -%endif # replace default ido2db lock and socket file settings sed -ie "s|@localstatedir@/ido2db.lock|%{_localstatedir}/run/%{name}/ido2db.pid|g; \ @@ -292,10 +250,7 @@ --enable-event-broker \ --enable-embedded-perl \ --enable-idoutils \ - --enable-ssl \ -%if 0%{?build_api} != 0 - --with-phpapi-log-dir=%{logdir}/api \ -%endif + --enable-ssl # # make daemonchk.cgi and event handlers @@ -361,11 +316,6 @@ # remove unnecessary files from www log directory rm %{buildroot}/%{logdir}/www/{.htaccess,index.htm} -%if 0%{?build_api} != 0 -### remove API PLACEHOLDER -rm %{buildroot}/%{logdir}/api/PLACEHOLDER -%endif - # REST of special SUSE stuff here, if needed.... # init-scripts # remove the default init script as SUSE uses an adapted one @@ -563,6 +513,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/ido2db.cfg %config(noreplace) %{_sysconfdir}/%{name}/idomod.cfg %config(noreplace) %{_sysconfdir}/%{name}/modules/idoutils.cfg +%config(noreplace) %{_sysconfdir}/icinga/objects/ido2db_check_proc.cfg %{_sbindir}/rcido2db %{_sbindir}/ido2db %{_sbindir}/log2ido @@ -600,20 +551,4 @@ %defattr(0755,root,root) %{_prefix}/lib/nagios/plugins/eventhandlers/ -%if 0%{?build_api} != 0 - -%files api -%defattr(-,%{nsusr},%{nsgrp}) -%dir %{_datadir}/icinga/icinga-api -%{_datadir}/icinga/icinga-api/IcingaApi.php -%{_datadir}/icinga/icinga-api/contrib -%{_datadir}/icinga/icinga-api/objects -%{_datadir}/icinga/icinga-api/tests -%attr(0775,%{apacheuser},%{apachegroup}) %dir %{logdir}/api - -%files api-doc -%defattr(-,root,root) -%doc module/icinga-api/doc/* -%endif - %changelog ++++++ icinga-1.5.1.tar.gz -> icinga-1.6.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.5.1.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.6.1.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
