subject:"nagios update"

nagios update, unbreak -fno-common

2021-02-20 Thread Stuart Henderson

built only, I don't use this. anyone want to test before it goes in?

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile26 Sep 2019 21:59:30 -  1.86
+++ Makefile20 Feb 2021 18:41:11 -
@@ -5,22 +5,20 @@ ONLY_FOR_ARCHS=   ${LP64_ARCHS} # time_t f
 COMMENT-main=  host and service monitor
 COMMENT-web=   cgis and webpages for nagios
 
-V= 4.3.1
+V= 4.4.6
 DISTNAME=  nagios-$V
 PKGNAME-main=  nagios-$V
 PKGNAME-web=   nagios-web-$V
 CATEGORIES=net
-REVISION-main= 1
-REVISION-web=  2
 
-HOMEPAGE=  http://www.nagios.org/
+HOMEPAGE=  https://www.nagios.org/
 
 # GPLv2 only
 PERMIT_PACKAGE=Yes
 
 MULTI_PACKAGES=-main -web
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nagios/}
+MASTER_SITES=  https://assets.nagios.com/downloads/nagioscore/releases/
 
 MODULES=   lang/php
 
@@ -36,7 +34,7 @@ USE_GMAKE=Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--datadir=${PREFIX-web}/nagios \
--libexecdir=${PREFIX}/libexec/nagios \
-   --sbindir=${PREFIX-web}/cgi-bin/nagios \
+   --with-cgibindir=${PREFIX-web}/cgi-bin/nagios \
--with-cgiurl=/cgi-bin/nagios \
--with-checkresult-dir=/var/spool/nagios \
--with-command-group=www \
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo17 Apr 2017 17:29:13 -  1.31
+++ distinfo20 Feb 2021 18:41:11 -
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.3.1.tar.gz) = 38L18UbrUIsqKNKK98M47562BDJ+/cUBQmQgJvfnn4I=
-SIZE (nagios-4.3.1.tar.gz) = 11095797
+SHA256 (nagios-4.4.6.tar.gz) = qw1aUsrwHm9NzYQlLE6131ok+Qu3+VHwOHXu9U9asPQ=
+SIZE (nagios-4.4.6.tar.gz) = 11333414
Index: patches/patch-base_Makefile_in
===
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-base_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-base_Makefile_in
--- patches/patch-base_Makefile_in  7 Nov 2013 10:31:38 -   1.6
+++ patches/patch-base_Makefile_in  20 Feb 2021 18:41:11 -
@@ -1,15 +1,17 @@
 $OpenBSD: patch-base_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
 base/Makefile.in.orig  Wed Oct 16 01:36:42 2013
-+++ base/Makefile.in   Fri Nov  1 17:45:15 2013
-@@ -180,9 +180,8 @@ install-unstripped:
-   $(MAKE) install-basic
+
+Index: base/Makefile.in
+--- base/Makefile.in.orig
 base/Makefile.in
+@@ -173,9 +173,8 @@ devclean: distclean
+   rm -f wpres-phash.h
  
- install-basic:
+ install:
 -  $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--  $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
--  $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+-  $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+-  $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagiostats_name@ 
$(DESTDIR)$(BINDIR)
 +  $(BSD_INSTALL_PROGRAM) @nagios_name@ $(DESTDIR)$(prefix)/sbin
 +  $(BSD_INSTALL_PROGRAM) @nagiostats_name@ $(DESTDIR)$(BINDIR)
  
- strip-post-install:
-   $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
+ install-unstripped:
+   $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -r1.17 patch-configure
--- patches/patch-configure 17 Apr 2017 17:29:13 -  1.17
+++ patches/patch-configure 20 Feb 2021 18:41:11 -
@@ -1,7 +1,9 @@
 $OpenBSD: patch-configure,v 1.17 2017/04/17 17:29:13 rpe Exp $
 configure.orig Fri Apr 14 13:17:17 2017
-+++ configure  Fri Apr 14 13:20:45 2017
-@@ -1085,7 +1085,7 @@ do
+
+Index: configure
+--- configure.orig
 configure
+@@ -1137,7 +1137,7 @@ do
  ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* 
\
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@@ -10,7 +12,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
  
-target | --target | --targe | --targ | --tar | --ta | --t)
  ac_prev=target_alias ;;
-@@ -4775,7 +4775,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -6240,7 +6240,7 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -19,7 +21,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
  
  
  
-@@ -5169,7 +5169,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
+@@ -6671,7 +6671,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
  else
ac_save_LIBS="$LIBS"
@@ -28,16 +30,18 @@ $OpenBSD: patch-configure,v 1.17 2017/04
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /*

nagios update

2015-02-05 Thread Stuart Henderson

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?

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile7 Nov 2014 13:04:02 -   1.71
+++ Makefile5 Feb 2015 13:37:33 -
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.71 2014/11/07 13:04:02 sthen Exp $
 
+ONLY_FOR_ARCHS=${LP64_ARCHS} # time_t format string issues
+
 COMMENT-main=  host and service monitor
 COMMENT-web=   cgis and webpages for nagios
 
-V= 4.0.1
-REVISION-main= 4
-REVISION-web=  2
+V= 4.0.8
 DISTNAME=  nagios-$V
 PKGNAME-main=  nagios-$V
 PKGNAME-web=   nagios-web-$V
@@ -54,7 +54,6 @@ FLAVOR?=
 
 .if ${FLAVOR:Mchroot}
 CHROOT=${VARBASE}/www
-PATCH_LIST=patch-* chroot-*
 .else
 CHROOT=
 .endif
@@ -79,7 +78,7 @@ WANTLIB-main= ${WANTLIB} ltdl=4
 
 NO_TEST=   Yes
 
-CFLAGS+=   -D_DIRENT_HAVE_D_TYPE
+CFLAGS+=   -D_DIRENT_HAVE_D_TYPE -Wformat
 
 EXDIR= ${PREFIX}/share/examples/nagios
 SAMPLEDIR= ${WRKSRC}/sample-config
@@ -87,6 +86,12 @@ MODSAMPLE=   ${WRKINST}${PREFIX-web}/conf/
 
 INSTALL_TARGET=install-unstripped
 SUBST_VARS=CHROOT
+
+.if ${FLAVOR:Mchroot}
+post-extract:
+   @perl -pi -e 
's,physical_html_path=@datadir@,physical_html_path=/nagios,' \
+   ${WRKSRC}/sample-config/cgi.cfg.in
+.endif
 
 post-install:
${INSTALL_DATA_DIR} ${EXDIR}/objects ${MODSAMPLE}
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo7 Nov 2013 10:31:38 -   1.29
+++ distinfo5 Feb 2015 13:37:33 -
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.0.1.tar.gz) = brZxh+8/96adzQKnFydBuM0TOUOYgatRfehrcjfW9zU=
-SIZE (nagios-4.0.1.tar.gz) = 1695367
+SHA256 (nagios-4.0.8.tar.gz) = iyaNJQyXhRd1q+Fi9G9kck+V82fXUq5GMCgMxdNoyks=
+SIZE (nagios-4.0.8.tar.gz) = 1805059
Index: patches/chroot-cgi_Makefile_in
===
RCS file: patches/chroot-cgi_Makefile_in
diff -N patches/chroot-cgi_Makefile_in
--- patches/chroot-cgi_Makefile_in  14 Jan 2013 11:57:44 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: chroot-cgi_Makefile_in,v 1.5 2013/01/14 11:57:44 sthen Exp $
 cgi/Makefile.in.orig   Mon Jan 14 02:24:17 2013
-+++ cgi/Makefile.inMon Jan 14 02:24:18 2013
-@@ -35,8 +35,9 @@ CFLAGS=-Wall @CFLAGS@ @DEFS@ -DNSCGI
- #CFLAGS_WARN=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align 
-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
- #CFLAGS_DEBUG=-ggdb3 -g3
- #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
-+CFLAGS+=-fno-pie
- 
--LDFLAGS=@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/chroot-sample-config_cgi_cfg_in
===
RCS file: patches/chroot-sample-config_cgi_cfg_in
diff -N patches/chroot-sample-config_cgi_cfg_in
--- patches/chroot-sample-config_cgi_cfg_in 25 Jul 2005 16:32:05 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: chroot-sample-config_cgi_cfg_in,v 1.1.1.1 2005/07/25 16:32:05 sturm 
Exp $
 sample-config/cgi.cfg.in.orig  Sun Jan 30 16:45:34 2005
-+++ sample-config/cgi.cfg.in   Sun Jan 30 16:45:56 2005
-@@ -21,7 +21,7 @@
- # value is used to locate the logo images needed by the statusmap
- # and statuswrl CGIs.
- 
--physical_html_path=@datadir@
-+physical_html_path=/nagios
- 
- 
- 
Index: patches/patch-cgi_Makefile_in
===
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-cgi_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-cgi_Makefile_in
--- patches/patch-cgi_Makefile_in   7 Nov 2013 10:31:38 -   1.6
+++ patches/patch-cgi_Makefile_in   5 Feb 2015 13:37:33 -
@@ -1,15 +1,14 @@
 $OpenBSD: patch-cgi_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
 cgi/Makefile.in.orig   Wed Oct 16 01:36:42 2013
-+++ cgi/Makefile.inFri Nov  1 17:45:15 2013
-@@ -182,9 +182,9 @@ install-unstripped:
-   $(MAKE) install-basic
+--- cgi/Makefile.in.orig   Thu Feb  5 13:24:24 2015
 cgi/Makefile.inThu Feb  5 13:24:24 2015
+@@ -36,8 +36,9 @@ JSONFLAGS=-DJSON_NAGIOS_4X
+

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

nagios update

2012-12-12 Thread Stuart Henderson

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 $(DESTDIR)$(HTMLDIR)/side.html
-   for

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

nagios update, unbreak -fno-common

nagios update

Re: nagios update

Re: nagios update

Re: nagios update

nagios update

Re: nagios update

7 matches

Site Navigation

Mail list logo

Footer information