packages: nagios-plugins/nagios-plugins.spec, nagios-plugins/check_rbl.patc...

[glen]

Author: glen                         Date: Thu Sep 17 08:38:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 1.4.14

---- Files affected:
packages/nagios-plugins:
   nagios-plugins.spec (1.119 -> 1.120) , check_rbl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugins/nagios-plugins.spec
diff -u packages/nagios-plugins/nagios-plugins.spec:1.119 packages/nagios-plugins/nagios-plugins.spec:1.120
--- packages/nagios-plugins/nagios-plugins.spec:1.119	Thu Sep 17 09:08:45 2009
+++ packages/nagios-plugins/nagios-plugins.spec	Thu Sep 17 10:38:10 2009
@@ -9,12 +9,12 @@
 Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
-Version:	1.4.13
-Release:	19
+Version:	1.4.14
+Release:	1
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
-# Source0-md5:	be6cc7699fff3ee29d1fd4d562377386
+# Source0-md5:	a1835a48a777863ed2583de3c82446a9
 Source1:	%{name}-config-20090909.tar.bz2
 # Source1-md5:	997cf4b0b93bca478890a935c20151a9
 Source2:	nagios-utils.php
@@ -43,11 +43,13 @@
 Patch25:	%{name}-check_snmp_disk_monitor-bulk.patch
 Patch26:	%{name}-check_snmp_disk_monitor-opts.patch
 Patch27:	%{name}-ping.patch
+Patch28:	check_rbl.patch
 URL:		http://www.nagiosplugins.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	file
 BuildRequires:	gettext-devel >= 0.14.3
+BuildRequires:	libtap-devel
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
 BuildRequires:	net-snmp-devel
@@ -494,6 +496,7 @@
 %patch25 -p0
 %patch26 -p0
 %patch27 -p1
+%patch28 -p1
 
 # bring contribs into shape...
 cd contrib
@@ -546,6 +549,7 @@
 
 %configure \
 	--libexecdir=%{_pluginarchdir} \
+	--enable-libtap=/usr \
 	--with-cgiurl=/nagios/cgi-bin \
 	--with-mysql=/usr \
 	--with-pgsql=/usr \
@@ -924,6 +928,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2009/09/17 08:38:10  glen
+- update to 1.4.14
+
 Revision 1.119  2009/09/17 07:08:45  arekm
 - rel 19; understang ping6 output from iputils package
 

================================================================
Index: packages/nagios-plugins/check_rbl.patch
diff -u /dev/null packages/nagios-plugins/check_rbl.patch:1.1
--- /dev/null	Thu Sep 17 10:38:16 2009
+++ packages/nagios-plugins/check_rbl.patch	Thu Sep 17 10:38:10 2009
@@ -0,0 +1,13 @@
+--- nagios-plugins-1.4.14/contrib/check_rbl.c~	2009-09-17 11:33:40.000000000 +0300
++++ nagios-plugins-1.4.14/contrib/check_rbl.c	2009-09-17 11:33:41.629634485 +0300
+@@ -39,6 +39,10 @@
+ char *dns_server=NULL;
+ char *rbl_name=NULL;
+ int verbose=FALSE;
++#ifndef LOCAL_TIMEOUT_ALARM_HANDLER
++unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
++unsigned int socket_timeout_state = STATE_CRITICAL;
++#endif
+ 
+ int main(int argc, char **argv){
+ 	char input_buffer[MAX_INPUT_BUFFER];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins.spec?r1=1.119&r2=1.120&f=u