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:
Revision Changes 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 -0000 1.9
+++ openpkg-src/nagios/nagios.patch 9 Mar 2007 07:01:30 -0000 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.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.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.h 2006-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.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 */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.79 -r1.80 nagios.spec
--- openpkg-src/nagios/nagios.spec 20 Jan 2007 08:45:24 -0000 1.79
+++ openpkg-src/nagios/nagios.spec 9 Mar 2007 07:01:30 -0000 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 [email protected]
