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:
Revision Changes 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 -0000 1.7
+++ openpkg-src/nagios/nagios.patch 20 Oct 2006 18:51:08 -0000 1.8
@@ -1,6 +1,6 @@
Index: base/checks.c
---- base/checks.c.orig 2006-06-21 02:59:19.000000000 +0200
-+++ base/checks.c 2006-10-12 19:43:15.687168262 +0200
+--- base/checks.c.orig 2006-06-21 02:59:19 +0200
++++ base/checks.c 2006-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.000000000 +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.orig 2006-07-13 23:55:10.000000000 +0200
-+++ base/utils.c 2006-10-12 19:43:15.689542314 +0200
+--- 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 @@
/* 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.000000000
+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.000000000 +0100
-+++ nagios-plugins-1.4.3/plugins/common.h 2006-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.h 2006-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 <alloca.h>
++#include <stdlib.h>
+
+ #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.h 2006-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.spec 13 Oct 2006 17:30:25 -0000 1.67
+++ openpkg-src/nagios/nagios.spec 20 Oct 2006 18:51:08 -0000 1.68
@@ -24,7 +24,7 @@
# package versions
%define V_nagios 2.5
-%define V_nagios_plugins 1.4.3
+%define V_nagios_plugins 1.4.4
# package information
Name: nagios
@@ -37,7 +37,7 @@
Group: Monitoring
License: GPL
Version: %{V_nagios}
-Release: 20061013
+Release: 20061020
# package options
%option with_perl yes
@@ -137,8 +137,6 @@
--prefix=%{l_prefix}/libexec/nagios \
--libexecdir=%{l_prefix}/libexec/nagios \
--with-cgiurl=/nagios/cgi \
- --with-nagios-user=%{l_rusr} \
- --with-nagios-group=%{l_rgrp} \
--with-openssl=%{l_prefix} \
--with-perl=%{l_prefix}/bin/perl \
--with-df-command="%{l_prefix}/bin/gdf" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
