[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-Sep-2009 09:58:47
Branch: HEAD Handle: 2009091908584600
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-3.2.0 20090815 -> 20090919
Summary:
RevisionChanges Path
1.20+3 -3 openpkg-src/nagios/nagios.patch
1.125 +2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.19 -r1.20 nagios.patch
--- openpkg-src/nagios/nagios.patch 27 Mar 2009 11:17:28 - 1.19
+++ openpkg-src/nagios/nagios.patch 19 Sep 2009 07:58:46 - 1.20
@@ -34,9 +34,9 @@
buffer[sizeof(buffer)-1]='\x0';
/* write the error back to the parent process */
-Index: nagios-plugins-1.4.13/configure
nagios-plugins-1.4.13/configure.orig 2008-05-28 00:05:10 +0200
-+++ nagios-plugins-1.4.13/configure 2008-05-28 08:27:03 +0200
+Index: nagios-plugins-1.4.14/configure
+--- nagios-plugins-1.4.14/configure.orig 2008-05-28 00:05:10 +0200
nagios-plugins-1.4.14/configure 2008-05-28 08:27:03 +0200
@@ -22427,8 +22427,8 @@
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.124 -r1.125 nagios.spec
--- openpkg-src/nagios/nagios.spec15 Aug 2009 09:56:44 - 1.124
+++ openpkg-src/nagios/nagios.spec19 Sep 2009 07:58:46 - 1.125
@@ -23,7 +23,7 @@
# package versions
%define V_nagios 3.2.0
-%define V_nagios_plugins 1.4.13
+%define V_nagios_plugins 1.4.14
%define V_perl_nagios_plugin 0.33
%define V_perl_nagios_object 0.20
%define V_perl_nagios_cmd 0.05
@@ -39,7 +39,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20090815
+Release: 20090919
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 12:17:29
Branch: HEAD Handle: 2009032711172801
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
upgrading package: nagios 3.0.6 -> 3.1.0
Summary:
RevisionChanges Path
1.19+3 -3 openpkg-src/nagios/nagios.patch
1.119 +3 -3 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.18 -r1.19 nagios.patch
--- openpkg-src/nagios/nagios.patch 28 May 2008 06:32:19 - 1.18
+++ openpkg-src/nagios/nagios.patch 27 Mar 2009 11:17:28 - 1.19
@@ -34,9 +34,9 @@
buffer[sizeof(buffer)-1]='\x0';
/* write the error back to the parent process */
-Index: nagios-plugins-1.4.12/configure
nagios-plugins-1.4.12/configure.orig 2008-05-28 00:05:10 +0200
-+++ nagios-plugins-1.4.12/configure 2008-05-28 08:27:03 +0200
+Index: nagios-plugins-1.4.13/configure
+--- nagios-plugins-1.4.13/configure.orig 2008-05-28 00:05:10 +0200
nagios-plugins-1.4.13/configure 2008-05-28 08:27:03 +0200
@@ -22427,8 +22427,8 @@
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.118 -r1.119 nagios.spec
--- openpkg-src/nagios/nagios.spec3 Mar 2009 19:44:02 - 1.118
+++ openpkg-src/nagios/nagios.spec27 Mar 2009 11:17:29 - 1.119
@@ -22,8 +22,8 @@
##
# package versions
-%define V_nagios 3.0.6
-%define V_nagios_plugins 1.4.12
+%define V_nagios 3.1.0
+%define V_nagios_plugins 1.4.13
%define V_perl_nagios_plugin 0.32
%define V_perl_nagios_object 0.20
%define V_perl_nagios_cmd 0.05
@@ -39,7 +39,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20090303
+Release: 20090327
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 28-May-2008 08:32:21
Branch: HEAD Handle: 2008052807321901
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-3.0.2 20080521 -> 20080528
Summary:
RevisionChanges Path
1.18+7 -19 openpkg-src/nagios/nagios.patch
1.111 +2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.17 -r1.18 nagios.patch
--- openpkg-src/nagios/nagios.patch 13 Mar 2008 18:21:21 - 1.17
+++ openpkg-src/nagios/nagios.patch 28 May 2008 06:32:19 - 1.18
@@ -1,6 +1,6 @@
Index: base/logging.c
--- base/logging.c.orig 2007-10-29 00:21:29 +0100
-+++ base/logging.c 2008-03-13 18:28:21 +0100
base/logging.c 2008-05-28 08:27:03 +0200
@@ -204,6 +204,7 @@
/* write something to the syslog facility */
@@ -24,7 +24,7 @@
Index: base/utils.c
--- base/utils.c.orig2008-03-10 21:58:33 +0100
-+++ base/utils.c 2008-03-13 18:28:21 +0100
base/utils.c 2008-05-28 08:27:03 +0200
@@ -499,7 +499,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
@@ -34,10 +34,10 @@
buffer[sizeof(buffer)-1]='\x0';
/* write the error back to the parent process */
-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 2008-03-13 18:28:21 +0100
-@@ -21902,8 +21902,8 @@
+Index: nagios-plugins-1.4.12/configure
+--- nagios-plugins-1.4.12/configure.orig 2008-05-28 00:05:10 +0200
nagios-plugins-1.4.12/configure 2008-05-28 08:27:03 +0200
+@@ -22427,8 +22427,8 @@
fi
if test "$ac_cv_lib_ldap_main" = "yes"; then
@@ -48,7 +48,7 @@
-@@ -25319,17 +25319,10 @@
+@@ -26074,17 +26074,10 @@
{ echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5
echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6; }
@@ -66,15 +66,3 @@
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.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 2008-03-13 18:28:21 +0100
-@@ -188,7 +188,7 @@
-
- /* Solaris does not have floorf, but floor works. Should probably be in
configure */
- #if defined(__sun) || defined(__sun__)
--static inline float floorf (float x) { return floor(x); }
-+#define floorf(x) (float)floor((double)(x))
- #endif
-
- enum {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.110 -r1.111 nagios.spec
--- openpkg-src/nagios/nagios.spec21 May 2008 18:43:54 - 1.110
+++ openpkg-src/nagios/nagios.spec28 May 2008 06:32:20 - 1.111
@@ -23,7 +23,7 @@
# package versions
%define V_nagios 3.0.2
-%define V_nagios_plugins 1.4.11
+%define V_nagios_plugins 1.4.12
%define V_perl_nagios_plugin 0.27
%define V_perl_nagios_object 0.20
%define V_perl_nagios_cmd 0.05
@@ -39,7 +39,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20080521
+Release: 20080528
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec nagios.txt
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: 13-Mar-2008 19:21:22
Branch: HEAD Handle: 2008031318212100
Modified files:
openpkg-src/nagios nagios.patch nagios.spec nagios.txt
Log:
upgrading package: nagios 2.11 -> 3.0
Summary:
RevisionChanges Path
1.17+11 -66 openpkg-src/nagios/nagios.patch
1.104 +5 -4 openpkg-src/nagios/nagios.spec
1.2 +2 -4 openpkg-src/nagios/nagios.txt
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.16 -r1.17 nagios.patch
--- openpkg-src/nagios/nagios.patch 14 Dec 2007 09:04:56 - 1.16
+++ openpkg-src/nagios/nagios.patch 13 Mar 2008 18:21:21 - 1.17
@@ -1,37 +1,15 @@
-Index: base/checks.c
base/checks.c.orig 2007-10-21 01:18:28 +0200
-+++ base/checks.c2007-12-14 09:59:28 +0100
-@@ -486,7 +486,8 @@
- _exit(STATE_UNKNOWN);
-
- /* default return string in case nothing was returned */
--strcpy(plugin_output,"(No output!)");
-+snprintf(plugin_output,sizeof(plugin_output)-1,"(No
output from command \"%s\")", processed_command);
-+plugin_output[sizeof(plugin_output)-1]='\x0';
-
- /* grab the plugin output and clean it */
- fgets(plugin_output,sizeof(plugin_output)-1,fp);
-@@ -508,7 +509,7 @@
- /* record check result info */
-
strncpy(svc_msg.output,plugin_output,sizeof(svc_msg.output)-1);
- svc_msg.output[sizeof(svc_msg.output)-1]='\x0';
--svc_msg.return_code=WEXITSTATUS(pclose_result);
-+svc_msg.return_code=(WIFEXITED(pclose_result) ?
WEXITSTATUS(pclose_result) : -1);
- svc_msg.exited_ok=TRUE;
- svc_msg.check_type=SERVICE_CHECK_ACTIVE;
- 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-12-14 09:59:28 +0100
-@@ -208,6 +208,7 @@
+--- base/logging.c.orig 2007-10-29 00:21:29 +0100
base/logging.c 2008-03-13 18:28:21 +0100
+@@ -204,6 +204,7 @@
/* write something to the syslog facility */
int write_to_syslog(char *buffer, unsigned long data_type){
+static int logopen = 0;
- #ifdef DEBUG0
- printf("write_to_syslog() start\n");
-@@ -225,6 +226,12 @@
+ if(buffer==NULL)
+ return ERROR;
+@@ -220,6 +221,12 @@
if(!(data_type & syslog_options))
return OK;
@@ -45,9 +23,9 @@
syslog(LOG_USER|LOG_INFO,"%s",buffer);
Index: base/utils.c
base/utils.c.orig2007-04-30 23:22:32 +0200
-+++ base/utils.c 2007-12-14 09:59:28 +0100
-@@ -2811,7 +2811,7 @@
+--- base/utils.c.orig2008-03-10 21:58:33 +0100
base/utils.c 2008-03-13 18:28:21 +0100
+@@ -499,7 +499,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
@@ -56,42 +34,9 @@
buffer[sizeof(buffer)-1]='\x0';
/* write the error back to the parent process */
-@@ -2822,7 +2822,8 @@
- else{
-
- /* default return string in case nothing was returned */
--strcpy(buffer,"(No output!)");
-+snprintf(buffer,sizeof(buffer)-1,"(No output from
command \"%s\")", cmd);
-+buffer[sizeof(buffer)-1]='\x0';
-
- /* read in the first line of output from the command */
- fgets(buffer,sizeof(buffer)-1,fp);
-@@ -2838,7 +2839,7 @@
- if(status==-1)
- result=STATE_CRITICAL;
- else {
--result=WEXITSTATUS(status);
-+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 */
--result=WEXITSTATUS(status);
-+result=(WIFEXITED(status) ? WEXITSTATUS(status) : -1);
-
-
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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:
RevisionChanges 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 - 1.15
+++ openpkg-src/nagios/nagios.patch 14 Dec 2007 09:04:56 - 1.16
@@ -1,6 +1,6 @@
Index: base/checks.c
base/checks.c.orig 2007-04-10 16:50:22 +0200
-+++ base/checks.c2007-04-11 08:41:13 +0200
+--- base/checks.c.orig 2007-10-21 01:18:28 +0200
base/checks.c2007-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.orig2007-04-10 16:50:22 +0200
-+++ base/utils.c 2007-04-11 08:43:42 +0200
+--- base/utils.c.orig2007-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.spec13 Dec 2007 16:29:39 - 1.98
+++ openpkg-src/nagios/nagios.spec14 Dec 2007 09:04:56 - 1.99
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.10
-%define V_nagios_plugins 1.4.10
+%define V_nag
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 29-Sep-2007 12:24:37
Branch: HEAD Handle: 2007092911243700
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.9 20070925 -> 20070929
Summary:
RevisionChanges Path
1.15+6 -6 openpkg-src/nagios/nagios.patch
1.95+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.14 -r1.15 nagios.patch
--- openpkg-src/nagios/nagios.patch 4 Jun 2007 15:27:10 - 1.14
+++ openpkg-src/nagios/nagios.patch 29 Sep 2007 10:24:37 - 1.15
@@ -89,9 +89,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.9/configure
nagios-plugins-1.4.9/configure.orig 2007-03-29 12:55:12 +0200
-+++ nagios-plugins-1.4.9/configure 2007-04-11 08:41:13 +0200
+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 @@
fi
@@ -121,9 +121,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.9/plugins/common.h
nagios-plugins-1.4.9/plugins/common.h.orig 2007-03-22 18:54:16
+0100
-+++ nagios-plugins-1.4.9/plugins/common.h2007-04-11 08:41:13 +0200
+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 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.94 -r1.95 nagios.spec
--- openpkg-src/nagios/nagios.spec25 Sep 2007 05:33:09 - 1.94
+++ openpkg-src/nagios/nagios.spec29 Sep 2007 10:24:37 - 1.95
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.9
-%define V_nagios_plugins 1.4.9
+%define V_nagios_plugins 1.4.10
%define V_perl_nagios_plugin 0.21
%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: 20070925
+Release: 20070929
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 04-Jun-2007 17:27:10
Branch: HEAD Handle: 2007060416271000
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.9 20070418 -> 20070604
Summary:
RevisionChanges Path
1.14+6 -6 openpkg-src/nagios/nagios.patch
1.85+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.13 -r1.14 nagios.patch
--- openpkg-src/nagios/nagios.patch 11 Apr 2007 15:59:09 - 1.13
+++ openpkg-src/nagios/nagios.patch 4 Jun 2007 15:27:10 - 1.14
@@ -89,9 +89,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.8/configure
nagios-plugins-1.4.8/configure.orig 2007-03-29 12:55:12 +0200
-+++ nagios-plugins-1.4.8/configure 2007-04-11 08:41:13 +0200
+Index: nagios-plugins-1.4.9/configure
+--- nagios-plugins-1.4.9/configure.orig 2007-03-29 12:55:12 +0200
nagios-plugins-1.4.9/configure 2007-04-11 08:41:13 +0200
@@ -21070,8 +21070,8 @@
fi
@@ -121,9 +121,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.8/plugins/common.h
nagios-plugins-1.4.8/plugins/common.h.orig 2007-03-22 18:54:16
+0100
-+++ nagios-plugins-1.4.8/plugins/common.h2007-04-11 08:41:13 +0200
+Index: nagios-plugins-1.4.9/plugins/common.h
+--- nagios-plugins-1.4.9/plugins/common.h.orig 2007-03-22 18:54:16
+0100
nagios-plugins-1.4.9/plugins/common.h2007-04-11 08:41:13 +0200
@@ -176,7 +176,7 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.84 -r1.85 nagios.spec
--- openpkg-src/nagios/nagios.spec18 Apr 2007 21:46:11 - 1.84
+++ openpkg-src/nagios/nagios.spec4 Jun 2007 15:27:10 - 1.85
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.9
-%define V_nagios_plugins 1.4.8
+%define V_nagios_plugins 1.4.9
%define V_perl_nagios_plugin 0.14
%define V_perl_nagios_object 0.17
%define V_perl_nagios_cmd 0.05
@@ -40,7 +40,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20070418
+Release: 20070604
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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 17:59:10 Branch: HEAD Handle: 2007041116590900 Modified files: openpkg-src/nagios nagios.patch nagios.spec Log: modifying package: nagios-2.9 20070411 again Summary: RevisionChanges Path 1.13+6 -6 openpkg-src/nagios/nagios.patch 1.83+1 -1 openpkg-src/nagios/nagios.spec patch -p0 <<'@@ .' Index: openpkg-src/nagios/nagios.patch $ cvs diff -u -r1.12 -r1.13 nagios.patch --- openpkg-src/nagios/nagios.patch 11 Apr 2007 07:39:01 - 1.12 +++ openpkg-src/nagios/nagios.patch 11 Apr 2007 15:59:09 - 1.13 @@ -89,9 +89,9 @@ buffer[sizeof(buffer)-1]='\x0'; write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE); } -Index: nagios-plugins-1.4.7/configure 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 +Index: nagios-plugins-1.4.8/configure +--- nagios-plugins-1.4.8/configure.orig 2007-03-29 12:55:12 +0200 nagios-plugins-1.4.8/configure 2007-04-11 08:41:13 +0200 @@ -21070,8 +21070,8 @@ fi @@ -121,9 +121,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 2007-03-22 18:54:16 +0100 -+++ nagios-plugins-1.4.7/plugins/common.h2007-04-11 08:41:13 +0200 +Index: nagios-plugins-1.4.8/plugins/common.h +--- nagios-plugins-1.4.8/plugins/common.h.orig 2007-03-22 18:54:16 +0100 nagios-plugins-1.4.8/plugins/common.h2007-04-11 08:41:13 +0200 @@ -176,7 +176,7 @@ /* Solaris does not have floorf, but floor works. Should probably be in configure */ @@ . patch -p0 <<'@@ .' Index: openpkg-src/nagios/nagios.spec $ cvs diff -u -r1.82 -r1.83 nagios.spec --- openpkg-src/nagios/nagios.spec11 Apr 2007 07:39:01 - 1.82 +++ openpkg-src/nagios/nagios.spec11 Apr 2007 15:59:09 - 1.83 @@ -24,7 +24,7 @@ # package versions %define V_nagios 2.9 -%define V_nagios_plugins 1.4.7 +%define V_nagios_plugins 1.4.8 %define V_perl_nagios_plugin 0.14 %define V_perl_nagios_object 0.17 %define V_perl_nagios_cmd 0.05 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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:
RevisionChanges 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 - 1.11
+++ openpkg-src/nagios/nagios.patch 11 Apr 2007 07:39:01 - 1.12
@@ -1,6 +1,6 @@
Index: base/checks.c
base/checks.c.orig 2006-06-21 02:59:19 +0200
-+++ base/checks.c2006-10-20 20:44:43 +0200
+--- base/checks.c.orig 2007-04-10 16:50:22 +0200
base/checks.c2007-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.orig2006-07-13 23:55:10 +0200
-+++ base/utils.c 2006-10-20 20:44:43 +0200
-@@ -2806,7 +2806,7 @@
+--- base/utils.c.orig2007-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.h2006-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.h2007-04-11 08:41:13 +0200
+@@ -176,7 +176,7 @@
/* Solaris doe
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 29-Mar-2007 20:09:23
Branch: HEAD Handle: 2007032919092200
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.8 20070309 -> 20070329
Summary:
RevisionChanges Path
1.11+6 -6 openpkg-src/nagios/nagios.patch
1.81+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.10 -r1.11 nagios.patch
--- openpkg-src/nagios/nagios.patch 9 Mar 2007 07:01:30 - 1.10
+++ openpkg-src/nagios/nagios.patch 29 Mar 2007 18:09:22 - 1.11
@@ -89,9 +89,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.6/configure
nagios-plugins-1.4.6/configure.orig 2006-10-19 22:08:11 +0200
-+++ nagios-plugins-1.4.6/configure 2006-10-20 20:44:43 +0200
+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 @@
fi
@@ -121,9 +121,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.6/plugins/common.h
nagios-plugins-1.4.6/plugins/common.h.orig 2006-07-29 03:43:34
+0200
-+++ nagios-plugins-1.4.6/plugins/common.h2006-10-20 20:44:43 +0200
+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.h2006-10-20 20:44:43 +0200
@@ -213,7 +213,7 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.80 -r1.81 nagios.spec
--- openpkg-src/nagios/nagios.spec9 Mar 2007 07:01:30 - 1.80
+++ openpkg-src/nagios/nagios.spec29 Mar 2007 18:09:22 - 1.81
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.8
-%define V_nagios_plugins 1.4.6
+%define V_nagios_plugins 1.4.7
%define V_perl_nagios_plugin 0.14
%define V_perl_nagios_object 0.17
%define V_perl_nagios_cmd 0.05
@@ -40,7 +40,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20070309
+Release: 20070329
# package options
%option with_perl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 09-Mar-2007 08:01:31
Branch: HEAD Handle: 2007030907013000
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
upgrading package: nagios 2.7 -> 2.8
Summary:
RevisionChanges Path
1.10+6 -18 openpkg-src/nagios/nagios.patch
1.80+5 -4 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.9 -r1.10 nagios.patch
--- openpkg-src/nagios/nagios.patch 2 Nov 2006 16:22:59 - 1.9
+++ openpkg-src/nagios/nagios.patch 9 Mar 2007 07:01:30 - 1.10
@@ -89,9 +89,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.5/configure
nagios-plugins-1.4.5/configure.orig 2006-10-19 22:08:11 +0200
-+++ nagios-plugins-1.4.5/configure 2006-10-20 20:44:43 +0200
+Index: nagios-plugins-1.4.6/configure
+--- nagios-plugins-1.4.6/configure.orig 2006-10-19 22:08:11 +0200
nagios-plugins-1.4.6/configure 2006-10-20 20:44:43 +0200
@@ -25123,8 +25123,8 @@
fi
@@ -121,21 +121,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.5/lib/regex_internal.h
nagios-plugins-1.4.5/lib/regex_internal.h.orig 2006-05-25 14:33:24
+0200
-+++ nagios-plugins-1.4.5/lib/regex_internal.h2006-10-20 20:47:51
+0200
-@@ -455,7 +455,7 @@
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-
--#include
-+#include
-
- #ifndef _LIBC
- # if HAVE_ALLOCA
-Index: nagios-plugins-1.4.5/plugins/common.h
nagios-plugins-1.4.5/plugins/common.h.orig 2006-07-29 03:43:34
+0200
-+++ nagios-plugins-1.4.5/plugins/common.h2006-10-20 20:44:43 +0200
+Index: nagios-plugins-1.4.6/plugins/common.h
+--- nagios-plugins-1.4.6/plugins/common.h.orig 2006-07-29 03:43:34
+0200
nagios-plugins-1.4.6/plugins/common.h2006-10-20 20:44:43 +0200
@@ -213,7 +213,7 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.79 -r1.80 nagios.spec
--- openpkg-src/nagios/nagios.spec20 Jan 2007 08:45:24 - 1.79
+++ openpkg-src/nagios/nagios.spec9 Mar 2007 07:01:30 - 1.80
@@ -23,8 +23,8 @@
##
# package versions
-%define V_nagios 2.7
-%define V_nagios_plugins 1.4.5
+%define V_nagios 2.8
+%define V_nagios_plugins 1.4.6
%define V_perl_nagios_plugin 0.14
%define V_perl_nagios_object 0.17
%define V_perl_nagios_cmd 0.05
@@ -40,7 +40,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20070120
+Release: 20070309
# package options
%option with_perl yes
@@ -192,7 +192,8 @@
# install Nagios plugins
( cd nagios-plugins-%{V_nagios_plugins}/
- %{l_make} install DESTDIR="$RPM_BUILD_ROOT"
+ %{l_make} install DESTDIR="$RPM_BUILD_ROOT" \
+ MKINSTALLDIRS="%{l_shtool} install -d"
) || exit $?
%if "%{with_perl}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 02-Nov-2006 17:22:59
Branch: HEAD Handle: 2006110216225900
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.5 20061024 -> 20061102
Summary:
RevisionChanges Path
1.9 +9 -9 openpkg-src/nagios/nagios.patch
1.73+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.8 -r1.9 nagios.patch
--- openpkg-src/nagios/nagios.patch 20 Oct 2006 18:51:08 - 1.8
+++ openpkg-src/nagios/nagios.patch 2 Nov 2006 16:22:59 - 1.9
@@ -89,9 +89,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
-Index: nagios-plugins-1.4.4/configure
nagios-plugins-1.4.4/configure.orig 2006-10-19 22:08:11 +0200
-+++ nagios-plugins-1.4.4/configure 2006-10-20 20:44:43 +0200
+Index: nagios-plugins-1.4.5/configure
+--- nagios-plugins-1.4.5/configure.orig 2006-10-19 22:08:11 +0200
nagios-plugins-1.4.5/configure 2006-10-20 20:44:43 +0200
@@ -25123,8 +25123,8 @@
fi
@@ -121,9 +121,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.4/lib/regex_internal.h
nagios-plugins-1.4.4/lib/regex_internal.h.orig 2006-05-25 14:33:24
+0200
-+++ nagios-plugins-1.4.4/lib/regex_internal.h2006-10-20 20:47:51
+0200
+Index: nagios-plugins-1.4.5/lib/regex_internal.h
+--- nagios-plugins-1.4.5/lib/regex_internal.h.orig 2006-05-25 14:33:24
+0200
nagios-plugins-1.4.5/lib/regex_internal.h2006-10-20 20:47:51
+0200
@@ -455,7 +455,7 @@
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
@@ -133,9 +133,9 @@
#ifndef _LIBC
# if HAVE_ALLOCA
-Index: nagios-plugins-1.4.4/plugins/common.h
nagios-plugins-1.4.4/plugins/common.h.orig 2006-07-29 03:43:34
+0200
-+++ nagios-plugins-1.4.4/plugins/common.h2006-10-20 20:44:43 +0200
+Index: nagios-plugins-1.4.5/plugins/common.h
+--- nagios-plugins-1.4.5/plugins/common.h.orig 2006-07-29 03:43:34
+0200
nagios-plugins-1.4.5/plugins/common.h2006-10-20 20:44:43 +0200
@@ -213,7 +213,7 @@
/* Solaris does not have floorf, but floor works. Should probably be in
configure */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.72 -r1.73 nagios.spec
--- openpkg-src/nagios/nagios.spec24 Oct 2006 11:25:32 - 1.72
+++ openpkg-src/nagios/nagios.spec2 Nov 2006 16:22:59 - 1.73
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.5
-%define V_nagios_plugins 1.4.4
+%define V_nagios_plugins 1.4.5
%define V_perl_nagios_plugin 0.14
%define V_perl_nagios_object 0.14
%define V_perl_nagios_cmd 0.05
@@ -40,7 +40,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20061024
+Release: 20061102
# package options
%option with_perl yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 20-Oct-2006 20:51:08
Branch: HEAD Handle: 2006102019510800
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
modifying package: nagios-2.5 20061013 -> 20061020
Summary:
RevisionChanges Path
1.8 +27 -15 openpkg-src/nagios/nagios.patch
1.68+2 -4 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.7 -r1.8 nagios.patch
--- openpkg-src/nagios/nagios.patch 12 Oct 2006 18:50:40 - 1.7
+++ openpkg-src/nagios/nagios.patch 20 Oct 2006 18:51:08 - 1.8
@@ -1,6 +1,6 @@
Index: base/checks.c
base/checks.c.orig 2006-06-21 02:59:19.0 +0200
-+++ base/checks.c2006-10-12 19:43:15.687168262 +0200
+--- base/checks.c.orig 2006-06-21 02:59:19 +0200
base/checks.c2006-10-20 20:44:43 +0200
@@ -486,7 +486,8 @@
_exit(STATE_UNKNOWN);
@@ -21,8 +21,8 @@
svc_msg.check_type=SERVICE_CHECK_ACTIVE;
svc_msg.finish_time=end_time;
Index: base/logging.c
base/logging.c.orig 2005-12-13 01:42:45.0 +0100
-+++ base/logging.c 2006-10-12 19:43:15.687570530 +0200
+--- base/logging.c.orig 2005-12-13 01:42:45 +0100
base/logging.c 2006-10-20 20:44:43 +0200
@@ -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.orig2006-07-13 23:55:10.0 +0200
-+++ base/utils.c 2006-10-12 19:43:15.689542314 +0200
+--- base/utils.c.orig2006-07-13 23:55:10 +0200
base/utils.c 2006-10-20 20:44:43 +0200
@@ -2806,7 +2806,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.3/configure
nagios-plugins-1.4.3/configure.orig 2006-04-19 05:52:19.0
+0200
-+++ nagios-plugins-1.4.3/configure 2006-10-12 19:43:15.705072958 +0200
-@@ -25122,8 +25122,8 @@
+Index: nagios-plugins-1.4.4/configure
+--- nagios-plugins-1.4.4/configure.orig 2006-10-19 22:08:11 +0200
nagios-plugins-1.4.4/configure 2006-10-20 20:44:43 +0200
+@@ -25123,8 +25123,8 @@
fi
if test "$ac_cv_lib_ldap_main" = "yes"; then
@@ -103,7 +103,7 @@
-@@ -29844,17 +29844,10 @@
+@@ -29931,17 +29931,10 @@
echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5
echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6
@@ -121,10 +121,22 @@
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.3/plugins/common.h
nagios-plugins-1.4.3/plugins/common.h.orig 2005-12-07
16:10:27.0 +0100
-+++ nagios-plugins-1.4.3/plugins/common.h2006-10-12 20:16:46.061238204
+0200
-@@ -193,7 +193,7 @@
+Index: nagios-plugins-1.4.4/lib/regex_internal.h
+--- nagios-plugins-1.4.4/lib/regex_internal.h.orig 2006-05-25 14:33:24
+0200
nagios-plugins-1.4.4/lib/regex_internal.h2006-10-20 20:47:51
+0200
+@@ -455,7 +455,7 @@
+ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+ #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+
+-#include
++#include
+
+ #ifndef _LIBC
+ # if HAVE_ALLOCA
+Index: nagios-plugins-1.4.4/plugins/common.h
+--- nagios-plugins-1.4.4/plugins/common.h.orig 2006-07-29 03:43:34
+0200
nagios-plugins-1.4.4/plugins/common.h2006-10-20 20:44:43 +0200
+@@ -213,7 +213,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.67 -r1.68 nagios.spec
--- openpkg-src/nagios/nagios.spec13 Oct 2006 17:30:25 - 1.67
+++ openpkg-src/nagios/nagios.spec20 Oct 2006 18:51:08 - 1.68
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.5
-%define V_nagios_plug
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 12-Oct-2006 20:50:40
Branch: HEAD Handle: 2006101219504000
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
fix building under Solaris
Summary:
RevisionChanges Path
1.7 +22 -10 openpkg-src/nagios/nagios.patch
1.65+1 -1 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.6 -r1.7 nagios.patch
--- openpkg-src/nagios/nagios.patch 1 Jun 2006 08:36:32 - 1.6
+++ openpkg-src/nagios/nagios.patch 12 Oct 2006 18:50:40 - 1.7
@@ -1,7 +1,7 @@
Index: base/checks.c
base/checks.c.orig 2006-02-16 05:47:55 +0100
-+++ base/checks.c2006-06-01 10:34:34 +0200
-@@ -483,7 +483,8 @@
+--- base/checks.c.orig 2006-06-21 02:59:19.0 +0200
base/checks.c2006-10-12 19:43:15.687168262 +0200
+@@ -486,7 +486,8 @@
_exit(STATE_UNKNOWN);
/* default return string in case nothing was returned */
@@ -11,7 +11,7 @@
/* grab the plugin output and clean it */
fgets(plugin_output,sizeof(plugin_output)-1,fp);
-@@ -505,7 +506,7 @@
+@@ -508,7 +509,7 @@
/* record check result info */
strncpy(svc_msg.output,plugin_output,sizeof(svc_msg.output)-1);
svc_msg.output[sizeof(svc_msg.output)-1]='\x0';
@@ -21,8 +21,8 @@
svc_msg.check_type=SERVICE_CHECK_ACTIVE;
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-06-01 10:34:34 +0200
+--- base/logging.c.orig 2005-12-13 01:42:45.0 +0100
base/logging.c 2006-10-12 19:43:15.687570530 +0200
@@ -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.orig2006-05-20 20:37:29 +0200
-+++ base/utils.c 2006-06-01 10:34:34 +0200
+--- base/utils.c.orig2006-07-13 23:55:10.0 +0200
base/utils.c 2006-10-12 19:43:15.689542314 +0200
@@ -2806,7 +2806,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
@@ -90,8 +90,8 @@
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
}
Index: nagios-plugins-1.4.3/configure
nagios-plugins-1.4.3/configure.orig 2006-04-19 05:52:19 +0200
-+++ nagios-plugins-1.4.3/configure 2006-06-01 10:34:34 +0200
+--- nagios-plugins-1.4.3/configure.orig 2006-04-19 05:52:19.0
+0200
nagios-plugins-1.4.3/configure 2006-10-12 19:43:15.705072958 +0200
@@ -25122,8 +25122,8 @@
fi
@@ -121,3 +121,15 @@
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.3/plugins/common.h
+--- nagios-plugins-1.4.3/plugins/common.h.orig 2005-12-07
16:10:27.0 +0100
nagios-plugins-1.4.3/plugins/common.h2006-10-12 20:16:46.061238204
+0200
+@@ -193,7 +193,7 @@
+
+ /* Solaris does not have floorf, but floor works. Should probably be in
configure */
+ #if defined(__sun) || defined(__sun__)
+-static inline float floorf (float x) { return floor(x); }
++#define floorf(x) (float)floor((double)(x))
+ #endif
+
+ enum {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.64 -r1.65 nagios.spec
--- openpkg-src/nagios/nagios.spec23 Sep 2006 12:01:57 - 1.64
+++ openpkg-src/nagios/nagios.spec12 Oct 2006 18:50:40 - 1.65
@@ -37,7 +37,7 @@
Group:Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20060923
+Release: 20061012
# package options
%option with_perl yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 01-Jun-2006 10:36:33
Branch: HEAD Handle: 2006060109363200
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
upgrading package: nagios 2.3.1 -> 2.4
Summary:
RevisionChanges Path
1.6 +67 -62 openpkg-src/nagios/nagios.patch
1.61+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.5 -r1.6 nagios.patch
--- openpkg-src/nagios/nagios.patch 21 Apr 2006 07:19:00 - 1.5
+++ openpkg-src/nagios/nagios.patch 1 Jun 2006 08:36:32 - 1.6
@@ -1,6 +1,28 @@
+Index: base/checks.c
+--- base/checks.c.orig 2006-02-16 05:47:55 +0100
base/checks.c2006-06-01 10:34:34 +0200
+@@ -483,7 +483,8 @@
+ _exit(STATE_UNKNOWN);
+
+ /* default return string in case nothing was returned */
+-strcpy(plugin_output,"(No output!)");
++snprintf(plugin_output,sizeof(plugin_output)-1,"(No
output from command \"%s\")", processed_command);
++plugin_output[sizeof(plugin_output)-1]='\x0';
+
+ /* grab the plugin output and clean it */
+ fgets(plugin_output,sizeof(plugin_output)-1,fp);
+@@ -505,7 +506,7 @@
+ /* record check result info */
+
strncpy(svc_msg.output,plugin_output,sizeof(svc_msg.output)-1);
+ svc_msg.output[sizeof(svc_msg.output)-1]='\x0';
+-svc_msg.return_code=WEXITSTATUS(pclose_result);
++svc_msg.return_code=(WIFEXITED(pclose_result) ?
WEXITSTATUS(pclose_result) : -1);
+ svc_msg.exited_ok=TRUE;
+ svc_msg.check_type=SERVICE_CHECK_ACTIVE;
+ 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-04-20 20:13:22 +0200
base/logging.c 2006-06-01 10:34:34 +0200
@@ -208,6 +208,7 @@
/* write something to the syslog facility */
@@ -14,55 +36,23 @@
return OK;
+/* OSSP fsl identification */
-+if (!logopen) {
-+openlog("nagios", LOG_NDELAY, LOG_USER);
-+logopen = 1;
-+}
++if (!logopen) {
++openlog("nagios", LOG_NDELAY, LOG_USER);
++logopen = 1;
++}
+
/* write the buffer to the syslog facility */
syslog(LOG_USER|LOG_INFO,"%s",buffer);
-Index: nagios-plugins-1.4.3/configure
nagios-plugins-1.4.3/configure.orig 2006-04-19 05:52:19 +0200
-+++ nagios-plugins-1.4.3/configure 2006-04-20 20:14:05 +0200
-@@ -25122,8 +25122,8 @@
- fi
-
- if test "$ac_cv_lib_ldap_main" = "yes"; then
-- LDAPLIBS="-lldap -llber"\
-- LDAPINCLUDE="-I/usr/include/ldap"
-+ LDAPLIBS="-lldap -llber -lssl -lcrypto"
-+ LDAPINCLUDE="-I$prefix/include"
-
-
-
-@@ -29844,17 +29844,10 @@
-
- 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
--if test -n "$ac_cv_ping_packets_first"
--then
--ac_cv_ping_packets_first=yes
--ac_cv_ping_has_timeout=yes
--fi
-
- elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
- $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
Index: base/utils.c
base/utils.c.orig2006-04-07 23:45:33 +0200
-+++ base/utils.c 2006-04-20 22:52:43 +0200
+--- base/utils.c.orig2006-05-20 20:37:29 +0200
base/utils.c 2006-06-01 10:34:34 +0200
@@ -2806,7 +2806,7 @@
/* report an error if we couldn't run the command */
if(fp==NULL){
-strncpy(buffer,"(Error: Could not execute
command)\n",sizeof(buffer)-1);
-+snprintf(buffer,sizeof(buffer)-1,"(Error: Could not
execute command \"%s\"", cmd);
++snprintf(buffer,sizeof(buffer)-1,"(Error: Could not
execute command \"%s\")", cmd);
buffer[sizeof(buffer)-1]='\x0';
/* write
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec
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: 21-Apr-2006 09:19:01
Branch: HEAD Handle: 200604210819
Modified files:
openpkg-src/nagios nagios.patch nagios.spec
Log:
I'm still trying to track down why to the hell Nagios thinks the
plugins return 127 on exit although they work fine on the command line
Summary:
RevisionChanges Path
1.5 +62 -0 openpkg-src/nagios/nagios.patch
1.52+1 -1 openpkg-src/nagios/nagios.spec
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.4 -r1.5 nagios.patch
--- openpkg-src/nagios/nagios.patch 20 Apr 2006 19:51:08 - 1.4
+++ openpkg-src/nagios/nagios.patch 21 Apr 2006 07:19:00 - 1.5
@@ -54,3 +54,65 @@
elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
+Index: base/utils.c
+--- base/utils.c.orig2006-04-07 23:45:33 +0200
base/utils.c 2006-04-20 22:52:43 +0200
+@@ -2806,7 +2806,7 @@
+ /* report an error if we couldn't run the command */
+ if(fp==NULL){
+
+-strncpy(buffer,"(Error: Could not execute
command)\n",sizeof(buffer)-1);
++snprintf(buffer,sizeof(buffer)-1,"(Error: Could not
execute command \"%s\"", cmd);
+ buffer[sizeof(buffer)-1]='\x0';
+
+ /* write the error back to the parent process */
+@@ -2817,7 +2817,8 @@
+ else{
+
+ /* default return string in case nothing was returned */
+-strcpy(buffer,"(No output!)");
++snprintf(buffer,sizeof(buffer)-1,"(No output from
command \"%s\"", cmd);
++buffer[sizeof(buffer)-1]='\x0';
+
+ /* read in the first line of output from the command */
+ fgets(buffer,sizeof(buffer)-1,fp);
+@@ -2833,7 +2834,7 @@
+ if(status==-1)
+ result=STATE_CRITICAL;
+ 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,7 +2871,7 @@
+ #endif
+
+ /* get the exit code returned from the program */
+-result=WEXITSTATUS(status);
++result=(WIFEXITED(status) ? WEXITSTATUS(status) : -1);
+
+ /* check for possibly missing scripts/binaries/etc */
+ if(result==126 || result==127){
+Index: base/checks.c
+--- base/checks.c.orig 2006-02-16 05:47:55 +0100
base/checks.c2006-04-20 22:52:42 +0200
+@@ -483,7 +483,8 @@
+ _exit(STATE_UNKNOWN);
+
+ /* default return string in case nothing was returned */
+-strcpy(plugin_output,"(No output!)");
++snprintf(plugin_output,sizeof(plugin_output)-1,"(No
output from command \"%s\"", processed_command);
++plugin_output[sizeof(plugin_output)-1]='\x0';
+
+ /* grab the plugin output and clean it */
+ fgets(plugin_output,sizeof(plugin_output)-1,fp);
+@@ -505,7 +506,7 @@
+ /* record check result info */
+
strncpy(svc_msg.output,plugin_output,sizeof(svc_msg.output)-1);
+ svc_msg.output[sizeof(svc_msg.output)-1]='\x0';
+-svc_msg.return_code=WEXITSTATUS(pclose_result);
++svc_msg.return_code=(WIFEXITED(pclose_result) ?
WEXITSTATUS(pclose_result) : -1);
+ svc_msg.exited_ok=TRUE;
+ svc_msg.check_type=SERVICE_CHECK_ACTIVE;
+ svc_msg.finish_time=end_time;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.51 -r1.52 nagios.spec
--- openpkg-src/nagios/nagios.spec20 Apr 2006 19:51:08 - 1.51
+++ openpkg-src/nagios/nagios.spec21 Apr 2006 07:19:00 - 1.52
@@ -37,7 +37,7 @@
Group:Network
License: GNU
Version: %{V_nagios}
-Release: 20060420
+Release: 20060421
#
[CVS] OpenPKG: openpkg-src/nagios/ nagios.patch nagios.spec rc.nagios
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: 20-Apr-2006 09:56:48
Branch: HEAD Handle: 2006042008564800
Modified files:
openpkg-src/nagios nagios.patch nagios.spec rc.nagios
Log:
packaging cleanups and a build fix
Summary:
RevisionChanges Path
1.3 +8 -7 openpkg-src/nagios/nagios.patch
1.49+2 -2 openpkg-src/nagios/nagios.spec
1.16+0 -2 openpkg-src/nagios/rc.nagios
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.patch
$ cvs diff -u -r1.2 -r1.3 nagios.patch
--- openpkg-src/nagios/nagios.patch 28 Jun 2003 15:17:31 - 1.2
+++ openpkg-src/nagios/nagios.patch 20 Apr 2006 07:56:48 - 1.3
@@ -1,6 +1,7 @@
base/logging.c.orig Tue Feb 26 05:03:28 2002
-+++ base/logging.c Wed Jun 25 14:02:52 2003
-@@ -130,6 +130,7 @@
+Index: base/logging.c
+--- base/logging.c.orig 2005-12-13 01:42:45 +0100
base/logging.c 2006-04-20 09:45:56 +0200
+@@ -208,6 +208,7 @@
/* write something to the syslog facility */
int write_to_syslog(char *buffer, unsigned long data_type){
@@ -8,16 +9,16 @@
#ifdef DEBUG0
printf("write_to_syslog() start\n");
-@@ -142,6 +143,12 @@
- /* make sure we should log this type of entry */
+@@ -225,6 +226,12 @@
if(!(data_type & syslog_options))
return OK;
-+
+
+/* OSSP fsl identification */
+if (!logopen) {
+openlog("nagios", LOG_NDELAY, LOG_USER);
+logopen = 1;
+}
-
++
/* write the buffer to the syslog facility */
syslog(LOG_USER|LOG_INFO,"%s",buffer);
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.48 -r1.49 nagios.spec
--- openpkg-src/nagios/nagios.spec19 Apr 2006 06:26:09 - 1.48
+++ openpkg-src/nagios/nagios.spec20 Apr 2006 07:56:48 - 1.49
@@ -37,7 +37,7 @@
Group:Network
License: GNU
Version: %{V_nagios}
-Release: 20060419
+Release: 20060420
# package options
%option with_eperl yes
@@ -135,7 +135,7 @@
PATH_TO_PING="%{l_prefix}/bin/gping" \
PING_PACKETS_FIRST="yes" \
PATH_TO_SSH="%{l_prefix}/bin/ssh" \
- LIBS="-lssl -lcrypto"
+ LIBS="-lssl -lcrypto" \
./configure \
--prefix=%{l_prefix}/libexec/nagios \
--libexecdir=%{l_prefix}/libexec/nagios \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/rc.nagios
$ cvs diff -u -r1.15 -r1.16 rc.nagios
--- openpkg-src/nagios/rc.nagios 3 Mar 2006 20:45:55 - 1.15
+++ openpkg-src/nagios/rc.nagios 20 Apr 2006 07:56:48 - 1.16
@@ -65,8 +65,6 @@
%daily -u @l_musr@
rcService nagios enable yes || exit 0
-
-# rotate logfiles
shtool rotate -f \
-n ${nagios_nagios_numfiles} -s ${nagios_nagios_minsize} -d \
-z ${nagios_nagios_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
