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

Bugfix update to Icinga 1.8.2, including

Browse Source 
- fix bug in classic UI for ack's and notifications
- fix performance problem and some memory leaks with IDOUtils

https://wiki.icinga.org/display/Dev/Icinga+Core+Changelog#IcingaCoreChangelog-182-28112012

Also fix static cgi binaries on PIE architectures.
This commit is contained in:
sthen 2012-11-29 22:34:16 +00:00
parent 2579ec6a8a
commit 54b1c3f74d
6 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/icinga/core/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.37 2012/10/25 18:42:32 sthen Exp $ # $OpenBSD: Makefile,v 1.38 2012/11/29 22:34:16 sthen Exp $
V = 1.8.1 V = 1.8.2
COMMENT-main = network monitoring system (improved fork of Nagios) COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI) COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)

4
net/icinga/core/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (icinga-1.8.1.tar.gz) = PQLYC978JRirhRe+aTClGLd3R+AkP6WUcx+x+V26uRY= SHA256 (icinga-1.8.2.tar.gz) = ObaahnaJXPRY+3Gi6+dYBupgFL/2rAmHHzMPKTpt4Mk=
SIZE (icinga-1.8.1.tar.gz) = 7543668 SIZE (icinga-1.8.2.tar.gz) = 7458441

8
net/icinga/core/patches/patch-Changelog
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Changelog,v 1.2 2012/10/25 18:42:32 sthen Exp $ $OpenBSD: patch-Changelog,v 1.3 2012/11/29 22:34:16 sthen Exp $
--- Changelog.orig Wed Oct 24 23:21:44 2012 --- Changelog.orig Wed Nov 28 15:14:51 2012
+++ Changelog Thu Oct 25 18:09:24 2012 +++ Changelog Thu Nov 29 22:24:42 2012
@@ -7,10 +7,9 @@ Thanks to all contributers, testers and developers. Pl @@ -7,10 +7,9 @@ Thanks to all contributers, testers and developers. Pl
UPGRADE NOTES UPGRADE NOTES
@ -12,5 +12,5 @@ $OpenBSD: patch-Changelog,v 1.2 2012/10/25 18:42:32 sthen Exp $
- - idoutils: module/idoutils/config/updates - - idoutils: module/idoutils/config/updates
+ - ${TRUEPREFIX}/share/examples/icinga/updates/ + - ${TRUEPREFIX}/share/examples/icinga/updates/
1.8.1 - 25/10/2012 1.8.2 - 28/11/2012

12
net/icinga/core/patches/patch-cgi_Makefile_in
View File

@ -1,15 +1,17 @@
$OpenBSD: patch-cgi_Makefile_in,v 1.4 2012/10/18 20:04:58 sthen Exp $ $OpenBSD: patch-cgi_Makefile_in,v 1.5 2012/11/29 22:34:16 sthen Exp $
Allows for simpler use in a chroot jail Allows for simpler use in a chroot jail
--- cgi/Makefile.in.orig Wed Oct 17 11:38:03 2012 --- cgi/Makefile.in.orig Wed Nov 28 15:14:51 2012
+++ cgi/Makefile.in Thu Oct 18 13:36:58 2012 +++ cgi/Makefile.in Thu Nov 29 22:24:42 2012
@@ -40,7 +40,7 @@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI @@ -39,8 +39,9 @@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
#CFLAGS_WARN=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
#CFLAGS_DEBUG=-ggdb3 -g3 #CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG) #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
+CFLAGS+=-fno-pie
-LDFLAGS=@LDFLAGS@ -LDFLAGS=@LDFLAGS@
+LDFLAGS=-static @LDFLAGS@ +LDFLAGS=-static -nopie @LDFLAGS@
LIBS=@LIBS@ LIBS=@LIBS@
CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi summary.cgi tac.cgi $(CGIEXTRAS) CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi summary.cgi tac.cgi $(CGIEXTRAS)

8
net/icinga/core/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.7 2012/10/18 20:04:58 sthen Exp $ $OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
--- configure.orig Wed Oct 17 11:38:03 2012 --- configure.orig Wed Nov 28 15:14:51 2012
+++ configure Thu Oct 18 13:36:58 2012 +++ configure Thu Nov 29 22:24:42 2012
@@ -5189,7 +5189,7 @@ cat >>confdefs.h <<_ACEOF @@ -5189,7 +5189,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$icinga_grp" #define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF _ACEOF
@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.7 2012/10/18 20:04:58 sthen Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7057,7 +7057,7 @@ $as_echo_n "checking for SSL libraries... " >&6; } @@ -7057,7 +7057,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
found_ssl=no found_ssl=no
for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do
ssllibdir="$dir" ssllibdir="$dir"
- if test -f "$dir/libssl.so"; then - if test -f "$dir/libssl.so"; then
+ if test -f "$dir/libssl.a"; then + if test -f "$dir/libssl.a"; then

10
net/icinga/core/patches/patch-sample-config_icinga_cfg_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.7 2012/10/18 20:04:58 sthen Exp $ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.8 2012/11/29 22:34:16 sthen Exp $
--- sample-config/icinga.cfg.in.orig Wed Oct 17 11:38:03 2012 --- sample-config/icinga.cfg.in.orig Wed Nov 28 15:14:51 2012
+++ sample-config/icinga.cfg.in Thu Oct 18 13:36:58 2012 +++ sample-config/icinga.cfg.in Thu Nov 29 22:24:43 2012
@@ -1283,7 +1283,7 @@ enable_embedded_perl=0 @@ -1297,7 +1297,7 @@ enable_embedded_perl=0
# the HTML documentation on the embedded Perl interpreter for more # the HTML documentation on the embedded Perl interpreter for more
# information on how this option works. # information on how this option works.
@ -10,7 +10,7 @@ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.7 2012/10/18 20:04:58 sthen Exp
@@ -1382,8 +1382,8 @@ use_true_regexp_matching=0 @@ -1396,8 +1396,8 @@ use_true_regexp_matching=0
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands. # commands.