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

update to nagios 4.0.8, ok rpe@

Browse Source 
- tweak www-chroot handling to avoid separate patch files

- mark as ONLY_FOR_ARCHS=${LP64_ARCHS} due to many format string issues
with 64-bit time_t (build with -Wformat so amd64 users get to see them)
This commit is contained in:
sthen 2015-02-05 22:58:24 +00:00
parent 692991673a
commit e0c200b1d4
8 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/nagios/nagios/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.71 2014/11/07 13:04:02 sthen Exp $
# $OpenBSD: Makefile,v 1.72 2015/02/05 22:58:24 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
@ -88,6 +87,12 @@ MODSAMPLE= ${WRKINST}${PREFIX-web}/conf/modules.sample
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}
@perl -i -pe "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${SAMPLEDIR}/httpd.conf

4
net/nagios/nagios/distinfo
View File

@ -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

14
net/nagios/nagios/patches/chroot-cgi_Makefile_in
View File

@ -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.in Mon 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)

12
net/nagios/nagios/patches/chroot-sample-config_cgi_cfg_in
View File

@ -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

25
net/nagios/nagios/patches/patch-cgi_Makefile_in
View File

@ -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.in Fri Nov 1 17:45:15 2013
@@ -182,9 +182,9 @@ install-unstripped:
$(MAKE) install-basic
$OpenBSD: patch-cgi_Makefile_in,v 1.7 2015/02/05 22:58:24 sthen Exp $
--- cgi/Makefile.in.orig Thu Feb 5 13:24:24 2015
+++ cgi/Makefile.in Thu Feb 5 13:24:24 2015
@@ -36,8 +36,9 @@ JSONFLAGS=-DJSON_NAGIOS_4X
#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
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(BSD_INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIDIR); \
done
-LDFLAGS=@LDFLAGS@
+LDFLAGS=-static -nopie @LDFLAGS@
LIBS=@LIBS@
strip-post-install:
CGIS=archivejson.cgi avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi objectjson.cgi outages.cgi showlog.cgi status.cgi statusjson.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)

24
net/nagios/nagios/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $
--- configure.orig Wed Oct 16 01:36:42 2013
+++ configure Fri Nov 1 17:47:13 2013
@@ -1077,7 +1077,7 @@ do
$OpenBSD: patch-configure,v 1.16 2015/02/05 22:58:24 sthen Exp $
--- configure.orig Tue Jun 3 15:41:42 2014
+++ configure Mon Aug 11 12:59:30 2014
@@ -1094,7 +1094,7 @@ do
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target_alias ;;
@@ -4633,7 +4633,7 @@ cat >>confdefs.h <<_ACEOF
@@ -6014,7 +6014,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
_ACEOF
@ -19,16 +19,16 @@ $OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $
@@ -4890,7 +4890,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
@@ -6701,7 +6701,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd -lttf -lpng -ljpeg -lz -lm $LIBS"
+ LIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4921,7 +4921,7 @@ fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6761,7 +6761,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@ -36,8 +36,8 @@ $OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $
+ GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -5432,9 +5432,9 @@ $as_echo_n "checking for linker flags for loadable mod
{ $as_echo "$as_me:$LINENO: result: no" >&5
@@ -7766,9 +7766,9 @@ $as_echo_n "checking for linker flags for loadable mod
MOD_LDFLAGS="-shared"
MOD_CFLAGS="-fPIC"
;;

12
net/nagios/nagios/patches/patch-lib_runcmd_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_runcmd_c,v 1.1 2015/02/05 22:58:24 sthen Exp $
--- lib/runcmd.c.orig Thu Feb 5 13:03:13 2015
+++ lib/runcmd.c Thu Feb 5 13:04:05 2015
@@ -36,7 +36,7 @@
#endif
/* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */
-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
+#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || __OpenBSD__
# define HAVE_SETENV
#endif

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

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-web,v 1.8 2013/05/05 22:13:48 rpe Exp $
@comment $OpenBSD: PLIST-web,v 1.9 2015/02/05 22:58:24 sthen Exp $
cgi-bin/nagios/
@bin cgi-bin/nagios/archivejson.cgi
@bin cgi-bin/nagios/avail.cgi
@bin cgi-bin/nagios/cmd.cgi
@bin cgi-bin/nagios/config.cgi
@ -7,9 +8,11 @@ cgi-bin/nagios/
@bin cgi-bin/nagios/histogram.cgi
@bin cgi-bin/nagios/history.cgi
@bin cgi-bin/nagios/notifications.cgi
@bin cgi-bin/nagios/objectjson.cgi
@bin cgi-bin/nagios/outages.cgi
@bin cgi-bin/nagios/showlog.cgi
@bin cgi-bin/nagios/status.cgi
@bin cgi-bin/nagios/statusjson.cgi
@bin cgi-bin/nagios/statusmap.cgi
@bin cgi-bin/nagios/statuswml.cgi
@bin cgi-bin/nagios/statuswrl.cgi
@ -352,10 +355,15 @@ nagios/includes/utils.inc.php
nagios/index.php
nagios/js/
nagios/js/jquery-1.7.1.min.js
nagios/js/jsonquery.js
nagios/jsonquery.html
nagios/main.php
nagios/media/
nagios/robots.txt
nagios/rss-corebanner.php
nagios/rss-corefeed.html
nagios/rss-corefeed.php
nagios/rss-newsfeed.html
nagios/rss-newsfeed.php
nagios/side.php
nagios/ssi/
@ -368,6 +376,7 @@ nagios/stylesheets/config.css
nagios/stylesheets/extinfo.css
nagios/stylesheets/histogram.css
nagios/stylesheets/history.css
nagios/stylesheets/jsonquery.css
nagios/stylesheets/ministatus.css
nagios/stylesheets/notifications.css
nagios/stylesheets/outages.css