[packages/nagios-ndoutils] Up to 2.1.5

[arekm]

commit bd9fc574bac39d3eef212a30c545250227fb1177
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 8 23:31:44 2026 +0200

    Up to 2.1.5

 config.patch          | 23 +++++++----------------
 format-security.patch | 28 ----------------------------
 nagios-ndoutils.spec  | 16 +++++++---------
 3 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/nagios-ndoutils.spec b/nagios-ndoutils.spec
index 6669346..3c7627a 100644
--- a/nagios-ndoutils.spec
+++ b/nagios-ndoutils.spec
@@ -12,15 +12,14 @@
 Summary:	NDOUTILS (Nagios Data Output Utils) addon
 Summary(pl.UTF-8):	Dodatek NDOUTILS (Nagios Data Output Utils)
 Name:		nagios-%{addon}
-Version:	2.0.0
-Release:	3
+Version:	2.1.5
+Release:	1
 License:	GPL v2
 Group:		Networking
-Source0:	http://downloads.sourceforge.net/nagios/%{addon}-%{version}.tar.gz
-# Source0-md5:	93561584f0fa7582a795e795306a3b35
+Source0:	http://downloads.sourceforge.net/project/nagios/%{addon}-2.x/%{addon}-%{version}/%{addon}-%{version}.tar.gz
+# Source0-md5:	ba59812f8757dc3dcdd8dd353637d79b
 Source1:	ndo2db.init
 Patch0:		config.patch
-Patch1:		format-security.patch
 URL:		http://sourceforge.net/projects/nagios/
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ssl:BuildRequires:	openssl-devel}
@@ -48,7 +47,6 @@ późniejszego odczytu i przetwarzania.
 %prep
 %setup -q -n %{addon}-%{version}
 %patch -P0 -p1
-%patch -P1 -p1
 
 # some typo ;)
 grep -r 20052-2009 -l . | xargs sed -i -e 's,20052-2009,2005-2009,'
@@ -63,13 +61,13 @@ grep -r 20052-2009 -l . | xargs sed -i -e 's,20052-2009,2005-2009,'
 	%{?with_ssl:--enable-ssl} \
 	--enable-nanosleep \
 	%{nil}
-%{__make}
+%{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_sysconfdir},%{_sbindir},%{_datadir}/%{addon}}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_sysconfdir},%{_sbindir},%{_datadir}/%{addon},/etc/rc.d/init.d}
 
-%{__make} fullinstall \
+%{__make} install install-config \
 	INSTALL_OPTS="" \
 	INIT_OPTS="" \
 	DESTDIR=$RPM_BUILD_ROOT
diff --git a/config.patch b/config.patch
index ba7d7f5..161069e 100644
--- a/config.patch
+++ b/config.patch
@@ -1,20 +1,11 @@
---- ndoutils-1.4b9/config/ndo2db.cfg-sample.in	2009-09-15 15:08:32.000000000 +0300
-+++ ndoutils-1.4b9/config/ndo2db.cfg-sample.in	2012-01-15 00:53:16.756690000 +0200
-@@ -10,7 +10,7 @@
- # This is the lockfile that NDO2DB will use to store its PID number
- # in when it is running in daemon mode.
- 
--lock_file=@localstatedir@/ndo2db.lock
-+lock_file=@localstatedir@/ndo2db.pid
- 
- 
- 
-@@ -177,7 +177,7 @@
+--- ndoutils-2.1.5/config/ndo2db.cfg-sample.in~	2019-09-23 00:00:00.000000000 +0200
++++ ndoutils-2.1.5/config/ndo2db.cfg-sample.in	2026-05-08 00:00:00.000000000 +0200
+@@ -203,7 +203,7 @@
  # DEBUG FILE
  # This option determines where the daemon should write debugging information.
- 
+
 -debug_file=@localstatedir@/ndo2db.debug
 +debug_file=/var/log/nagios/ndo2db.log
- 
- 
- 
+
+
+
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 57763de..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ndoutils-1.5.2/src/queue.c~	2012-06-07 12:21:50.000000000 +0200
-+++ ndoutils-1.5.2/src/queue.c	2013-12-04 18:41:24.460952441 +0100
-@@ -77,7 +77,7 @@
- 		if(msgctl(queue_id, IPC_STAT, &queue_stats)) {
- 			sprintf(curstats, "Unable to determine current message queue usage: error reading IPC_STAT: %d", errno);
- 			sprintf(logmsg, logfmt, curstats);
--			syslog(LOG_ERR, logmsg);
-+			syslog(LOG_ERR, "%s", logmsg);
- 			}
- 		else {
- #if defined( __linux__)
-@@ -86,14 +86,14 @@
- 			if( msgmni < 0) {
- 				sprintf(curstats, "Unable to determine current message queue usage: error reading IPC_INFO: %d", errno);
- 				sprintf(logmsg, logfmt, curstats);
--				syslog(LOG_ERR, logmsg);
-+				syslog(LOG_ERR, "%s", logmsg);
- 				}
- 			else {
- 				sprintf(curstats, statsfmt, queue_stats.msg_qnum, 
- 						(unsigned long)msgmni, queue_stats.__msg_cbytes, 
- 						queue_stats.msg_qbytes);
- 				sprintf(logmsg, logfmt, curstats);
--				syslog(LOG_ERR, logmsg);
-+				syslog(LOG_ERR, "%s", logmsg);
- 				}
- #else
- 			sprintf(logmsg, logfmt, "");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-ndoutils.git/commitdiff/bd9fc574bac39d3eef212a30c545250227fb1177