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: 11-Apr-2007 09:39:01
Branch: HEAD Handle: 2007041108390100
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
upgrading package: nagios 2.8 -> 2.9
Summary:
Revision Changes Path
1.12 +21 -21 openpkg-src/nagios/nagios.patch
1.82 +2 -2 openpkg-src/nagios/nagios.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 nagios.patch
--- openpkg-src/nagios/nagios.patch 29 Mar 2007 18:09:22 -0000 1.11
+++ openpkg-src/nagios/nagios.patch 11 Apr 2007 07:39:01 -0000 1.12
@@ -1,6 +1,6 @@
Index: base/checks.c
---- base/checks.c.orig 2006-06-21 02:59:19 +0200
-+++ base/checks.c 2006-10-20 20:44:43 +0200
+--- base/checks.c.orig 2007-04-10 16:50:22 +0200
++++ base/checks.c 2007-04-11 08:41:13 +0200
@@ -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 2006-10-20 20:44:43 +0200
++++ base/logging.c 2007-04-11 08:41:13 +0200
@@ -208,6 +208,7 @@
/* write something to the syslog facility */
@@ -45,9 +45,9 @@
syslog(LOG_USER|LOG_INFO,"%s",buffer);
Index: base/utils.c
---- base/utils.c.orig 2006-07-13 23:55:10 +0200
-+++ base/utils.c 2006-10-20 20:44:43 +0200
-@@ -2806,7 +2806,7 @@
+--- base/utils.c.orig 2007-04-10 16:50:22 +0200
++++ base/utils.c 2007-04-11 08:43:42 +0200
+@@ -2811,7 +2811,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
@@ -56,7 +56,7 @@
buffer[sizeof(buffer)-1]='\x0';
/* write the error back to the parent process */
-@@ -2817,7 +2817,8 @@
+@@ -2822,7 +2822,8 @@
else{
/* default return string in case nothing was returned */
@@ -66,16 +66,16 @@
/* read in the first line of output from the command */
fgets(buffer,sizeof(buffer)-1,fp);
-@@ -2833,7 +2834,7 @@
+@@ -2838,7 +2839,7 @@
if(status==-1)
result=STATE_CRITICAL;
- else
+ else {
- result=WEXITSTATUS(status);
-+ result=(WIFEXITED(status) ? WEXITSTATUS(status)
: -1);
-
- /* write the output back to the parent process */
- write(fd[1],buffer,strlen(buffer)+1);
-@@ -2870,11 +2871,11 @@
++ result=(WIFEXITED(status) ? WEXITSTATUS(status)
: -1);
+ if(result==0 && WIFSIGNALED(status)){
+ /* like bash */
+ result=128+WTERMSIG(status);
+@@ -2882,11 +2883,11 @@
#endif
/* get the exit code returned from the program */
@@ -90,9 +90,9 @@
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
Index: nagios-plugins-1.4.7/configure
---- nagios-plugins-1.4.7/configure.orig 2006-10-19 22:08:11 +0200
-+++ nagios-plugins-1.4.7/configure 2006-10-20 20:44:43 +0200
-@@ -25123,8 +25123,8 @@
+--- nagios-plugins-1.4.7/configure.orig 2007-03-29 12:55:12 +0200
++++ nagios-plugins-1.4.7/configure 2007-04-11 08:41:13 +0200
+@@ -21070,8 +21070,8 @@
fi
if test "$ac_cv_lib_ldap_main" = "yes"; then
@@ -103,7 +103,7 @@
-@@ -29931,17 +29931,10 @@
+@@ -24310,17 +24310,10 @@
echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5
echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6
@@ -122,9 +122,9 @@
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.7/plugins/common.h
---- nagios-plugins-1.4.7/plugins/common.h.orig 2006-07-29 03:43:34
+0200
-+++ nagios-plugins-1.4.7/plugins/common.h 2006-10-20 20:44:43 +0200
-@@ -213,7 +213,7 @@
+--- nagios-plugins-1.4.7/plugins/common.h.orig 2007-03-22 18:54:16
+0100
++++ nagios-plugins-1.4.7/plugins/common.h 2007-04-11 08:41:13 +0200
+@@ -176,7 +176,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.81 -r1.82 nagios.spec
--- openpkg-src/nagios/nagios.spec 29 Mar 2007 18:09:22 -0000 1.81
+++ openpkg-src/nagios/nagios.spec 11 Apr 2007 07:39:01 -0000 1.82
@@ -23,7 +23,7 @@
##
# package versions
-%define V_nagios 2.8
+%define V_nagios 2.9
%define V_nagios_plugins 1.4.7
%define V_perl_nagios_plugin 0.14
%define V_perl_nagios_object 0.17
@@ -40,7 +40,7 @@
Group: Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20070329
+Release: 20070411
# package options
%option with_perl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
