cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nagios 3.0.5

Browse Source
This commit is contained in:
sturm 2008-11-09 10:18:56 +00:00
parent b165889136
commit 5f8ea9aa83
8 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/nagios/nagios/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2008/10/26 15:03:11 sthen Exp $
# $OpenBSD: Makefile,v 1.32 2008/11/09 10:18:56 sturm Exp $
COMMENT-main= host and service monitor
COMMENT-web= cgis and webpages for nagios
V= 3.0.4
V= 3.0.5
DISTNAME= nagios-${V}
PKGNAME-main= nagios-${V}
PKGNAME-web= nagios-web-${V}

10
net/nagios/nagios/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nagios-3.0.4.tar.gz) = wU+AmUiAFLHw43aZRI0KXA==
RMD160 (nagios-3.0.4.tar.gz) = c4Yu9aG292cH2rdjTJdGbEGjMuY=
SHA1 (nagios-3.0.4.tar.gz) = obI5lEsnxDROEfbbZhoOTpq58Ik=
SHA256 (nagios-3.0.4.tar.gz) = W0UxMiUwxYZoddpBlE7pEYaf5VxosgIOz22biekpkpg=
SIZE (nagios-3.0.4.tar.gz) = 2760530
MD5 (nagios-3.0.5.tar.gz) = xgf/1fRXTL6jRb3y4C3EgA==
RMD160 (nagios-3.0.5.tar.gz) = wnsbTrJVjMejR+RbIPKxrqrIDKI=
SHA1 (nagios-3.0.5.tar.gz) = mEfOwnuryL2lKTZtg7H7QHtqRAI=
SHA256 (nagios-3.0.5.tar.gz) = dU7f3AjKXh8diNAqRO6lPVzz6Kzvas8stpig/yGdDMk=
SIZE (nagios-3.0.5.tar.gz) = 2735018

12
net/nagios/nagios/patches/patch-base_utils_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-base_utils_c,v 1.3 2008/10/26 15:03:11 sthen Exp $
--- base/utils.c.orig Wed Oct 15 17:43:55 2008
+++ base/utils.c Wed Oct 22 20:03:01 2008
@@ -3485,7 +3485,7 @@ char *mmap_fgets_multiline(mmapfile *temp_mmapfile){
}
/* one backslash found, so we should continue reading the next line */
- else if(buf[end]=='\\')
+ else if(end>=0 && buf[end]=='\\')
buf[end]='\x0';
/* else no continuation marker was found, so break */

12
net/nagios/nagios/patches/patch-cgi_cgiutils_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cgi_cgiutils_c,v 1.4 2008/10/26 15:03:11 sthen Exp $
--- cgi/cgiutils.c.orig Wed Oct 15 22:40:07 2008
+++ cgi/cgiutils.c Wed Oct 22 20:03:01 2008
@@ -1289,7 +1289,7 @@ char *mmap_fgets_multiline(mmapfile *temp_mmapfile){
}
/* one backslash found, so we should continue reading the next line */
- else if(buf[end]=='\\')
+ else if(end>=0 && buf[end]=='\\')
buf[end]='\x0';
/* else no continuation marker was found, so break */

10
net/nagios/nagios/patches/patch-html_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-html_Makefile_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
$OpenBSD: patch-html_Makefile_in,v 1.5 2008/11/09 10:18:56 sturm Exp $
--- html/Makefile.in.orig Wed Jan 9 18:51:25 2008
+++ html/Makefile.in Sat Mar 15 19:53:53 2008
@@ -33,39 +33,39 @@ distclean: clean
@ -17,7 +17,7 @@ $OpenBSD: patch-html_Makefile_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
+# $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
@ -30,9 +30,9 @@ $OpenBSD: patch-html_Makefile_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
for file in *.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
for file in media/*.wav; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
# for file in media/*.wav; \
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+# do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done

10
net/nagios/nagios/patches/patch-include_config_h_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-include_config_h_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
--- include/config.h.in.orig Sat Nov 10 23:54:37 2007
+++ include/config.h.in Mon Dec 10 19:52:04 2007
@@ -132,11 +132,6 @@
$OpenBSD: patch-include_config_h_in,v 1.5 2008/11/09 10:18:56 sturm Exp $
--- include/config.h.in.orig Sun Nov 2 11:51:30 2008
+++ include/config.h.in Sun Nov 9 02:12:21 2008
@@ -124,11 +124,6 @@
#endif
#endif
@ -13,7 +13,7 @@ $OpenBSD: patch-include_config_h_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
#undef HAVE_LIMITS_H
#ifdef HAVE_LIMITS_H
#include <limits.h>
@@ -225,6 +220,11 @@
@@ -217,6 +212,11 @@
#undef HAVE_SYS_TIMEB_H
#if HAVE_SYS_TIMEB_H
#include <sys/timeb.h>

6
net/nagios/nagios/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2008/07/01 06:03:58 sturm Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2008/11/09 10:18:56 sturm Exp $
@pkgpath ${BASE_PKGPATH}
@newgroup _nagios:550
@newuser _nagios:550:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
@ -43,6 +43,8 @@ share/examples/nagios/resource.cfg
@group
@sample /var/www/nagios/
%%chroot%%
@extraunexec rm -f ${CHROOT}${SYSCONFDIR}/nagios/*
@extraunexec rm -f ${CHROOT}/var/log/nagios/archives/*
@extra ${CHROOT}/var/log/nagios/nagios.log
@extra ${CHROOT}/var/nagios/comments.dat
@extra ${CHROOT}/var/nagios/downtime.dat
@ -50,5 +52,3 @@ share/examples/nagios/resource.cfg
@extra ${CHROOT}/var/nagios/retention.dat
@extra ${CHROOT}/var/nagios/status.dat
@extra ${CHROOT}/var/nagios/rw/nagios.cmd
@extraunexec rm -f ${CHROOT}${SYSCONFDIR}/nagios/*
@extraunexec rm -f ${CHROOT}/var/log/nagios/archives/*

7
net/nagios/nagios/pkg/PLIST-web
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.3 2008/07/01 06:03:58 sturm Exp $
@comment $OpenBSD: PLIST-web,v 1.4 2008/11/09 10:18:56 sturm Exp $
cgi-bin/nagios/
@bin cgi-bin/nagios/avail.cgi
@bin cgi-bin/nagios/cmd.cgi
@ -90,6 +90,7 @@ nagios/docs/cachedchecks.html
nagios/docs/cgiauth.html
nagios/docs/cgiincludes.html
nagios/docs/cgis.html
nagios/docs/cgisecurity.html
nagios/docs/checkscheduling.html
nagios/docs/clusters.html
nagios/docs/config.html
@ -333,10 +334,6 @@ nagios/images/zoom1.gif
nagios/images/zoom2.gif
nagios/index.html
nagios/main.html
nagios/media/
nagios/media/critical.wav
nagios/media/hostdown.wav
nagios/media/warning.wav
nagios/robots.txt
nagios/side.html
nagios/ssi/