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

update to icinga-1.14.2

Browse Source 
* Note: Icinga 1 is now EOL and only receives security updates.
This commit is contained in:
sthen 2017-12-20 15:11:32 +00:00
parent c9f26061c2
commit bdbc58452d
7 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/icinga/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.94 2017/02/07 21:40:06 sthen Exp $
# $OpenBSD: Makefile,v 1.95 2017/12/20 15:11:32 sthen Exp $
COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
@ -6,7 +6,7 @@ COMMENT-ido = store Icinga configuration and events in a database
GH_ACCOUNT = Icinga
GH_PROJECT= icinga-core
GH_TAGNAME = v1.14.0
GH_TAGNAME = v1.14.2
PKGNAME-main = icinga-${GH_TAGNAME:S/v//}
PKGNAME-cgi = icinga-cgi-${GH_TAGNAME:S/v//}
PKGNAME-ido = icinga-idoutils-${GH_TAGNAME:S/v//}
@ -65,8 +65,7 @@ CONFIGURE_ARGS += \
CFLAGS += -Wformat -fPIC -I${LOCALBASE}/include \
-L${X11BASE}/lib -L${LOCALBASE}/lib
INSTALL_TARGET = install-unstripped install-idoutils install-config \
install-webconf
INSTALL_TARGET = install install-idoutils install-config install-webconf
# perl tests work; C tests fail if embedded-perl is enabled
TEST_TARGET = test

4
net/icinga/core/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (icinga-core-1.14.0.tar.gz) = RA1rBZaATN+yHtk7T3RZKhROfZ7hXMiLMHknbLA3CFE=
SIZE (icinga-core-1.14.0.tar.gz) = 20779347
SHA256 (icinga-core-1.14.2.tar.gz) = 7FBimdG4+9+aJGo5FYu/KVZxaqEZutADRH20TnuPLRc=
SIZE (icinga-core-1.14.2.tar.gz) = 20779284

23
net/icinga/core/patches/patch-base_checks_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
--- base/checks.c.orig Thu Dec 22 21:40:50 2016
+++ base/checks.c Tue Feb 7 21:24:21 2017
@@ -683,7 +683,7 @@ int run_async_service_check(service *svc, int check_op
$OpenBSD: patch-base_checks_c,v 1.4 2017/12/20 15:11:32 sthen Exp $
Index: base/checks.c
--- base/checks.c.orig
+++ base/checks.c
@@ -685,7 +685,7 @@ int run_async_service_check(service *svc, int check_op
fprintf(check_result_info.output_file_fp, "scheduled_check=%d\n", check_result_info.scheduled_check);
fprintf(check_result_info.output_file_fp, "reschedule_check=%d\n", check_result_info.reschedule_check);
fprintf(check_result_info.output_file_fp, "latency=%f\n", svc->latency);
@ -10,7 +11,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
/* flush output or it'll get written again when we fork() */
fflush(check_result_info.output_file_fp);
@@ -774,7 +774,7 @@ int run_async_service_check(service *svc, int check_op
@@ -776,7 +776,7 @@ int run_async_service_check(service *svc, int check_op
/* write check result to file */
if (check_result_info.output_file_fp) {
@ -19,7 +20,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
fprintf(check_result_info.output_file_fp, "early_timeout=%d\n", check_result_info.early_timeout);
fprintf(check_result_info.output_file_fp, "exited_ok=%d\n", check_result_info.exited_ok);
fprintf(check_result_info.output_file_fp, "return_code=%d\n", check_result_info.return_code);
@@ -917,7 +917,7 @@ int run_async_service_check(service *svc, int check_op
@@ -919,7 +919,7 @@ int run_async_service_check(service *svc, int check_op
/* write check result to file */
if (check_result_info.output_file_fp) {
@ -28,7 +29,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
fprintf(check_result_info.output_file_fp, "early_timeout=%d\n", check_result_info.early_timeout);
fprintf(check_result_info.output_file_fp, "exited_ok=%d\n", check_result_info.exited_ok);
fprintf(check_result_info.output_file_fp, "return_code=%d\n", check_result_info.return_code);
@@ -976,7 +976,7 @@ int run_async_service_check(service *svc, int check_op
@@ -978,7 +978,7 @@ int run_async_service_check(service *svc, int check_op
fp = check_result_info.output_file_fp;
check_result_info.output_file_fp = NULL;
@ -37,7 +38,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
fprintf(fp, "early_timeout=%d\n", check_result_info.early_timeout);
fprintf(fp, "exited_ok=%d\n", check_result_info.exited_ok);
fprintf(fp, "return_code=%d\n", check_result_info.return_code);
@@ -2172,9 +2172,9 @@ void check_for_orphaned_services(void) {
@@ -2177,9 +2177,9 @@ void check_for_orphaned_services(void) {
log_debug_info(DEBUGL_CHECKS, 1, "Service '%s' on host '%s' was orphaned, so we're scheduling an immediate check...\n", temp_service->description, temp_service->host_name);
if (log_level(DEBUGL_CHECKS, 1))
@ -50,7 +51,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
/* decrement the number of running service checks */
if (currently_running_service_checks > 0)
@@ -3303,7 +3303,7 @@ int run_async_host_check_3x(host *hst, int check_optio
@@ -3308,7 +3308,7 @@ int run_async_host_check_3x(host *hst, int check_optio
fprintf(check_result_info.output_file_fp, "scheduled_check=%d\n", check_result_info.scheduled_check);
fprintf(check_result_info.output_file_fp, "reschedule_check=%d\n", check_result_info.reschedule_check);
fprintf(check_result_info.output_file_fp, "latency=%f\n", hst->latency);
@ -59,7 +60,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
/* flush buffer or we'll end up writing twice when we fork() */
fflush(check_result_info.output_file_fp);
@@ -3414,7 +3414,7 @@ int run_async_host_check_3x(host *hst, int check_optio
@@ -3419,7 +3419,7 @@ int run_async_host_check_3x(host *hst, int check_optio
fp = check_result_info.output_file_fp;
check_result_info.output_file_fp = NULL;
@ -68,7 +69,7 @@ $OpenBSD: patch-base_checks_c,v 1.3 2017/02/07 21:40:06 sthen Exp $
fprintf(fp, "early_timeout=%d\n", check_result_info.early_timeout);
fprintf(fp, "exited_ok=%d\n", check_result_info.exited_ok);
fprintf(fp, "return_code=%d\n", check_result_info.return_code);
@@ -4150,7 +4150,7 @@ int process_host_check_result_3x(host *hst, int new_st
@@ -4155,7 +4155,7 @@ int process_host_check_result_3x(host *hst, int new_st
run_async_check = TRUE;
temp_host = (host *)hostlist_item->object_ptr;

11
net/icinga/core/patches/patch-base_utils_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-base_utils_c,v 1.5 2015/07/15 20:10:58 sthen Exp $
--- base/utils.c.orig Wed Jul 15 12:04:09 2015
+++ base/utils.c Wed Jul 15 17:12:40 2015
@@ -2410,7 +2410,7 @@ void service_check_sighandler(int sig) {
$OpenBSD: patch-base_utils_c,v 1.6 2017/12/20 15:11:32 sthen Exp $
Index: base/utils.c
--- base/utils.c.orig
+++ base/utils.c
@@ -2412,7 +2412,7 @@ void service_check_sighandler(int sig) {
/* write check result to file */
if (check_result_info.output_file_fp) {
@ -10,7 +11,7 @@ $OpenBSD: patch-base_utils_c,v 1.5 2015/07/15 20:10:58 sthen Exp $
fprintf(check_result_info.output_file_fp, "early_timeout=%d\n", check_result_info.early_timeout);
fprintf(check_result_info.output_file_fp, "exited_ok=%d\n", check_result_info.exited_ok);
fprintf(check_result_info.output_file_fp, "return_code=%d\n", check_result_info.return_code);
@@ -2450,7 +2450,7 @@ void host_check_sighandler(int sig) {
@@ -2452,7 +2452,7 @@ void host_check_sighandler(int sig) {
/* write check result to file */
if (check_result_info.output_file_fp) {

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

@ -1,10 +1,11 @@
$OpenBSD: patch-cgi_Makefile_in,v 1.7 2013/10/25 16:16:23 sthen Exp $
$OpenBSD: patch-cgi_Makefile_in,v 1.8 2017/12/20 15:11:32 sthen Exp $
Allows for simpler use in a chroot jail
--- cgi/Makefile.in.orig Tue Oct 22 10:40:32 2013
+++ cgi/Makefile.in Fri Oct 25 00:29:23 2013
@@ -51,7 +51,7 @@ endif
Index: cgi/Makefile.in
--- cgi/Makefile.in.orig
+++ cgi/Makefile.in
@@ -50,7 +50,7 @@ endif
#CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)

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

@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.16 2015/07/15 20:10:58 sthen Exp $
--- configure.orig Mon Mar 30 09:38:53 2015
+++ configure Mon Mar 30 23:28:35 2015
@@ -5245,7 +5245,7 @@ cat >>confdefs.h <<_ACEOF
$OpenBSD: patch-configure,v 1.17 2017/12/20 15:11:32 sthen Exp $
Index: configure
--- configure.orig
+++ configure
@@ -5215,7 +5215,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF
@ -10,7 +11,7 @@ $OpenBSD: patch-configure,v 1.16 2015/07/15 20:10:58 sthen Exp $
@@ -5266,7 +5266,7 @@ fi
@@ -5236,7 +5236,7 @@ fi
@ -19,7 +20,7 @@ $OpenBSD: patch-configure,v 1.16 2015/07/15 20:10:58 sthen Exp $
@@ -6018,7 +6018,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
@@ -5988,7 +5988,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@ -28,7 +29,7 @@ $OpenBSD: patch-configure,v 1.16 2015/07/15 20:10:58 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -6049,7 +6049,7 @@ fi
@@ -6019,7 +6019,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@ -37,7 +38,7 @@ $OpenBSD: patch-configure,v 1.16 2015/07/15 20:10:58 sthen Exp $
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7308,7 +7308,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
@@ -7278,7 +7278,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
found_ssl=no
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"

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

@ -1,7 +1,8 @@
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.12 2015/03/30 22:43:42 sthen Exp $
--- sample-config/icinga.cfg.in.orig Mon Mar 30 09:38:53 2015
+++ sample-config/icinga.cfg.in Mon Mar 30 23:28:35 2015
@@ -1288,7 +1288,7 @@ enable_embedded_perl=0
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.13 2017/12/20 15:11:32 sthen Exp $
Index: sample-config/icinga.cfg.in
--- sample-config/icinga.cfg.in.orig
+++ sample-config/icinga.cfg.in
@@ -1305,7 +1305,7 @@ enable_embedded_perl=0
# the HTML documentation on the embedded Perl interpreter for more
# information on how this option works.
@ -10,7 +11,7 @@ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.12 2015/03/30 22:43:42 sthen Exp
@@ -1387,8 +1387,8 @@ use_true_regexp_matching=0
@@ -1404,8 +1404,8 @@ use_true_regexp_matching=0
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands.