Hello community,
here is the log from the commit of package nagios for openSUSE:Factory
checked in at Tue Apr 6 22:26:14 CEST 2010.
--------
--- nagios/nagios.changes 2009-11-23 12:07:17.000000000 +0100
+++ nagios/nagios.changes 2010-04-06 12:50:01.000000000 +0200
@@ -1,0 +2,26 @@
+Tue Apr 6 10:48:52 UTC 2010 - chris@computersalat.de
+
+- cleanup source
+ o removed nagios-3.2.0
+
+-------------------------------------------------------------------
+Wed Mar 10 11:25:24 UTC 2010 - lars@linux-schulserver.de
+
+- update to 3.2.1:
+ Enhancements:
+ + Link to allow scheduling downtime for all services on a host
+ + Speedup to CGIs when lots of comments or downtimes in status.dat file
+ + Patch for new_mini_epn to allow for any command line length without
+ breaking extra trailing or leading whitespace
+ Fixes:
+ + Fix for incorrect scheduling when time has gone back an hour
+ (partial fix for 24x7)
+ + Fix for logging test, which was not timezone aware
+ (bug #0000077 - Allan Clark)
+ + Fix for CSS validation of padding: X
+ + Fix for documentation re: case-insensitive nature of custom
+ variables (Marc Powell)
+ + Fix for template configurations which use negated wildcards
+ (Tim Wilde)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nagios-3.2.0.tar.bz2
New:
----
nagios-3.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios.spec ++++++
--- /var/tmp/diff_new_pack.svMKyS/_old 2010-04-06 22:24:08.000000000 +0200
+++ /var/tmp/diff_new_pack.svMKyS/_new 2010-04-06 22:24:08.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package nagios (Version 3.2.0)
+# spec file for package nagios (Version 3.2.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,23 +19,22 @@
Name: nagios
-%define realname nagios
%define nsusr nagios
%define nsgrp nagios
%define cmdusr wwwrun
%define cmdgrp nagcmd
-%define nslockfile_dir /var/run/%{realname}
-%define nslockfile %nslockfile_dir/%{realname}.pid
+%define nslockfile_dir /var/run/%{name}
+%define nslockfile %nslockfile_dir/%{name}.pid
%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d
# Macro that print mesages to syslog at package (un)install time
-%define nnmmsg logger -t %{realname}/rpm
+%define nnmmsg logger -t %{name}/rpm
Summary: The Nagios Network Monitor
-Version: 3.2.0
-Release: 2
-License: GPL v2 or later
+Version: 3.2.1
+Release: 1
+License: GPLv2+
Group: System/Monitoring
Url: http://www.nagios.org/
-Source0: %{realname}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Source1: rc%{name}
Source2: %{name}-rpmlintrc
Source3: %{name}.sysconfig
@@ -79,7 +78,7 @@
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
-Requires: mailx %{realname}-plugins
+Requires: mailx %{name}-plugins
%description
Nagios is a program that will monitor hosts and services on your
@@ -103,7 +102,7 @@
Ethan Galstad
%package www
-License: GPL v2 or later
+License: GPLv2+
Group: System/Monitoring
Summary: Provides the HTML and CGI files for the Nagios web interface
Requires: %{name} = %{version}
@@ -137,7 +136,7 @@
Ethan Galstad
%package devel
-License: GPL v2 or later
+License: GPLv2+
Group: Development/Libraries/C and C++
Summary: Development files for nagios
Requires: %{name} = %{version}
@@ -161,7 +160,7 @@
Ethan Galstad
%prep
-%setup -q -n %{realname}-%{version}
+%setup -q
%patch1 -p1
%patch10
find -name ".cvsignore" | xargs rm
@@ -174,16 +173,16 @@
--prefix=%{_prefix} \
--exec-prefix=%{_sbindir} \
--bindir=%{_sbindir} \
- --sbindir=%{_prefix}/lib/%{realname}/cgi \
- --libexecdir=%{_prefix}/lib/%{realname}/plugins \
- --datadir=%{_datadir}/%{realname} \
- --sysconfdir=%{_sysconfdir}/%{realname} \
+ --sbindir=%{_prefix}/lib/%{name}/cgi \
+ --libexecdir=%{_prefix}/lib/%{name}/plugins \
+ --datadir=%{_datadir}/%{name} \
+ --sysconfdir=%{_sysconfdir}/%{name} \
--with-init-dir=%{_sysconfdir}/init.d \
- --localstatedir=/var/lib/%{realname} \
- --with-cgiurl=/%{realname}/cgi-bin \
- --with-htmurl=/%{realname} \
+ --localstatedir=/var/lib/%{name} \
+ --with-cgiurl=/%{name}/cgi-bin \
+ --with-htmurl=/%{name} \
--with-httpd-conf=%{apache2_sysconfdir} \
- --with-checkresult-dir=/var/spool/%{realname} \
+ --with-checkresult-dir=/var/spool/%{name} \
--with-lockfile=%{nslockfile} \
--with-nagios-user=%{nsusr} \
--with-nagios-group=%{nsgrp} \
@@ -203,7 +202,7 @@
#
# fix p1.pl debug-path
#
-sed -i 's#/usr/local/nagios/var/#/var/log/%{realname}/#g' p1.pl
+sed -i 's#/usr/local/nagios/var/#/var/log/%{name}/#g' p1.pl
# make rpmlint happy: add shebang to p1.pl
echo "#!/usr/bin/perl" > p1.pl.new
cat p1.pl >> p1.pl.new
@@ -216,18 +215,19 @@
pushd contrib/eventhandlers 1>/dev/null
for f in `find . -type f` ; do
F=`mktemp temp.XXXXXX`
- sed "s=/usr/local/nagios/var/rw/=/var/spool/%{realname}/=; \
+ sed "s=/usr/local/nagios/var/rw/=/var/spool/%{name}/=; \
s=NscaBin\=\"/usr/local/nagios/libexec/send_nsca\"=NscaBin\=/usr/bin/send_nsca=; \
- s=/usr/local/nagios/libexec/eventhandlers/=%{_prefix}/lib/%{realname}/plugins/eventhandlers/=; \
- s=/usr/local/nagios/libexec/=%{_prefix}/lib/%{realname}/plugins/=; \
- s=/usr/local/nagios/etc/=%{_sysconfdir}/%{realname}/=; \
- s=/usr/local/nagios/test/var=/var/log/%{realname}=" ${f} > ${F}
+ s=/usr/local/nagios/libexec/eventhandlers/=%{_prefix}/lib/%{name}/plugins/eventhandlers/=; \
+ s=/usr/local/nagios/libexec/=%{_prefix}/lib/%{name}/plugins/=; \
+ s=/usr/local/nagios/etc/=%{_sysconfdir}/%{name}/=; \
+ s=/usr/local/nagios/test/var=/var/log/%{name}=" ${f} > ${F}
+
mv ${F} ${f}
done
popd 1>/dev/null
%install
-mkdir -p %buildroot/var/log/%realname/archives
+mkdir -p %buildroot/var/log/%name/archives
mkdir -p %buildroot/%_sbindir
mkdir -p %buildroot/%apache2_sysconfdir/
mkdir -p %buildroot/%nslockfile_dir
@@ -235,22 +235,22 @@
DESTDIR="%buildroot" \
INSTALL_OPTS="" \
COMMAND_OPTS="" \
- CGICFGDIR="%_sysconfdir/%realname" \
+ CGICFGDIR="%_sysconfdir/%name" \
INIT_OPTS=""
%{__make} install -C contrib \
DESTDIR="%buildroot" \
INSTALL_OPTS=""
# install event handlers
-%{__install} -d -m0755 %buildroot%_prefix/lib/%realname/plugins/eventhandlers/
-%{__cp} -afpv contrib/eventhandlers/* %buildroot%_prefix/lib/%realname/plugins/eventhandlers/
+%{__install} -d -m0755 %buildroot%_prefix/lib/%name/plugins/eventhandlers/
+%{__cp} -afpv contrib/eventhandlers/* %buildroot%_prefix/lib/%name/plugins/eventhandlers/
# install directory for event brokers like ndoutils
-%{__install} -d -m0755 %buildroot%_prefix/lib/%realname/brokers
+%{__install} -d -m0755 %buildroot%_prefix/lib/%name/brokers
# install headers for development package
-%{__install} -d -m0755 %buildroot%_includedir/%realname/
+%{__install} -d -m0755 %buildroot%_includedir/%name/
pushd include
for file in *.h; do
if test "x${file}" != "xconfig.h" -a "x${file}" != "xsnprintf.h" -a "x${file}" != "xcgiutils.h" ; then
- install -m 644 $file %buildroot%_includedir/%realname/
+ install -m 644 $file %buildroot%_includedir/%name/
fi;
done
popd
@@ -259,28 +259,28 @@
#
find sample-config/ -name "*.in" -exec rm {} \;
find sample-config/ -name "*.in.orig" -exec rm {} \;
-sed -e 's|command_file=.*|command_file=/var/spool/%realname/nagios.cmd|g' \
+sed -e 's|command_file=.*|command_file=/var/spool/%name/nagios.cmd|g' \
-e 's|log_file=/var/lib/nagios/nagios.log|log_file=/var/log/nagios/nagios.log|g' \
-e 's|log_archive_path=/var/lib/nagios/archives|log_archive_path=/var/log/nagios/archives|g' \
- %buildroot/%_sysconfdir/%realname/nagios.cfg > %buildroot/%_sysconfdir/%realname/nagios.cfg.tmp
-mv %buildroot/%_sysconfdir/%realname/nagios.cfg.tmp %buildroot/%_sysconfdir/%realname/nagios.cfg
+ %buildroot/%_sysconfdir/%name/nagios.cfg > %buildroot/%_sysconfdir/%name/nagios.cfg.tmp
+mv %buildroot/%_sysconfdir/%name/nagios.cfg.tmp %buildroot/%_sysconfdir/%name/nagios.cfg
#
# install SuSE specials
#
# README.SuSE file
-sed -e 's@DATADIR@%_datadir/%realname@g' -e 's@SYSCONFDIR@%_sysconfdir/%realname@g' %{SOURCE10} > %_builddir/%realname-%version/README.SuSE
+sed -e 's@DATADIR@%_datadir/%name@g' -e 's@SYSCONFDIR@%_sysconfdir/%name@g' %{SOURCE10} > %_builddir/%name-%version/README.SuSE
# init-script
-%{__install} -D -m 0755 %{S:1} %buildroot/%_sysconfdir/init.d/%realname
-ln -sf ../../etc/init.d/%realname %buildroot/%_sbindir/rc%realname
+%{__install} -D -m 0755 %{S:1} %buildroot/%_sysconfdir/init.d/%name
+ln -sf ../../etc/init.d/%name %buildroot/%_sbindir/rc%name
# sysconfig script
-%{__install} -D -m 0644 %{S:3} %buildroot/var/adm/fillup-templates/sysconfig.%realname
+%{__install} -D -m 0644 %{S:3} %buildroot/var/adm/fillup-templates/sysconfig.%name
# install cronjob (gzip' the logfiles)
-%{__install} -D -m 0640 %{S:4} %buildroot/%_sysconfdir/cron.weekly/%realname
+%{__install} -D -m 0640 %{S:4} %buildroot/%_sysconfdir/cron.weekly/%name
# important ghost files
-touch %buildroot%_sysconfdir/%realname/htpasswd.users
-touch %buildroot/var/lib/%realname/retention.dat
-touch %buildroot/var/lib/%realname/status.dat
-touch %buildroot/var/log/%realname/config.err
+touch %buildroot%_sysconfdir/%name/htpasswd.users
+touch %buildroot/var/lib/%name/retention.dat
+touch %buildroot/var/lib/%name/status.dat
+touch %buildroot/var/log/%name/config.err
touch %buildroot%nslockfile
# some rpmlint stuff
%if 0%{?suse_version} > 1020
@@ -316,7 +316,7 @@
then
: OK user %{nsusr} already present
else
- useradd -r -o -g %{nsgrp} -s /bin/false -c "User for Nagios" -d /var/lib/%{realname} %{nsusr} 2> /dev/null || :
+ useradd -r -o -g %{nsgrp} -s /bin/false -c "User for Nagios" -d /var/lib/%{name} %{nsusr} 2> /dev/null || :
%{nnmmsg} "Added user %{nsusr} for package %{name}"
fi
# update?
@@ -335,10 +335,10 @@
%{fillup_and_insserv nagios}
# Update ?
if [ ${1:-0} -gt 1 ]; then
- if [ -f %{_sysconfdir}/%{realname}/nagios.cfg ]; then
+ if [ -f %{_sysconfdir}/%{name}/nagios.cfg ]; then
DATE=$(date "+%Y-%m-%d-%H:%M")
- TMPFILE=$(mktemp /tmp/%{realname}-XXXXXX)
- NAGIOS_CFG=%{_sysconfdir}/%{realname}/nagios.cfg
+ TMPFILE=$(mktemp /tmp/%{name}-XXXXXX)
+ NAGIOS_CFG=%{_sysconfdir}/%{name}/nagios.cfg
cp -f $NAGIOS_CFG ${NAGIOS_CFG}_${DATE}
if ! grep -q ^lock_file=%{nslockfile} $NAGIOS_CFG ; then
echo "- updating pid lock_file= to %{nslockfile} in $NAGIOS_CFG" >> $TMPFILE
@@ -400,13 +400,13 @@
fi
%preun
-%stop_on_removal %{realname}
+%stop_on_removal %{name}
%postun
if [ -f %nslockfile ]; then
chown -v %{nsusr} %{nslockfile}
fi
-%restart_on_update %{realname}
+%restart_on_update %{name}
%{insserv_cleanup}
%post www
@@ -434,47 +434,47 @@
%files
%defattr(-,root,root)
%doc Changelog LEGAL LICENSE README README.SuSE sample-config/
-%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname
-%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/objects
-%dir %attr(755,%nsusr,%nsgrp) /var/lib/%realname
-%dir %attr(755,%nsusr,%nsgrp) /var/log/%realname
-%dir %attr(755,%nsusr,%nsgrp) /var/log/%realname/archives
+%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%name
+%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/objects
+%dir %attr(755,%nsusr,%nsgrp) /var/lib/%name
+%dir %attr(755,%nsusr,%nsgrp) /var/log/%name
+%dir %attr(755,%nsusr,%nsgrp) /var/log/%name/archives
%dir %attr(755,%nsusr,%nsgrp) %nslockfile_dir
-%dir %attr(2775,%nsusr,%cmdgrp) /var/spool/%realname
-%attr(0755,root,root) %_sysconfdir/init.d/%realname
-%attr(0644,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/%realname/%realname.pid
-%attr(0600,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%realname/retention.dat
-%attr(0664,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%realname/status.dat
-%ghost %config(missingok,noreplace) /var/log/%realname/config.err
-%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/cgi.cfg
-%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/%{realname}.cfg
-%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/resource.cfg
-%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/objects/*.cfg
-/var/adm/fillup-templates/sysconfig.%{realname}
+%dir %attr(2775,%nsusr,%cmdgrp) /var/spool/%name
+%attr(0755,root,root) %_sysconfdir/init.d/%name
+%attr(0644,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/%name/%name.pid
+%attr(0600,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/retention.dat
+%attr(0664,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/status.dat
+%ghost %config(missingok,noreplace) /var/log/%name/config.err
+%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/cgi.cfg
+%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/%{name}.cfg
+%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/resource.cfg
+%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/objects/*.cfg
+/var/adm/fillup-templates/sysconfig.%{name}
# defattr change
%defattr(755,root,root)
%_sysconfdir/cron.weekly/*
-%_prefix/lib/%realname/
-%exclude %_prefix/lib/%realname/cgi/*
+%_prefix/lib/%name/
+%exclude %_prefix/lib/%name/cgi/*
%_sbindir/convertcfg
%_sbindir/mini_epn
-%attr(0750,root,%{cmdgrp}) %_sbindir/%{realname}
+%attr(0750,root,%{cmdgrp}) %_sbindir/%{name}
%attr(0750,root,%{cmdgrp}) %_sbindir/nagiostats
%_sbindir/new_mini_epn
-%_sbindir/rc%realname
+%_sbindir/rc%name
%files www
%defattr(755,root,root)
-%_prefix/lib/%realname/cgi/*
+%_prefix/lib/%name/cgi/*
# defattr change
%defattr(-,root,root)
-%_datadir/%realname/
-%config(noreplace) %{apache2_sysconfdir}/%realname.conf
-%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %_sysconfdir/%realname/htpasswd.users
+%_datadir/%name/
+%config(noreplace) %{apache2_sysconfdir}/%name.conf
+%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %_sysconfdir/%name/htpasswd.users
%files devel
%defattr(-,root,root)
-%dir %_includedir/%realname
-%_includedir/%realname/*
+%dir %_includedir/%name
+%_includedir/%name/*
%changelog
++++++ nagios-3.2.0.tar.bz2 -> nagios-3.2.1.tar.bz2 ++++++
++++ 18191 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org