Re: nagios update

2015-02-05 Thread Robert Peichaer
On Thu, Feb 05, 2015 at 01:38:23PM +, Stuart Henderson wrote:
 Somewhat overdue, this has various memory lack/crash/hang/security fixes.
 Also rework the chroot handling to avoid separate patches.
 
 Lots of time_t format string issues, I already got bored of fixing those
 after handling them in Icinga and I don't wish to spend that much time on
 Nagios so let's mark it ONLY_FOR_ARCHS=${LP64_ARCHS}.
 
 I've only very lightly tested it, if there's anyone still running this
 would you like to give it a spin?

OK rpe@ 



Re: nagios update

2012-12-17 Thread vsankar

On Wed, 12 Dec 2012 22:49:47 +, Stuart Henderson wrote:

anyone reading still using nagios on OpenBSD?  please test and
report back.  it compiles ;)

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile28 Apr 2012 10:51:44 -  1.52
+++ Makefile12 Dec 2012 22:47:08 -
@@ -3,11 +3,10 @@
 COMMENT-main=  host and service monitor
 COMMENT-web=   cgis and webpages for nagios

-V= 3.3.1
+V= 3.4.3
 DISTNAME=  nagios-$V
 PKGNAME-main=  nagios-$V
 PKGNAME-web=   nagios-web-$V
-REVISION=  2
 WRKDIST=   ${WRKDIR}/nagios
 CATEGORIES=net

Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo5 Sep 2011 14:56:45 -   1.25
+++ distinfo12 Dec 2012 22:47:08 -
@@ -1,5 +1,2 @@
-MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
-RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
-SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
-SHA256 (nagios-3.3.1.tar.gz) = 
xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=

-SIZE (nagios-3.3.1.tar.gz) = 1714630
+SHA256 (nagios-3.4.3.tar.gz) = 
LVwMxWuvsIpxhApu+jSa/B7rsnYf6g1APhuSnnyAGxA=

+SIZE (nagios-3.4.3.tar.gz) = 1784746
Index: patches/chroot-cgi_Makefile_in
===
RCS file: 
/cvs/ports/net/nagios/nagios/patches/chroot-cgi_Makefile_in,v

retrieving revision 1.3
diff -u -p -r1.3 chroot-cgi_Makefile_in
--- patches/chroot-cgi_Makefile_in  12 Sep 2009 12:35:20 -  1.3
+++ patches/chroot-cgi_Makefile_in  12 Dec 2012 22:47:08 -
@@ -1,11 +1,12 @@
 --- cgi/Makefile.in.orig   Thu Sep 10 07:17:08 2009
 +++ cgi/Makefile.inThu Sep 10 07:17:33 2009
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,8 @@
  #CFLAGS_DEBUG=-ggdb3 -g3
  #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
++CFLAGS+=-fno-pie

 -LDFLAGS=@LDFLAGS@
-+LDFLAGS=-static @LDFLAGS@
++LDFLAGS=-static -nopie @LDFLAGS@
  LIBS=@LIBS@

  CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi
notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi
summary.cgi tac.cgi $(CGIEXTRAS)
Index: patches/patch-html_Makefile_in
===
RCS file: patches/patch-html_Makefile_in
diff -N patches/patch-html_Makefile_in
--- patches/patch-html_Makefile_in  5 Sep 2011 14:56:46 -   1.7
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,85 +0,0 @@
-$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp 
$

 html/Makefile.in.orig  Sun Jul 24 18:53:52 2011
-+++ html/Makefile.in   Tue Jul 26 14:02:08 2011
-@@ -33,52 +33,52 @@ distclean: clean
- devclean: distclean
-
- install:
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
$(DESTDIR)$(HTMLDIR)/stylesheets
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
$(DESTDIR)$(HTMLDIR)/contexthelp

--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
$(DESTDIR)$(HTMLDIR)/docs/images

--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
$(DESTDIR)$(HTMLDIR)/images/logos

--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
$(DESTDIR)$(HTMLDIR)/includes/rss

--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d
$(DESTDIR)$(HTMLDIR)/includes/rss/extlib
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
--  $(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)/stylesheets
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
-+  $(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
-+# $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- # Remove old HTML files (PHP files are used now)
-   rm -f $(DESTDIR)$(HTMLDIR)/index.html
-   rm -f $(DESTDIR)$(HTMLDIR)/main.html
-   rm -f 

Re: nagios update

2012-12-13 Thread Marc Peters
On 12/12/2012 11:49 PM, Stuart Henderson wrote:
 anyone reading still using nagios on OpenBSD?  please test and
 report back.  it compiles ;)
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
 retrieving revision 1.52
 diff -u -p -r1.52 Makefile
 --- Makefile  28 Apr 2012 10:51:44 -  1.52
 +++ Makefile  12 Dec 2012 22:47:08 -
 @@ -3,11 +3,10 @@
  COMMENT-main=host and service monitor
  COMMENT-web= cgis and webpages for nagios
  
 -V=   3.3.1
 +V=   3.4.3
  DISTNAME=nagios-$V
  PKGNAME-main=nagios-$V
  PKGNAME-web= nagios-web-$V
 -REVISION=2
  WRKDIST= ${WRKDIR}/nagios
  CATEGORIES=  net
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
 retrieving revision 1.25
 diff -u -p -r1.25 distinfo
 --- distinfo  5 Sep 2011 14:56:45 -   1.25
 +++ distinfo  12 Dec 2012 22:47:08 -
 @@ -1,5 +1,2 @@
 -MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
 -RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
 -SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
 -SHA256 (nagios-3.3.1.tar.gz) = xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=
 -SIZE (nagios-3.3.1.tar.gz) = 1714630
 +SHA256 (nagios-3.4.3.tar.gz) = LVwMxWuvsIpxhApu+jSa/B7rsnYf6g1APhuSnnyAGxA=
 +SIZE (nagios-3.4.3.tar.gz) = 1784746
 Index: patches/chroot-cgi_Makefile_in
 ===
 RCS file: /cvs/ports/net/nagios/nagios/patches/chroot-cgi_Makefile_in,v
 retrieving revision 1.3
 diff -u -p -r1.3 chroot-cgi_Makefile_in
 --- patches/chroot-cgi_Makefile_in12 Sep 2009 12:35:20 -  1.3
 +++ patches/chroot-cgi_Makefile_in12 Dec 2012 22:47:08 -
 @@ -1,11 +1,12 @@
  --- cgi/Makefile.in.orig Thu Sep 10 07:17:08 2009
  +++ cgi/Makefile.in  Thu Sep 10 07:17:33 2009
 -@@ -36,7 +36,7 @@
 +@@ -36,7 +36,8 @@
   #CFLAGS_DEBUG=-ggdb3 -g3
   #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
 ++CFLAGS+=-fno-pie
   
  -LDFLAGS=@LDFLAGS@
 -+LDFLAGS=-static @LDFLAGS@
 ++LDFLAGS=-static -nopie @LDFLAGS@
   LIBS=@LIBS@
   
   CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi 
 outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi 
 $(CGIEXTRAS)
 Index: patches/patch-html_Makefile_in
 ===
 RCS file: patches/patch-html_Makefile_in
 diff -N patches/patch-html_Makefile_in
 --- patches/patch-html_Makefile_in5 Sep 2011 14:56:46 -   1.7
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,85 +0,0 @@
 -$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
  html/Makefile.in.origSun Jul 24 18:53:52 2011
 -+++ html/Makefile.in Tue Jul 26 14:02:08 2011
 -@@ -33,52 +33,52 @@ distclean: clean
 - devclean: distclean
 - 
 - install:
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
 $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 --$(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)/stylesheets
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
 -+$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
 -+#   $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
 - # Remove old HTML files (PHP files are used now)
 - rm -f $(DESTDIR)$(HTMLDIR)/index.html
 - rm -f 

Re: nagios update

2012-12-12 Thread Vijay Sankar

Quoting Stuart Henderson s...@spacehopper.org:


anyone reading still using nagios on OpenBSD?  please test and
report back.  it compiles ;)

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile28 Apr 2012 10:51:44 -  1.52
+++ Makefile12 Dec 2012 22:47:08 -
@@ -3,11 +3,10 @@
 COMMENT-main=  host and service monitor
 COMMENT-web=   cgis and webpages for nagios

-V= 3.3.1
+V= 3.4.3
 DISTNAME=  nagios-$V
 PKGNAME-main=  nagios-$V
 PKGNAME-web=   nagios-web-$V
-REVISION=  2
 WRKDIST=   ${WRKDIR}/nagios
 CATEGORIES=net

Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo5 Sep 2011 14:56:45 -   1.25
+++ distinfo12 Dec 2012 22:47:08 -
@@ -1,5 +1,2 @@
-MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
-RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
-SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
-SHA256 (nagios-3.3.1.tar.gz) = xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=
-SIZE (nagios-3.3.1.tar.gz) = 1714630
+SHA256 (nagios-3.4.3.tar.gz) = LVwMxWuvsIpxhApu+jSa/B7rsnYf6g1APhuSnnyAGxA=
+SIZE (nagios-3.4.3.tar.gz) = 1784746
Index: patches/chroot-cgi_Makefile_in
===
RCS file: /cvs/ports/net/nagios/nagios/patches/chroot-cgi_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 chroot-cgi_Makefile_in
--- patches/chroot-cgi_Makefile_in  12 Sep 2009 12:35:20 -  1.3
+++ patches/chroot-cgi_Makefile_in  12 Dec 2012 22:47:08 -
@@ -1,11 +1,12 @@
 --- cgi/Makefile.in.orig   Thu Sep 10 07:17:08 2009
 +++ cgi/Makefile.inThu Sep 10 07:17:33 2009
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,8 @@
  #CFLAGS_DEBUG=-ggdb3 -g3
  #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
++CFLAGS+=-fno-pie

 -LDFLAGS=@LDFLAGS@
-+LDFLAGS=-static @LDFLAGS@
++LDFLAGS=-static -nopie @LDFLAGS@
  LIBS=@LIBS@

  CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi  
notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi  
summary.cgi tac.cgi $(CGIEXTRAS)

Index: patches/patch-html_Makefile_in
===
RCS file: patches/patch-html_Makefile_in
diff -N patches/patch-html_Makefile_in
--- patches/patch-html_Makefile_in  5 Sep 2011 14:56:46 -   1.7
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,85 +0,0 @@
-$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
 html/Makefile.in.orig  Sun Jul 24 18:53:52 2011
-+++ html/Makefile.in   Tue Jul 26 14:02:08 2011
-@@ -33,52 +33,52 @@ distclean: clean
- devclean: distclean
-
- install:
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d  
$(DESTDIR)$(HTMLDIR)/includes/rss/extlib

--  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
--  $(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)/stylesheets
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-+  $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
-+  $(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
-+# $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- # Remove old HTML files (PHP files are used now)
-   rm -f $(DESTDIR)$(HTMLDIR)/index.html
-   rm -f $(DESTDIR)$(HTMLDIR)/main.html
-   rm -f