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

icinga port maintenance:

Browse Source 
- switch back to libressl, cert problem was fixed in x509_verify.c 1.26
- after real-world experience, get rid of the automatic update path from 1.x to 2.x
This commit is contained in:
sthen 2021-02-10 12:47:07 +00:00
parent 2636dd2cfc
commit f929a810bb
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/icinga/core2/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.110 2021/01/31 18:53:54 sthen Exp $
# $OpenBSD: Makefile,v 1.111 2021/02/10 12:47:07 sthen Exp $
COMMENT-main = network monitoring system
COMMENT-mysql = MySQL support for icinga2
COMMENT-pgsql = PostgreSQL support for icinga2
V = 2.12.3
EPOCH = 0
REVISION = 1
GH_PROJECT = icinga2
GH_TAGNAME = v$V
PKGNAME-main = icinga2-$V
PKGNAME-mysql = icinga2-ido-mysql-$V
PKGNAME-pgsql = icinga2-ido-pgsql-$V
REVISION-main = 0
REVISION-mysql = 0
EPOCH = 0
SHARED_LIBS += base 0.0 # 2.6
SHARED_LIBS += checker 0.0 # 2.6
@ -47,13 +47,13 @@ WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
WANTLIB += boost_system-mt boost_thread-mt c curses edit m
# libressl
#WANTLIB += crypto ssl
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
#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

4
net/icinga/core2/pkg/PLIST-main
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.34 2021/01/31 18:53:54 sthen Exp $
@ask-update icinga-<2 Icinga 2.x is a major update from Icinga 1.x - config will need to be rewritten
@pkgpath net/icinga/core,-main
@comment $OpenBSD: PLIST-main,v 1.35 2021/02/10 12:47:07 sthen Exp $
@newgroup _icinga:667
@newgroup _icingaweb2:762
@newuser _icinga:667:_icinga:daemon:Icinga user:/var/icinga:/sbin/nologin

4
net/icinga/core2/pkg/PLIST-mysql
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-mysql,v 1.11 2021/01/31 18:53:54 sthen Exp $
@ask-update icinga-idoutils-<2 Icinga 2.x is a major update from Icinga 1.x - config will need to be rewritten
@pkgpath net/icinga/core,-ido
@comment $OpenBSD: PLIST-mysql,v 1.12 2021/02/10 12:47:07 sthen Exp $
@conflict icinga2-<2.2.4v0
@lib lib/icinga2/libmysql_shim.so.${LIBmysql_shim_VERSION}
share/examples/icinga2/features-available/ido-mysql.conf

4
net/icinga/web2/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.47 2021/01/31 18:53:55 sthen Exp $
# $OpenBSD: Makefile,v 1.48 2021/02/10 12:47:07 sthen Exp $
COMMENT = next-generation web UI for icinga
GH_ACCOUNT = Icinga
GH_PROJECT = icingaweb2
GH_TAGNAME = v2.8.2
REVISION = 1
REVISION = 2
PKGNAME = icinga-web2-${GH_TAGNAME:S/v//}
MAINTAINER = Stuart Henderson <stu.ports@spacehopper.org>

4
net/icinga/web2/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.24 2021/01/31 18:53:55 sthen Exp $
@ask-update icinga-cgi-<2 Icinga 2.x is a major update from Icinga 1.x - config will need to be rewritten
@pkgpath net/icinga/web
@comment $OpenBSD: PLIST,v 1.25 2021/02/10 12:47:07 sthen Exp $
@newgroup _icingaweb2:762
@newuser _icingaweb2:762:_icingaweb2:daemon:Icinga-web2 user:${PREFIX}/icinga-web2:/sbin/nologin
@extraunexec rm -rf %D/etc/icingaweb2/*