OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Dec-2007 10:05:00
Branch: HEAD Handle: 2007121409045600
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.10 20071213 -> 20071214
Summary:
Revision Changes Path
1.16 +18 -18 openpkg-src/nagios/nagios.patch
1.99 +2 -2 openpkg-src/nagios/nagios.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 nagios.patch
--- openpkg-src/nagios/nagios.patch 29 Sep 2007 10:24:37 -0000 1.15
+++ openpkg-src/nagios/nagios.patch 14 Dec 2007 09:04:56 -0000 1.16
@@ -1,6 +1,6 @@
Index: base/checks.c
---- base/checks.c.orig 2007-04-10 16:50:22 +0200
-+++ base/checks.c 2007-04-11 08:41:13 +0200
+--- base/checks.c.orig 2007-10-21 01:18:28 +0200
++++ base/checks.c 2007-12-14 09:59:28 +0100
@@ -486,7 +486,8 @@
_exit(STATE_UNKNOWN);
@@ -22,7 +22,7 @@
svc_msg.finish_time=end_time;
Index: base/logging.c
--- base/logging.c.orig 2005-12-13 01:42:45 +0100
-+++ base/logging.c 2007-04-11 08:41:13 +0200
++++ base/logging.c 2007-12-14 09:59:28 +0100
@@ -208,6 +208,7 @@
/* write something to the syslog facility */
@@ -45,8 +45,8 @@
syslog(LOG_USER|LOG_INFO,"%s",buffer);
Index: base/utils.c
---- base/utils.c.orig 2007-04-10 16:50:22 +0200
-+++ base/utils.c 2007-04-11 08:43:42 +0200
+--- base/utils.c.orig 2007-04-30 23:22:32 +0200
++++ base/utils.c 2007-12-14 09:59:28 +0100
@@ -2811,7 +2811,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
@@ -89,10 +89,10 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.10/configure
---- nagios-plugins-1.4.10/configure.orig 2007-03-29 12:55:12 +0200
-+++ nagios-plugins-1.4.10/configure 2007-04-11 08:41:13 +0200
-@@ -21070,8 +21070,8 @@
+Index: nagios-plugins-1.4.11/configure
+--- nagios-plugins-1.4.11/configure.orig 2007-12-13 23:42:38 +0100
++++ nagios-plugins-1.4.11/configure 2007-12-14 10:00:14 +0100
+@@ -21902,8 +21902,8 @@
fi
if test "$ac_cv_lib_ldap_main" = "yes"; then
@@ -103,16 +103,16 @@
-@@ -24310,17 +24310,10 @@
+@@ -25319,17 +25319,10 @@
- echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5
- echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5
+ echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6; }
-ac_cv_ping_packets_first=no
-ac_cv_ping_has_timeout=no
if test -n "$with_ping_command"
then
- echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5
- echo "${ECHO_T}(command-line) $with_ping_command" >&6
+ { echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5
+ echo "${ECHO_T}(command-line) $with_ping_command" >&6; }
- if test -n "$ac_cv_ping_packets_first"
- then
- ac_cv_ping_packets_first=yes
@@ -121,10 +121,10 @@
elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
-Index: nagios-plugins-1.4.10/plugins/common.h
---- nagios-plugins-1.4.10/plugins/common.h.orig 2007-03-22 18:54:16
+0100
-+++ nagios-plugins-1.4.10/plugins/common.h 2007-04-11 08:41:13 +0200
-@@ -176,7 +176,7 @@
+Index: nagios-plugins-1.4.11/plugins/common.h
+--- nagios-plugins-1.4.11/plugins/common.h.orig 2007-04-26 00:10:13
+0200
++++ nagios-plugins-1.4.11/plugins/common.h 2007-12-14 09:59:28 +0100
+@@ -188,7 +188,7 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
#if defined(__sun) || defined(__sun__)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.98 -r1.99 nagios.spec
--- openpkg-src/nagios/nagios.spec 13 Dec 2007 16:29:39 -0000 1.98
+++ openpkg-src/nagios/nagios.spec 14 Dec 2007 09:04:56 -0000 1.99
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.10
-%define V_nagios_plugins 1.4.10
+%define V_nagios_plugins 1.4.11
%define V_perl_nagios_plugin 0.22
%define V_perl_nagios_object 0.20
%define V_perl_nagios_cmd 0.05
@@ -40,7 +40,7 @@
Group: Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20071213
+Release: 20071214
# package options
%option with_perl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
