kiwi/klara-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better FLAVORS

Browse Source
This commit is contained in:
Xavier Beaudouin
2024-12-16 16:46:41 +01:00
parent ec7fea8ffb
commit f1d6d84c72
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net-mgmt/nagios/Makefile
View File

@ -74,19 +74,16 @@ GROUPS= ${NAGIOSGROUP}
OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK
OPTIONS_RADIO= PLUGINS OPTIONS_RADIO= PLUGINS
OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS
OPTIONS_DEFAULT= NAGPLUGINS #OPTIONS_DEFAULT= NAGPLUGINS
EMBEDDED_PERL_DESC= Enable embedded Perl [requires Perl 5.8.0+] EMBEDDED_PERL_DESC= Enable embedded Perl [requires Perl 5.8.0+]
NANOSLEEP_DESC= Use nanosleep in event timing NANOSLEEP_DESC= Use nanosleep in event timing
EVENT_BROKER_DESC= Enable event broker functionality EVENT_BROKER_DESC= Enable event broker functionality
UNHANDLED_HACK_DESC= Display passive checks in unhandled queries UNHANDLED_HACK_DESC= Display passive checks in unhandled queries
.if ${FLAVOR} == monpluging .if ${FLAVOR} == monplugins
RUN_DEPENDS+= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins RUN_DEPENDS+= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
.else
# Fallback to OPTIONS
MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
.endif
OPTIONS_SUB= OPTIONS_SUB=
@ -96,6 +93,14 @@ EMBEDDED_PERL_CONFIGURE_WITH= perlcache
NANOSLEEP_CONFIGURE_ENABLE= nanosleep NANOSLEEP_CONFIGURE_ENABLE= nanosleep
EVENT_BROKER_CONFIGURE_ENABLE= event-broker EVENT_BROKER_CONFIGURE_ENABLE= event-broker
.if ${FLAVOR} == monplugins
OPTIONS_DEFAULT+= MONPLUGINS
.endif
.if ${FLAVOR} == default
OPTIONS_DEFAULT+= NAGPLUGINS
.endif
post-extract: post-extract:
@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}

15
net-mgmt/nrpe/Makefile
View File

@ -40,7 +40,7 @@ PLIST_SUB= NAGIOSUSER=${NAGIOSUSER} \
NRPE_PIDDIR=${NRPE_PIDDIR} NRPE_PIDDIR=${NRPE_PIDDIR}
OPTIONS_DEFINE= SSL ARGS OPTIONS_DEFINE= SSL ARGS
OPTIONS_DEFAULT=NAGPLUGINS SSL OPTIONS_DEFAULT=SSL
OPTIONS_RADIO= PLUGINS OPTIONS_RADIO= PLUGINS
OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS
@ -49,13 +49,8 @@ MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins
NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins
ARGS_CONFIGURE_ENABLE= command-args ARGS_CONFIGURE_ENABLE= command-args
.if ${FLAVOR} == monpluging
RUN_DEPENDS+= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
.else
# Fallback to OPTIONS
MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
.endif
SSL_USES= ssl SSL_USES= ssl
SSL_CONFIGURE_ENABLE= ssl SSL_CONFIGURE_ENABLE= ssl
SSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} ssl-inc=${OPENSSLINC} ssl-lib=${OPENSSLLIB} SSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} ssl-inc=${OPENSSLINC} ssl-lib=${OPENSSLLIB}
@ -66,6 +61,14 @@ NAGIOSGROUP?= nagios
NRPE_PIDDIR?= /var/run/nrpe NRPE_PIDDIR?= /var/run/nrpe
.if ${FLAVOR} == monplugins
OPTIONS_DEFAULT+= MONPLUGINS
.endif
.if ${FLAVOR} == default
OPTIONS_DEFAULT+= NAGPLUGINS
.endif
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe.pid|g' \ @${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe.pid|g' \
-e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \ -e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \

7
security/sudo/Makefile
View File

@ -97,12 +97,11 @@ SSSD_RUN_DEPENDS= sssd:security/sssd
SSSD_CONFIGURE_ON= --with-sssd SSSD_CONFIGURE_ON= --with-sssd
.if ${FLAVOR} == sssd .if ${FLAVOR} == sssd
RUN_DEPENDS+= sssd:security/sssd2 OPTIONS_DEFAULTS+= SSSD2
CONFIGURE_ARGS+= --with-sssd .endif
.else
SSSD2_RUN_DEPENDS= sssd:security/sssd2 SSSD2_RUN_DEPENDS= sssd:security/sssd2
SSSD2_CONFIGURE_ON= --with-sssd SSSD2_CONFIGURE_ON= --with-sssd
.endif
LOGFAC?= authpriv LOGFAC?= authpriv
SUDO_LDAP_CONF?= ldap.conf SUDO_LDAP_CONF?= ldap.conf