Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2012-12-19 10:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-11-13 17:03:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-12-19 10:58:57.000000000 +0100 @@ -1,0 +2,48 @@ +Tue Dec 18 00:13:02 UTC 2012 - crrodrig...@opensuse.org + +- Package links to libperl.so so it must use exact perl + version as requires. + +------------------------------------------------------------------- +Mon Dec 17 15:46:24 UTC 2012 - l...@linux-schulserver.de + +- Use usermod instead of groupmod when suse_version > 1220 due to + pwdutils/shadow switch. +- move macro definition to a place where the macro %%name is defined +- added man pages for new_mini_epn, convertcfg and mini_epn + => conflicts with nagios manpages + +------------------------------------------------------------------- +Wed Dec 12 09:35:17 UTC 2012 - thard...@suse.com + +- imported upstream version 1.8.3 + * idoutils: fix unknown column contactaddress_id (thx fmbiete) #3483 - MF + +------------------------------------------------------------------- +Wed Nov 28 17:42:25 UTC 2012 - thard...@suse.com + +- imported upstream version 1.8.2 + FIXES + * core: fix macro escaping logs incorrect warning for $$escapes #3404 - MF + * core: fix wrong escalation notification due to state based escalation range behaviour changes #3441 - MF + * idoutils: fix many memory leaks in ido2db on dbi_result_free and others (thx Klaus Wagner) #3406 - MF + * idoutils: fix ido2db crashes when Oracle queries fail #3324 - GB + * idoutils: fix ORA-1461 writing data to varchar2 exceeding field size limit output, command_arg and commandline data written to Oracle #3324 #3325 - TD + * idoutils: fix unsafe handling of dbi_conn_sequence_last, rewrite last_insert_id/sequence fetching #3408 - MF + * idoutils: fix ido2db does not cleanly exit the client on wrong schema version check in db_hello #3419 - MF + * idoutils: fix FROM_UNIXTIME(NULL) does not work with MySQL 5.0.x #3399 #3466 - CF + * install: drop unused daemon-init-readhat script (spec uses daemon-init) #3402 - MF + * install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) #3413 - MF + * classic ui: fix cmd.cgi does not honor commandpipe location; overwrites from empty environment variable #3418 - MF + * classic ui: fixed double-listed host dependencies in host extinfo.cgi #3295 - RB + * classic ui: fixed sort_icinga_logfiles_by_name() in readlogs.c fails to take NULL pointers into consideration #3398 - CF + * classic ui: fixed committing acknowledgement cmd negates flags for send_notification and sticky_ack #3329 - RB + * classic ui: fixed backtrack_archives only getting calculated on a daily log rotation basis #3416 - RB + * classic ui: fixed invalid freeing of last_check in 'scheduling queue' for first time checks #3444 - RB + * docs: add missing cmd_mod description in cgi params #3438 - MF + * docs: search_string as cgi GET param works also for status.cgi #3451 - MF + * docs: fix typo pqsql -> pgsql #3461 - WN + CHANGES + * icinga.cfg - enable_state_based_escalation_ranges=0 (disabled if not set) fix for #3441 + +------------------------------------------------------------------- Old: ---- icinga-1.8.1.tar.gz New: ---- convertcfg.8 icinga-1.8.3.tar.gz mini_epn.8 new_mini_epn.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.5bsbPw/_old 2012-12-19 10:59:02.000000000 +0100 +++ /var/tmp/diff_new_pack.5bsbPw/_new 2012-12-19 10:59:02.000000000 +0100 @@ -16,13 +16,8 @@ # -%define apacheconfdir %{_sysconfdir}/apache2/conf.d -%define apachegroup www -# Macro that print mesages to syslog at package (un)install time -%define logmsg logger -t %{name}/rpm - Name: icinga -Version: 1.8.1 +Version: 1.8.3 Release: 0 Summary: Host/service/network monitoring program @@ -42,6 +37,9 @@ Source10: README.SUSE Source11: README.SUSE.idoutils Source12: update_icinga_paths.sh +Source13: convertcfg.8 +Source14: new_mini_epn.8 +Source15: mini_epn.8 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch Patch0: icinga-add-ifdefine-to-apache.patch Provides: monitoring_daemon @@ -73,10 +71,10 @@ Requires(pre): grep Requires(pre): pwdutils Requires(pre): sed -%if 0%{?suse_version} >= 1110 -Requires: perl >= 5.10.0 +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} %else -Recommends: perl >= 5.10.0 +%{perl_requires} %endif Requires: mailx Recommends: %{name}-plugins-eventhandlers @@ -87,6 +85,10 @@ Recommends: net-snmp Recommends: openssl BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define apacheconfdir %{_sysconfdir}/apache2/conf.d +%define apachegroup www +# Macro that print mesages to syslog at package (un)install time +%define logmsg logger -t %{name}/rpm %description Icinga is a program that will monitor hosts and services on your @@ -396,6 +398,9 @@ install -m644 %{SOURCE7} "%{buildroot}%{_mandir}/man8/" install -m644 %{SOURCE8} "%{buildroot}%{_mandir}/man8/" install -m644 %{SOURCE9} "%{buildroot}%{_mandir}/man8/" +install -m644 %{SOURCE13} "%{buildroot}%{_mandir}/man8/" +install -m644 %{SOURCE14} "%{buildroot}%{_mandir}/man8/" +install -m644 %{SOURCE15} "%{buildroot}%{_mandir}/man8/" %pre # add icinga user and groups @@ -448,7 +453,11 @@ : # $wwwusr (default: %%{icinga_command_user}) is already in %%{icinga_command_group} group else # modify apache user, adding it to cmdgrp + %if 0%{?suse_version} > 1220 + usermod -a -G %{icinga_command_group} $wwwusr + %else groupmod -A $wwwusr %{icinga_command_group} 2>/dev/null + %endif %{logmsg} "User $wwwusr added to group %{icinga_command_group} so sending commands to Icinga from the command CGI is possible." fi if [ ${1:-0} -eq 1 ] @@ -491,6 +500,9 @@ %doc README LICENSE Changelog UPGRADING LEGAL sample-config/ README.SUSE examples %{_mandir}/man8/icinga*.8* %{_mandir}/man8/mini_epn_icinga.8* +%{_mandir}/man8/convertcfg.8* +%{_mandir}/man8/new_mini_epn.8* +%{_mandir}/man8/mini_epn.8* %{_initrddir}/%{name} %{_sbindir}/%{name} %attr(0754,root,%{icinga_group}) %{_sbindir}/icingastats ++++++ convertcfg.8 ++++++ '\" t .\" Title: convertcfg .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: 06/10/2012 .\" Manual: convertcfg .\" Source: Nagios .\" Language: English .\" .TH "CONVERTCFG" "8" "06/10/2012" "Nagios" "convertcfg" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" convertcfg \- Nagios Config File Converter .SH "SYNOPSIS" .sp \fBconvertcfg <config file> <object type>\fR .SH "DESCRIPTION" .sp Nagios Config File Converter, written by Ethan Galstad (egalstad@nagios\&.org)\&. .sp This utility is designed to aide you in converting your old 'host' config file(s) to the new template-based config file style\&. It is also capable of converting extended host and service information definitions in your old CGI config file\&. .sp Supply the name of your old 'host' config file (or your old CGI config file if you're converting extended host/service definitions) on the command line, along with the type of object you would like to produce a new config file for\&. Your old config file is not overwritten - new configuration data is printed to standard output, so you can redirect it wherever you like\&. .sp Please note that you can only specify one type of object at a time on the command line\&. .sp IMPORTANT: This utility will generate Nagios 1\&..x compliant config files\&. However, the config files are not totally compatible with Nagios 2\&.x, so you will have to do some manual tweaking\&. .SH "Valid object types:" .sp .if n \{\ .RS 4 .\} .nf timeperiods commands contacts contactgroups hosts hostgroups hostgroupescalations services servicedependencies serviceescalations hostextinfo serviceextinfo .fi .if n \{\ .RE .\} .SH "AUTHOR" .sp This manpage was written by Lars Vogdt <lars@linux-schulserver\&.de> and is based on the help text of convertcfg\&. ++++++ icinga-1.8.1.tar.gz -> icinga-1.8.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.8.1.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.8.3.tar.gz differ: char 5, line 1 ++++++ mini_epn.8 ++++++ '\" t .\" Title: mini_epn .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: 09/19/2009 .\" Manual: mini_epn .\" Source: Nagios .\" Language: English .\" .TH "MINI_EPN" "8" "09/19/2009" "Nagios" "mini_epn" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" mini_epn \- run nagiosplugins inside of an embedded perl interpreter .SH "SYNOPSIS" .sp \fBmini_epn\fR .SH "DESCRIPTION" .sp After calling \fBmini_epn\fR an embedded perl interpreter gets started and asks for you a script to execute under the interpreter\&. To exit the interpreter loop press ^d at the prompt\&. Please note that the maximal input length is 1024 characters. .SH "EXAMPLES" .sp .if n \{\ .RS 4 .\} .nf # mini_epn Enter file name: /usr/lib/nagios/plugins/check_linux_raid.pl embedded perl plugin return code and output was: 0 & \'OK md0 status=[UU]\&. md1 status=[UU]\&. .fi .if n \{\ .RE .\} .SH "AUTHOR" .sp This manpage was written by Alexander Wirt <formorer@debian\&.org> for the Debian Distribution and adapted for openSUSE by Lars Vogdt\&. ++++++ new_mini_epn.8 ++++++ '\" t .\" Title: new_mini_epn .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: 09/19/2009 .\" Manual: mini_epn .\" Source: Nagios .\" Language: English .\" .TH "NEW_MINI_EPN" "8" "06/10/2012" "Nagios" "new_mini_epn" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" new_mini_epn \- run nagiosplugins inside of an embedded perl interpreter .SH "SYNOPSIS" .sp \fBnew_mini_epn\fR .SH "DESCRIPTION" .sp After calling \fBnew_mini_epn\fR an embedded perl interpreter gets started and asks for you a script to execute under the interpreter\&. To exit the interpreter loop press ^d at the prompt\&. .SH "EXAMPLES" .sp .if n \{\ .RS 4 .\} .nf # new_mini_epn plugin command line: /usr/lib/nagios/plugins/check_mailq -w 10 -c 20 embedded perl plugin return code and output was: 0 & OK: mailq is empty|unsent=0;10;20;0 .fi .if n \{\ .RE .\} .SH "AUTHOR" .sp This manpage was written by Lars Vogdt <lars@linux-schulserver\&.de> for the openSUSE Distribution based on the mini_epn manpage written by Alexander Wirt <formorer@debian\&.org> for the Debian Distribution\&. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org