[pkgsrc/trunk]: pkgsrc/net/nagios-base Update nagios-base to 2.5.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/nagios-base Update nagios-base to 2.5.
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:53:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c0ffb03cea4
branches:  trunk
changeset: 517649:5c0ffb03cea4
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Aug 17 14:19:00 2006 +0000

description:
Update nagios-base to 2.5.

#####################
Nagios 2.x Change Log
#####################


2.5 - 07/13/2006
----------------
* Bug fix for excluding hidden files from config file processing
* Bug fix for incorrect links to trends CGI from notification CGI
* Hopefully faster shutdown during host checks
* Lock file is now closed just prior to shutdown, instead of when SIGINT is received
* Bug fix for segfault during startup due to extended service definition duplication
* Bug fix for segfault with wildcards in servicegroup members
* Bug fix for segfault when p1.pl file was missing and embedded Perl interpreter was enabled



2.4 - 05/31/2006
----------------
* Fix for missing <limits.h> include that prevented CGI compilation under Solaris
* Better error message reporting in the command CGI (cmd.cgi)
* Fix for order of recovery/flapping notifications immediately after end of host/service flapping
* Bug fix for potential crash (SIGBUS) of CGIs when reading mmap()'ed status, comment, and downtime files
* Added 'install-unstripped' option to Makefile to allow installing unstripped binaries for debugging
* Minor bug fix to sample redundancy handle-master-proc-event script

diffstat:

 net/nagios-base/Makefile         |   8 +++++---
 net/nagios-base/distinfo         |  16 ++++++++--------
 net/nagios-base/patches/patch-aa |  29 ++++++++++++++++-------------
 net/nagios-base/patches/patch-ab |  18 +++++++++---------
 net/nagios-base/patches/patch-ac |  18 +++++++++---------
 net/nagios-base/patches/patch-ad |  18 ++++++++----------
 6 files changed, 55 insertions(+), 52 deletions(-)

diffs (230 lines):

diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/Makefile
--- a/net/nagios-base/Makefile  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/Makefile  Thu Aug 17 14:19:00 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/05/17 20:47:41 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2006/08/17 14:19:00 taca Exp $
 #
 
-DISTNAME=      nagios-2.3.1
+DISTNAME=      nagios-2.5
 PKGNAME=       ${DISTNAME:S/-/-base-/}
 CATEGORIES=    net sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -30,6 +30,8 @@
 
 INSTALL_TARGET=                install install-config
 
+BUILD_DEFS+=   VARBASE
+
 PKG_GROUPS+=   ${NAGIOS_GROUP}
 PKG_GROUPS+=   ${NAGIOSADM_GROUP}
 
@@ -64,7 +66,7 @@
 SUBST_MESSAGE.files=   Fixing configuration files.
 
 pre-build:
-       @${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
+       ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${EGDIR}/nagios.conf
diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/distinfo
--- a/net/nagios-base/distinfo  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/distinfo  Thu Aug 17 14:19:00 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2006/05/17 20:47:41 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2006/08/17 14:19:00 taca Exp $
 
-SHA1 (nagios-2.3.1.tar.gz) = 8376d15ca7d0ad6bd890a4d1170d325494604377
-RMD160 (nagios-2.3.1.tar.gz) = fb1d1e66682ce4261535281de04067c3ad33b5ee
-Size (nagios-2.3.1.tar.gz) = 1734958 bytes
-SHA1 (patch-aa) = d08de9385d2be34d8c708c78f41d6a0c69815069
-SHA1 (patch-ab) = e313d47fbd9125613caa40fd17da20eaf81d1445
-SHA1 (patch-ac) = 094e4fa025a1982c9db96d70be563cbd4c33e192
-SHA1 (patch-ad) = a68b5b6baba07aee595be2be5e96f279b50b334c
+SHA1 (nagios-2.5.tar.gz) = 00e6bc45c5634649b6a1be2758ec181197d38f76
+RMD160 (nagios-2.5.tar.gz) = a0f1890ed546ce026cf784ae3ca83119275bd529
+Size (nagios-2.5.tar.gz) = 1736167 bytes
+SHA1 (patch-aa) = 1fe7ca7fd5b9aa5336daabdf02e8ca02411d857c
+SHA1 (patch-ab) = 5d9b0eecd2fdfa00e8412d61f9b54afaa71a97f3
+SHA1 (patch-ac) = ae45c87966641bd3374ee77af7109f19f906d1c0
+SHA1 (patch-ad) = f1b3979d977f78f5b02487809558693a963f2d40
 SHA1 (patch-ae) = 21f34726d239b4dacd17a94b80cbe030f76a2bbc
 SHA1 (patch-af) = 5690e6e4a6259fe8527faa1e8a77eeb5bf4b955f
 SHA1 (patch-ag) = 041dbc9a589ea3c3ced0532a2c1a99e7d0bca584
diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/patches/patch-aa
--- a/net/nagios-base/patches/patch-aa  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/patches/patch-aa  Thu Aug 17 14:19:00 2006 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- Makefile.in.orig   2004-12-16 02:15:24.000000000 +0100
-+++ Makefile.in        2005-10-14 20:00:49.000000000 +0200
-@@ -21,16 +21,17 @@
+--- Makefile.in.orig   2006-05-31 01:31:44.000000000 +0900
++++ Makefile.in
+@@ -21,16 +21,17 @@ LDFLAGS=@LDFLAGS@ @LIBS@
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
 -LOGDIR=@localstatedir@
+-CFGDIR=@sysconfdir@
 +LOGDIR=@localstatedir@/log/nagios
- CFGDIR=@sysconfdir@
++CGIDIR=@libexecdir@
  BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
+ CGIDIR=@sbindir@
  HTMLDIR=@datadir@
 +SAMPDIR=@prefix@/share/examples/nagios
  INSTALL=@INSTALL@
@@ -23,7 +23,7 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -59,60 +60,6 @@
+@@ -59,60 +60,6 @@ all:
        cd $(SRC_HTM) && $(MAKE)
        cd $(SRC_MODULE) && $(MAKE)
  
@@ -84,10 +84,10 @@
  nagios:
        cd $(SRC_BASE) && $(MAKE)
  
-@@ -174,10 +121,8 @@
-       cd $(SRC_BASE) && $(MAKE) $@
-       cd $(SRC_CGI) && $(MAKE) $@
-       cd $(SRC_HTM) && $(MAKE) $@
+@@ -183,12 +130,11 @@ install-unstripped: 
+       $(MAKE) install-basic
+ 
+ install-basic:
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
        if [ $(INSTALLPERLSTUFF) = yes ]; then \
@@ -95,8 +95,11 @@
 +              ${BSD_INSTALL_SCRIPT} p1.pl $(DESTDIR)$(BINDIR); \
        fi;
  
++
        @echo ""
-@@ -204,14 +149,14 @@
+       @echo "*** Main program, CGIs and HTML files installed ***"
+       @echo ""
+@@ -213,14 +159,14 @@ install-basic:
  
  
  install-config:
diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/patches/patch-ab
--- a/net/nagios-base/patches/patch-ab  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/patches/patch-ab  Thu Aug 17 14:19:00 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- cgi/Makefile.in.orig       2004-10-25 07:05:54.000000000 +0200
-+++ cgi/Makefile.in    2005-10-14 20:01:42.000000000 +0200
-@@ -12,10 +12,10 @@
+--- cgi/Makefile.in.orig       2006-05-31 01:31:44.000000000 +0900
++++ cgi/Makefile.in
+@@ -12,10 +12,10 @@ SRC_XDATA=../xdata
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -15,15 +15,15 @@
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -191,9 +191,9 @@
- devclean: distclean
+@@ -198,9 +198,9 @@ install-unstripped:
+        $(MAKE) install-basic
  
- install:
+ install-basic:
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 +      [ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR)
        for file in *.cgi; do \
 -              $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
-+              ${BSD_INSTALL_SCRIPT} $$file $(DESTDIR)$(CGIDIR); \
-               $(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
++              $(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \
        done
  
+ strip-post-install:
diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/patches/patch-ac
--- a/net/nagios-base/patches/patch-ac  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/patches/patch-ac  Thu Aug 17 14:19:00 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- base/Makefile.in.orig      2004-12-09 07:48:33.000000000 +0100
-+++ base/Makefile.in   2005-10-14 20:02:10.000000000 +0200
-@@ -26,10 +26,10 @@
+--- base/Makefile.in.orig      2006-05-31 01:31:44.000000000 +0900
++++ base/Makefile.in
+@@ -26,10 +26,10 @@ LIBS=@LIBS@
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -15,13 +15,13 @@
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -181,8 +181,7 @@
- devclean: distclean
+@@ -188,8 +188,7 @@ install-unstripped:
+        $(MAKE) install-basic
  
- install:
+ install-basic:
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
 -      $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
 +      ${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR)
-       $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
        $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-       $(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
+ 
+ strip-post-install:
diff -r 37cc48871c28 -r 5c0ffb03cea4 net/nagios-base/patches/patch-ad
--- a/net/nagios-base/patches/patch-ad  Thu Aug 17 14:16:56 2006 +0000
+++ b/net/nagios-base/patches/patch-ad  Thu Aug 17 14:19:00 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
+$NetBSD: patch-ad,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- html/Makefile.in.orig      2003-04-10 05:46:02.000000000 +0200
-+++ html/Makefile.in   2005-10-14 20:02:37.000000000 +0200
-@@ -4,10 +4,10 @@
+--- html/Makefile.in.orig      2006-05-31 01:31:44.000000000 +0900
++++ html/Makefile.in
+@@ -4,10 +4,10 @@ LDFLAGS=@LDFLAGS@ @LIBS@
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -15,7 +15,7 @@
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -33,39 +33,34 @@
+@@ -33,37 +33,37 @@ distclean: clean
  devclean: distclean
  
  install:
@@ -70,9 +70,7 @@
 +      do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
        for file in images/logos/*.*; \
 -      do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
--
--
--
--
--
 +      do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 
+ install-unstripped:
+       $(MAKE) install
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc - erlang-11.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated lang/erlang, lang/erlang-doc and lang/erla...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc - erlang-11.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated lang/erlang, lang/erlang-doc and lang/erla...
Indexes:
Home | Main Index | Thread Index | Old Index