commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at Thu Apr 8 22:19:53 CEST 2010.
--------
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/ndoutils/ndoutils.changes 2009-12-20 19:57:05.000000000 +0100
@@ -0,0 +1,121 @@
+-------------------------------------------------------------------
+Sun Dec 20 18:54:49 UTC 2009 - chris@computersalat.de
+
+- fix build for o:F
+ * reworked patch ndoutils-1.4b7-libpq-fe-include.patch
+ now with fuzz=0
+
+-------------------------------------------------------------------
+Sat Nov 7 18:19:10 UTC 2009 - chris@computersalat.de
+
+- fix expansion error
+ o nothing provides mysql-shared needed by ndoutils
+ * do not define explicit libdepency
+ * removed Requires: mysql-shared for >= 1120
+
+-------------------------------------------------------------------
+Sat Nov 7 16:37:11 UTC 2009 - chris@computersalat.de
+
+- update to 1.4b9
+ + Improved writes from file2sock to ndo2db by matching buffer
+ sizes (Opsera Ltd)
+ + Add in 4 missing tables from clearout process during
+ prelaunch (Opsera Ltd)
+ + Fix for Solaris 10 which gets an EINTR on accept for the 2nd
+ file2sock call (Opsera Ltd)
+ + Fix for not retrying read on 'EAGAIN' and 'EINTR' soft
+ errors (Opsera Ltd)
+ + Improve error info by showing failed MySQL query in
+ syslog (Opsera Ltd)
+ + Move database connections/disconnections syslog detail to DEBUG
+ from INFO (Opsera Ltd)
+ + Allow externalcommands table to be trimmed with a specific time
+ limit (Opsera Ltd)
+ + Support SSL encryption between the communication partners
+ + Support for long performance data
+ + Added installation procedure with "make install" or
+ "make fullinstall"
+ + Fix missing output fields in hostcheck and servicecheck tables
+ + Workaround small NDOMOD Buffers to handle more than 4k chars
+ (tracker id 21)
+ + Fix unescape of strings containing tabstops
+ + Fix case insensitive behavior in NDOUtils (tracker id 66)
+- specmods
+ + fix sed for {ndo2db,ndomod}.cfg
+ o files were renamed in SOURCE to {ndo2db,ndomod}.cfg-sample
+ + fix build for SLES_9
+ o unknown tag Recommends
+- rpmlint
+ o files-duplicate in docdir
+ o spurious-executable-perm in docdir
+
+-------------------------------------------------------------------
+Wed Jul 22 11:45:01 CEST 2009 - lars@linux-schulserver.de
+
+- update to 1.4b8:
+ + Added additional error messages during failed startup
+ + Better MySQL library detection (Ton Voon, Herbert Straub,
+ and Nagios Plugin Team)
+ + Compiler flag fix for building on GNU/kFreeBSD systems
+ (Hendrik Frenzel)
+ + Added lock_file option
+ + Fix debug file permission race (Lars Michelsen)
+ + More error reporting if debug file can not be opened
+ + Fix wait for childs on SIGCHLD
+ + Added long_output support
+ + Fix missing SIGTERM forwarding to childs
+ + Fix fmt specifier in ndo2db_daemonize()
+ + Escape custom values in 'customvariablestatus'
+ and 'customvariables'
+ + Fix ndomod doesn't execute rotate_command propperly
+ + Fix several compiler warnings
+ + Rewrite ndo2db init script, install it with 'make install-init'
+
+-------------------------------------------------------------------
+Sun May 24 17:11:24 CEST 2009 - chris@computersalat.de
+
+- some spec mods
+ o added cmdusr, cmdgrp
+ o changed perm, ownership for "centreon" of:
+ 660,nsusr,cmdgrp ndo2db.cfg
+ 664,nsusr,cmdgrp ndomod.cfg
+
+-------------------------------------------------------------------
+Mon May 18 13:08:39 CEST 2009 - chris@computersalat.de
+
+- fixed init script
+ o su - [user] -c'...' obsolete
+- beautify spec
+
+-------------------------------------------------------------------
+Fri Apr 24 16:00:16 CEST 2009 - lars@linux-schulserver.de
+
+- add %postun and %preun scripts
+- split up doc package
+
+-------------------------------------------------------------------
+Sat Jul 26 10:13:20 CEST 2008 - lars@linux-schulserver.de
+
+- just require mysql-shared, so the database can be on a different
+ host (thanks to Ciro Iriarte)
+
+-------------------------------------------------------------------
+Sun Jul 20 13:29:46 CET 2008 - lars@linux-schulserver.de
+
+- added init patch from Ciro Iriarte
+
+-------------------------------------------------------------------
+Sat Jan 12 13:29:46 CET 2008 - lars@linux-schulserver.de
+
+- added some tips from Tom Throckmorton in README.SuSE
+
+-------------------------------------------------------------------
+Tue Nov 27 14:57:25 CET 2007 - lars@linux-schulserver.de
+
+- use new libexecdir
+
+-------------------------------------------------------------------
+Mon Nov 19 15:50:45 CET 2007 - lars@linux-schulserver.de
+
+- initial version 1.4b7
+
calling whatdependson for head-i586
New:
----
ndoutils-1.4b9-libpq-fe-include.patch
ndoutils-1.4b9.tar.bz2
ndoutils-README.SuSE
ndoutils-init
ndoutils.changes
ndoutils.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ndoutils.spec ++++++
#
# spec file for package ndoutils (Version 1.4b9)
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define libexecdir %_prefix/lib/nagios/plugins
%define nsusr nagios
%define nsgrp nagios
%define cmdusr wwwrun
%define cmdgrp nagcmd
#Distribution: %dist
#Packager: %packager
#Vendor: %vendor
Name: ndoutils
Summary: Nagios v3.x Data Output Utilities
Version: 1.4b9
Release: 1
License: GPLv2+
Group: System/Monitoring
AutoReqProv: on
Url: http://www.nagios.org/
Source0: %name-%version.tar.bz2
Source1: %name-init
Source2: ndoutils-README.SuSE
Patch: ndoutils-1.4b9-libpq-fe-include.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq
%if 0%{?suse_version} > 1020
BuildRequires: libmysqlclient-devel
%else
BuildRequires: mysql-devel
%endif
BuildRequires: nagios-devel >= 3.0
# postgresql is currently not supported but will likely be added in the future
BuildRequires: postgresql-devel
BuildRequires: tcpd
%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8
BuildRequires: fdupes
%endif
Requires: nagios >= 3.0
%if 0%{?suse_version} < 1120
Requires: mysql-shared
%endif
%description
NDOUtils is an Nagios addon allowing you to store Nagios data (current status
information, state history, notification history, etc.) in a MySQL database.
This addon consists of an event broker module and a daemon.
Consider this addon to be experimental for the moment, although it will likely
play a central role in the a new Nagios web interface in the future.
%package doc
License: GPLv2+
Summary: Main documentation for ndoutils
Group: Documentation/Other
%if 0%{?suse_version} >= 1010
Recommends: %name = %version
%else
Requires: %name = %version
%endif
%description doc
This package includes the main documentation for ndoutils.
%prep
%setup -q
%patch
install -m644 %{S:2} README.SuSE
%build
%configure \
--enable-mysql \
--with-mysql-lib=%_libdir/mysql \
--with-mysql-inc=%_includedir/mysql \
--localstatedir=%_localstatedir/lib/ndo \
--enable-pgsql \
--with-pgsql-lib=%_libdir \
--with-pgsql-inc=%_includedir/pgsql \
--with-ndo2db-user=%nsusr \
--with-ndo2db-group=%nsgrp
%__make %{?jobs:-j%jobs}
%install
install -d %buildroot%_sysconfdir/init.d
install -d %buildroot%_sysconfdir/nagios
install -d %buildroot%_sbindir
install -d %buildroot%_bindir
install -d %buildroot%_prefix/lib/nagios/brokers
install -d %buildroot%_localstatedir/lib/ndo
install -d %_builddir/%name-%version/examples
install -m0755 src/ndo2db-3x %buildroot%_sbindir/ndo2db
install -m0755 src/file2sock %buildroot%_bindir/file2sock
install -m0755 src/log2ndo %buildroot%_bindir/log2ndo
install -m0755 src/sockdebug %buildroot%_bindir/sockdebug
install -m0755 src/ndomod-3x.o %buildroot%_prefix/lib/nagios/brokers/ndomod.o
install -m0755 %{S:1} %buildroot%_sysconfdir/init.d/ndo2db
ln -s %_sysconfdir/init.d/ndo2db %buildroot%_sbindir/rcndo2db
#
# fix path names in config
#
# install -m0644 config/ndo2db.cfg %buildroot%_sysconfdir/nagios/ndo2db.cfg
sed -e "s@^socket_name=.*@socket_name=/var/spool/nagios/ndo.sock@g" \
-e "s@^debug_file=.*@debug_file=/var/log/nagios/ndo2db.debug@g" config/ndo2db.cfg-sample > %buildroot%_sysconfdir/nagios/ndo2db.cfg
# install -m0644 config/ndomod.cfg %buildroot%_sysconfdir/nagios/ndomod.cfg
sed -e "s@^output=.*@output=/var/spool/nagios/ndo.sock@g" \
-e "s@^buffer_file=.*@buffer_file=/var/spool/nagios/ndomod.tmp@g" config/ndomod.cfg-sample > %buildroot%_sysconfdir/nagios/ndomod.cfg
cat > %_builddir/%name-%version/config/nagios.cfg << EOF
# SAMPLE NAGIOS CONFIG SNIPPET FOR NDOMOD
#
# In order to have Nagios run the NDOMOD event broker module, you'll need
# to place a statement like the one found below in your main Nagios
# configuration file (nagios.cfg).
# Uncomment the line below if you're running Nagios 3.x
#broker_module=%{_prefix}/lib/nagios/brokers/ndomod.o config_file=%{_sysconfdir}/nagios/ndo2db.cfg
EOF
cat > %_builddir/%name-%version/config/misccommands.cfg << EOF
# SAMPLE NDO FILE ROTATION COMMAND
#
# This is an example Nagios command definition that can be used to
# rotate the NDO output file on a regular basis. Adjust the paths, etc.
# to suit your needs. This definition will need to be included in your
# Nagios config files if you want to use it.
define command{
command_name rotate_ndo_log
command_line /bin/mv /var/spool/nagios/ndo.dat /var/spool/nagios/ndo.\`date +%s\`
}
EOF
# install docu
mkdir -p %buildroot/%_defaultdocdir/%name/
cp -r db docs Changelog README* REQUIREMENTS TODO UPGRADING config/misccommands.cfg config/nagios.cfg %buildroot/%_defaultdocdir/%name/
# some rpmlint stuff
## files-duplicate
%if 0%{?suse_version} > 1030
%fdupes -s $RPM_BUILD_ROOT
%endif
%if 0%{?fedora_version} > 8
fdupes -q -n -r $RPM_BUILD_ROOT
%endif
%preun
%stop_on_removal ndo2db
%postun
%insserv_cleanup ndo2db
%clean
%{__rm} -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
%exclude %_defaultdocdir/%name/docs
%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %{_sysconfdir}/nagios/ndomod.cfg
%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %{_sysconfdir}/nagios/ndo2db.cfg
%attr(0755,%{nsusr},%{nsgrp}) %dir %{_localstatedir}/lib/ndo
%_sysconfdir/init.d/ndo2db
%_bindir/file2sock
%_bindir/log2ndo
%_bindir/sockdebug
%_sbindir/ndo2db
%_sbindir/rcndo2db
%_prefix/lib/nagios/brokers/ndomod.o
# change defattr
%defattr(0644,root,root,0755)
%doc %_defaultdocdir/%name
%files doc
%defattr(0644,root,root,0755)
%doc %_defaultdocdir/%name/docs
%changelog
++++++ ndoutils-1.4b9-libpq-fe-include.patch ++++++
--- include/config.h.in.orig 2009-09-15 12:04:35.000000000 +0000
+++ include/config.h.in 2009-12-20 18:51:44.311189984 +0000
@@ -265,7 +265,7 @@
#undef HAVE_PGSQL
#ifdef USE_PGSQL
#define HAVE_PGSQL 1
-#include
participants (1)
-
root@Hilbert.suse.de