commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2014-03-10 12:38:46
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils"
Changes:
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes2013-08-13
10:47:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2014-03-10
12:38:48.0 +0100
@@ -1,0 +2,19 @@
+Sun Mar 2 17:12:29 UTC 2014 - l...@linux-schulserver.de
+
+- update to 2.0.0:
+ + Updated database schema upgrade script to support multiple
+updates (Eric Stanley, Scott Wilkerson)
+ + Added data serialization functions (Eric Stanley)
+ + Added new Nagios Core 4 attributes: importance values,
+service parents (Eric Stanley)
+ + Resolved tracker items #374 and #118 by adding auto-trimming
+options (Mike Guthrie)
+ + Replaced ndomod.cfg data_processing_options variable with
+single options (Mike Guthrie)
+ + Updated to work with Nagios Core 4 (Eric Stanley)
+ + Replaced ndomod.cfg data_processing_options variable with single
+options for easier customization (See README) (Mike Guthrie)
+ + Added missing maintenance options for table trimming (Mike Guthrie)
+- refreshed patches
+
+---
Old:
ndoutils-1.4b9-libpq-fe-include.patch
ndoutils-1.5-return-non-void-queue.patch
ndoutils-1.5.2.tar.gz
ndoutils-README.SuSE
New:
ndoutils-2.0.0-libpq-fe-include.patch
ndoutils-2.0.0-return-non-void-queue.patch
ndoutils-2.0.0.tar.bz2
ndoutils-README.SUSE
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.ncYj0L/_old 2014-03-10 12:38:49.0 +0100
+++ /var/tmp/diff_new_pack.ncYj0L/_new 2014-03-10 12:38:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ndoutils
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -20,17 +20,17 @@
Summary:Nagios v3.x Data Output Utilities
License:GPL-2.0+
Group: System/Monitoring
-Version:1.5.2
+Version:2.0.0
Release:0
Url:http://www.nagios.org/
-Source0:%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.bz2
Source1:%{name}-init
-Source2:ndoutils-README.SuSE
+Source2:ndoutils-README.SUSE
Source3:ndoutils-rpmlintrc
# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch0: ndoutils-1.4b9-libpq-fe-include.patch
-Patch1: ndoutils-1.5-return-non-void-queue.patch
+Patch0: ndoutils-2.0.0-libpq-fe-include.patch
+Patch1: ndoutils-2.0.0-return-non-void-queue.patch
Requires(pre): %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: nagios-rpm-macros
@@ -76,9 +76,9 @@
%prep
%setup -q
-%patch0
+%patch0 -p1
%patch1
-install -m644 %{SOURCE2} README.SuSE
+install -m644 %{SOURCE2} README.SUSE
## rpmlint
# wrong-file-end-of-line-encoding
pushd docs/docbook/en-en
++ ndoutils-1.4b9-libpq-fe-include.patch ->
ndoutils-2.0.0-libpq-fe-include.patch ++
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils-1.4b9-libpq-fe-include.patch
2011-09-23 02:14:20.0 +0200
+++
/work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils-2.0.0-libpq-fe-include.patch
2014-03-10 12:38:48.0 +0100
@@ -1,6 +1,8 @@
include/config.h.in.orig 2009-09-15 12:04:35.0 +
-+++ include/config.h.in2009-12-20 18:51:44.311189984 +
-@@ -265,7 +265,7 @@
+Index: ndoutils-2.0.0/include/config.h.in
+===
+--- ndoutils-2.0.0.orig/include/config.h.in
ndoutils-2.0.0/include/config.h.in
+@@ -265,7 +265,7 @@ typedef int int32_t;
#undef HAVE_PGSQL
#ifdef USE_PGSQL
#define HAVE_PGSQL 1
++ ndoutils-1.5-return-non-void-queue.patch ->
ndoutils-2.0.0-return-non-void-queue.patch ++
---
/work/SRC/openSUSE:Factory/ndoutils/ndoutils-1.5-return-non-void-queue.patch
2013-08-13 10:47:30.0 +0200
+++
/work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils-2.0.0-return-non-void-queue.patch
2014-03-10 12:38:48.0 +0100
@@ -1,6 +1,8 @@
src/queue.c.orig 2012-06-07 06:21:50.0 -0400
-+++ src/queue.c2013-03-09 14:15:32.455341470 -0500
-@@ -32,7 +32,7 @@
+Index: src/queue.c
+===
+-
commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2013-08-13 10:47:29
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils"
Changes:
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes2012-11-02
17:37:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2013-08-13
10:47:30.0 +0200
@@ -1,0 +2,9 @@
+Mon Aug 12 17:01:02 UTC 2013 - l...@linux-schulserver.de
+
+- Update to 1.5.2:
+ + Added Linux kernel tuning instructions (Eric Stanley)
+ + Added code to limit retries when system resources are too low
+(Eric Stanley)
+ + Added code to retry sending messages queue is full (Mike Guthrie)
+
+---
Old:
ndoutils-1.5.1.tar.gz
New:
ndoutils-1.5.2.tar.gz
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.e960Fl/_old 2013-08-13 10:47:31.0 +0200
+++ /var/tmp/diff_new_pack.e960Fl/_new 2013-08-13 10:47:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ndoutils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -20,7 +20,7 @@
Summary:Nagios v3.x Data Output Utilities
License:GPL-2.0+
Group: System/Monitoring
-Version:1.5.1
+Version:1.5.2
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.gz
++ ndoutils-1.5-return-non-void-queue.patch ++
--- /var/tmp/diff_new_pack.e960Fl/_old 2013-08-13 10:47:31.0 +0200
+++ /var/tmp/diff_new_pack.e960Fl/_new 2013-08-13 10:47:31.0 +0200
@@ -1,16 +1,16 @@
src/queue.c2012-02-03 17:59:20.0 +0100
-+++ src/queue.c.new2012-02-06 12:23:09.804407264 +0100
-@@ -26,7 +26,7 @@
- }
- }
-
--int get_queue_id(int id) {
-+void get_queue_id(int id) {
- key_t key = ftok(NDO_QUEUE_PATH, NDO_QUEUE_ID+id);
-
- if ((queue_id = msgget(key, IPC_CREAT | 0600)) < 0) {
include/queue.h2012-02-06 12:36:10.982449749 +0100
-+++ include/queue.h.new2012-02-06 12:36:22.964450504 +0100
+--- src/queue.c.orig 2012-06-07 06:21:50.0 -0400
src/queue.c2013-03-09 14:15:32.455341470 -0500
+@@ -32,7 +32,7 @@
+ }
+ }
+
+-int get_queue_id(int id) {
++void get_queue_id(int id) {
+ key_t key = ftok(NDO_QUEUE_PATH, NDO_QUEUE_ID+id);
+
+ if ((queue_id = msgget(key, IPC_CREAT | 0600)) < 0) {
+--- include/queue.h.orig 2012-02-03 11:53:16.0 -0500
include/queue.h2013-03-09 14:15:45.971602027 -0500
@@ -16,7 +16,7 @@
void del_queue();
++ ndoutils-1.5.1.tar.gz -> ndoutils-1.5.2.tar.gz ++
7199 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/ndoutils-1.5.1/Changelog new/ndoutils-1.5.2/Changelog
--- old/ndoutils-1.5.1/Changelog2012-05-17 12:46:46.0 +0200
+++ new/ndoutils-1.5.2/Changelog2012-06-08 14:46:50.0 +0200
@@ -3,6 +3,12 @@
===
+1.5.2 - 06/08/2012
+--
+* Added Linux kernel tuning instructions (Eric Stanley)
+* Added code to limit retries when system resources are too low (Eric Stanley)
+* Added code to retry sending messages queue is full (Mike Guthrie)
+
1.5.1 - 05/15/2012
--
* Fixed off-by-one error packing data in ndomod.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/ndoutils-1.5.1/README new/ndoutils-1.5.2/README
--- old/ndoutils-1.5.1/README 2007-04-23 17:49:24.0 +0200
+++ new/ndoutils-1.5.2/README 2012-06-07 12:21:50.0 +0200
@@ -182,3 +182,70 @@
/usr/local/nagios/bin/ndo2db -c /usr/local/nagios/etc/ndo2db.cfg
+
+
+
+TUNING KERNEL PARAMETERS
+
+
+NDOUTILS uses a single message queue to communicate between the broker
+module and the NDO2DB dae
commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2012-11-02 17:37:52
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes2012-06-01
07:21:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2012-11-02
17:37:54.0 +0100
@@ -1,0 +2,6 @@
+Wed Oct 31 13:29:16 UTC 2012 - mvysko...@suse.com
+
+- fix permissions of documentation to prevent false duplicates issued by
+ rpmlint as fdupes is now permissions sensitive (bnc#784670)
+
+---
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.l18Q40/_old 2012-11-02 17:37:55.0 +0100
+++ /var/tmp/diff_new_pack.l18Q40/_new 2012-11-02 17:37:55.0 +0100
@@ -85,6 +85,9 @@
%{__perl} -p -i -e 's|\r\n|\n|' Makefile.in ent/documents.ent ent/version.ent
popd
+# fix permissions of documentation to prevent false duplicates issued by
rpmlint (bnc#784670)
+find docs -type f -exec chmod 0644 {} +
+
%build
%configure \
--enable-mysql \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2012-06-01 07:21:52
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes2012-02-14
19:04:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2012-06-01
07:21:59.0 +0200
@@ -1,0 +2,6 @@
+Tue May 22 13:43:57 UTC 2012 - l...@linux-schulserver.de
+
+- update to 1.5.1:
+ + Fixed off-by-one error packing data in ndomod
+
+---
Old:
ndoutils-1-5.tar.bz2
New:
ndoutils-1.5.1.tar.gz
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.V5AYLC/_old 2012-06-01 07:22:02.0 +0200
+++ /var/tmp/diff_new_pack.V5AYLC/_new 2012-06-01 07:22:02.0 +0200
@@ -16,17 +16,14 @@
#
-%define strange_version 1-5
-
Name: ndoutils
Summary:Nagios v3.x Data Output Utilities
-Version:1.5
-Release:2
License:GPL-2.0+
Group: System/Monitoring
+Version:1.5.1
+Release:0
Url:http://www.nagios.org/
-#Source0:%{name}-%{version}.tar.bz2
-Source0:%{name}-%{strange_version}.tar.bz2
+Source0:%{name}-%{version}.tar.gz
Source1:%{name}-init
Source2:ndoutils-README.SuSE
@@ -65,7 +62,6 @@
%package doc
-License:GPL-2.0+
Summary:Main documentation for ndoutils
Group: Documentation/Other
%if 0%{?suse_version} >= 1010
@@ -79,7 +75,7 @@
%prep
-%setup -q -n %{name}-%{strange_version}
+%setup -q
%patch0
%patch1
install -m644 %{SOURCE2} README.SuSE
@@ -111,7 +107,7 @@
install -d %{buildroot}%{_prefix}/lib/nagios/brokers
install -d %{buildroot}%{_localstatedir}/lib/ndo
-install -d %{_builddir}/%{name}-%{strange_version}/examples
+install -d %{_builddir}/%{name}-%{version}/examples
install -m0755 src/ndo2db-3x %{buildroot}%{_sbindir}/ndo2db
install -m0755 src/file2sock %{buildroot}%{_bindir}/file2sock
@@ -130,7 +126,7 @@
sed -e "s@^output=.*@output=%{nagios_spooldir}/ndo.sock@g" \
-e "s@^buffer_file=.*@buffer_file=%{nagios_spooldir}/ndomod.tmp@g"
config/ndomod.cfg-sample > %{buildroot}%{nagios_sysconfdir}/ndomod.cfg
-cat > %{_builddir}/%{name}-%{strange_version}/config/nagios.cfg << EOF
+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
@@ -141,7 +137,7 @@
#broker_module=%{_prefix}/lib/nagios/brokers/ndomod.o
config_file=%{nagios_sysconfdir}/ndo2db.cfg
EOF
-cat > %{_builddir}/%{name}-%{strange_version}/config/misccommands.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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2011-12-06 18:31:27
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils", Maintainer is ""
Changes:
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.Eyqo3s/_old 2011-12-06 18:52:56.0 +0100
+++ /var/tmp/diff_new_pack.Eyqo3s/_new 2011-12-06 18:52:56.0 +0100
@@ -21,7 +21,7 @@
Summary:Nagios v3.x Data Output Utilities
Version:1.4b9
Release:2
-License:GPLv2+
+License:GPL-2.0+
Group: System/Monitoring
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
@@ -61,7 +61,7 @@
%package doc
-License:GPLv2+
+License:GPL-2.0+
Summary:Main documentation for ndoutils
Group: Documentation/Other
%if 0%{?suse_version} >= 1010
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ndoutils for openSUSE:Factory
Hello community,
here is the log from the commit of package ndoutils for openSUSE:Factory
checked in at 2011-11-08 09:31:35
Comparing /work/SRC/openSUSE:Factory/ndoutils (Old)
and /work/SRC/openSUSE:Factory/.ndoutils.new (New)
Package is "ndoutils", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes2011-09-23
02:14:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2011-11-08
09:31:37.0 +0100
@@ -1,0 +2,15 @@
+Sun Nov 6 15:16:35 UTC 2011 - l...@linux-schulserver.de
+
+- use macros defined in nagios-rpm-macros package
+- added rpmlintrc for init file name
+
+---
+Sat Nov 5 10:24:23 UTC 2011 - ch...@computersalat.de
+
+- spec-cleaner
+- fix build: directories not owned by a package:
+ - /usr/lib/nagios/brokers
+- rpmlint: wrong-file-end-of-line-encoding
+ docs/docbook/en-en: Makefile.in ent/documents.ent ent/version.ent
+
+---
New:
ndoutils-rpmlintrc
Other differences:
--
++ ndoutils.spec ++
--- /var/tmp/diff_new_pack.KhN53w/_old 2011-11-08 09:31:38.0 +0100
+++ /var/tmp/diff_new_pack.KhN53w/_new 2011-11-08 09:31:38.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package ndoutils (Version 1.4b9)
+# spec file for package ndoutils
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,17 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-%definelibexecdir %_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
@@ -33,14 +23,16 @@
Release:2
License:GPLv2+
Group: System/Monitoring
-AutoReqProv:on
Url:http://www.nagios.org/
-Source0:%name-%version.tar.bz2
-Source1:%name-init
+Source0:%{name}-%{version}.tar.bz2
+Source1:%{name}-init
Source2:ndoutils-README.SuSE
-Patch: ndoutils-1.4b9-libpq-fe-include.patch
+Source3:ndoutils-rpmlintrc
+# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch0: ndoutils-1.4b9-libpq-fe-include.patch
+Requires(pre): %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %insserv_prereq
+BuildRequires: nagios-rpm-macros
%if 0%{?suse_version} > 1020
BuildRequires: libmysqlclient-devel
%else
@@ -67,14 +59,15 @@
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
+Recommends: %{name} = %{version}
%else
-Requires: %name = %version
+Requires: %{name} = %{version}
%endif
%description doc
@@ -83,53 +76,56 @@
%prep
%setup -q
-%patch
-install -m644 %{S:2} README.SuSE
+%patch0
+install -m644 %{SOURCE2} README.SuSE
+## rpmlint
+# wrong-file-end-of-line-encoding
+pushd docs/docbook/en-en
+%{__perl} -p -i -e 's|\r\n|\n|' Makefile.in ent/documents.ent ent/version.ent
+popd
%build
%configure \
--enable-mysql \
---with-mysql-lib=%_libdir/mysql \
---with-mysql-inc=%_includedir/mysql \
---localstatedir=%_localstatedir/lib/ndo \
+--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
+--with-pgsql-lib=%{_libdir} \
+--with-pgsql-inc=%{_includedir}/pgsql \
+--with-ndo2db-user=%{nagios_user} \
+--with-ndo2db-group=%{nagios_group}
# do not use jobs here, makefile dependencies are unsafe
-%__make
+make
%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
