update to icinga2-2.12.2

- switch from libressl to openssl/1.1, the new cert validator doesn't work
with icinga's pki

- add no_mysql/no_pgsql pseudo-flavours to knock out ido from build, making
it easier to do test builds on endpoints
This commit is contained in:
sthen 2020-12-03 15:22:40 +00:00
parent e4f054a0c4
commit 58d0f29a08
3 changed files with 35 additions and 11 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.105 2020/10/16 17:11:55 sthen Exp $
# $OpenBSD: Makefile,v 1.106 2020/12/03 15:22:40 sthen Exp $
COMMENT-main = network monitoring system
COMMENT-mysql = MySQL support for icinga2
COMMENT-pgsql = PostgreSQL support for icinga2
V = 2.12.1
V = 2.12.2
EPOCH = 0
GH_ACCOUNT = Icinga
GH_PROJECT = icinga2
@ -43,8 +43,16 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
WANTLIB += boost_context-mt boost_coroutine-mt boost_date_time-mt
WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
WANTLIB += boost_system-mt boost_thread-mt c crypto curses edit
WANTLIB += m ssl
WANTLIB += boost_system-mt boost_thread-mt c curses edit m
# libressl
#WANTLIB += crypto ssl
# openssl
WANTLIB += lib/eopenssl11/crypto lib/eopenssl11/ssl
LIB_DEPENDS-main += security/openssl/1.1
CONFIGURE_ARGS += -DCMAKE_PREFIX_PATH="${LOCALBASE}/include/eopenssl11;${LOCALBASE}/lib/eopenssl11"
LDFLAGS += -Wl,-rpath=${LOCALBASE}/lib/eopenssl11 -L${LOCALBASE}/lib/eopenssl11
MODULES = devel/cmake
@ -53,8 +61,10 @@ COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/bison
MULTI_PACKAGES = -main -mysql -pgsql
PSEUDO_FLAVORS = no_mysql no_pgsql
FLAVOR ?=
LIB_DEPENDS-main = ${LIB_DEPENDS} \
LIB_DEPENDS-main += ${LIB_DEPENDS} \
devel/boost,-md
RUN_DEPENDS-main = net/monitoring-plugins
@ -79,11 +89,20 @@ CONFIGURE_ARGS += \
-DICINGA2_GIT_VERSION_INFO=OFF \
-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
-DHAVE_LIBEXECINFO=OFF
CONFIGURE_ENV += LDFLAGS="${LDFLAGS}"
# Fix "undefined reference to `__atomic_fetch_sub_8'"
# "undefined reference to `__atomic_fetch_sub_8'"
.if ${MACHINE_ARCH:Mhppa}
WANTLIB += atomic
CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
LDFLAGS += -latomic
.endif
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:Mmysql}
CONFIGURE_ARGS += -DICINGA2_WITH_MYSQL=OFF
.endif
.if !${BUILD_PACKAGES:Mpgsql}
CONFIGURE_ARGS += -DICINGA2_WITH_PGSQL=OFF
.endif
post-install:

View File

@ -1,2 +1,2 @@
SHA256 (icinga2-2.12.1.tar.gz) = BisrHTBlj/1FKOFYgcnXs1sbC26N3ccS0BOnvW4Ck14=
SIZE (icinga2-2.12.1.tar.gz) = 7532104
SHA256 (icinga2-2.12.2.tar.gz) = 3kU1SUQNRpwXOy9hg+UjCx23pih4zgogRV7OX3NRjg4=
SIZE (icinga2-2.12.2.tar.gz) = 7534173

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.31 2020/08/06 15:00:11 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.32 2020/12/03 15:22:40 sthen Exp $
@newgroup _icinga:667
@newgroup _icingaweb2:762
@newuser _icinga:667:_icinga:daemon:Icinga user:/var/icinga:/sbin/nologin
@ -8,7 +8,8 @@
@extraunexec rm -rf ${LOCALSTATEDIR}/spool/icinga2/*
@extraunexec rm -f ${SYSCONFDIR}/icinga2/features-enabled/*
@mode 770
@group _icinga
@owner _icinga
@group wheel
@sample ${SYSCONFDIR}/icinga2/
@mode
@group
@ -119,6 +120,8 @@ share/examples/icinga2/bash_completion.d/
@sample ${SYSCONFDIR}/bash_completion.d/
share/examples/icinga2/bash_completion.d/icinga2
@sample ${SYSCONFDIR}/bash_completion.d/icinga2
@owner _icinga
@group wheel
share/examples/icinga2/conf.d/
@mode 775
@sample ${SYSCONFDIR}/icinga2/conf.d/
@ -271,6 +274,8 @@ share/examples/icinga2/zones.d/README
@mode 664
@sample ${SYSCONFDIR}/icinga2/zones.d/README
@mode
@owner
@group
share/icinga2/
share/icinga2/include/
share/icinga2/include/command-icinga.conf