Index: branches/2018Q4/net-mgmt/monitoring-plugins/Makefile =================================================================== --- branches/2018Q4/net-mgmt/monitoring-plugins/Makefile (revision 481146) +++ branches/2018Q4/net-mgmt/monitoring-plugins/Makefile (revision 481147) @@ -1,154 +1,154 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} MAINTAINER= mat@FreeBSD.org COMMENT= Monitoring Plugins for Nagios LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= nagios-plugins-* USES= charsetfix gmake perl5 libtool ssl USE_SUBMAKE= yes OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE OPTIONS_SINGLE= DNS OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS DNS_BIND911 OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE OPTIONS_SUB= yes QSTAT_DESC= Game server query support (check_game) FPING_DESC= Support for non-flooding fast ping (check_fping) NETSNMP_DESC= SNMP support (check_snmp) RADIUS_DESC= Radius support (check_radius) MYSQL_DESC= MySQL support (check_mysql) PGSQL_DESC= PostgreSQL support (check_pgsql) LDAP_DESC= OpenLDAP support (check_ldap) DBI_DESC= Check database using DBI EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base) DNS_DESC= Configuration of check_dig and check_dns (see help) DNS_BASE_DESC= >= 10 means drill for check_dig and no check_dns DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools DNS_BIND911_DESC= Use dig and nslookup from dns/bind911 EXTRAOPTS_CONFIGURE_ENABLE= extra-opts GNU_CONFIGURE= yes NAGIOSDIR?= /var/spool/nagios NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ --with-perl=${PERL} \ --prefix=${PREFIX} # Also, force some commands with their expected paths so that they don't get # disabled. CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib QSTAT_BUILD_DEPENDS= qstat:games/qstat QSTAT_RUN_DEPENDS= qstat:games/qstat QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QUAKESTAT= \ ac_cv_path_PATH_TO_QSTAT= IPV6_CONFIGURE_WITH= ipv6 FPING_BUILD_DEPENDS= fping:net/fping FPING_RUN_DEPENDS= fping:net/fping FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING= \ ac_cv_path_PATH_TO_FPING6= NETSNMP_BUILD_DEPENDS= snmpcheck:net-mgmt/net-snmp \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP NETSNMP_RUN_DEPENDS= snmpcheck:net-mgmt/net-snmp \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \ ac_cv_path_PATH_TO_SNMPGETNEXT= RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient RADIUS_CONFIGURE_WITH= radius MYSQL_USE= mysql=yes MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} LDAP_USE= openldap=yes LDAP_CONFIGURE_WITH= ldap NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= dbi DNS_BINDTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup DNS_BIND911_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind911 DNS_BIND911_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:security/openssh-portable SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS} SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh .include .if ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ ac_cv_path_PATH_TO_NSLOOKUP= PLIST_SUB+= CHECK_DNS="@comment " .else . if ${PORT_OPTIONS:MDNS_BASE} CONFIGURE_ARGS+= --with-dig-command=/usr/bin/dig \ --with-nslookup-command=/usr/bin/nslookup . endif PLIST_SUB+= CHECK_DNS="" .endif .if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) PLIST_SUB+= SSH="@comment " .else PLIST_SUB+= SSH="" .endif post-patch: .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \ check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \ check_pgsql.c check_snmp.c check_ssh.c check_swap.c check_time.c \ check_users.c @${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file} .endfor @${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in .include Index: branches/2018Q4/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c =================================================================== --- branches/2018Q4/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c (nonexistent) +++ branches/2018Q4/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c (revision 481147) @@ -0,0 +1,20 @@ +--- lib/utils_base.c.orig 2016-11-29 08:45:08 UTC ++++ lib/utils_base.c +@@ -87,10 +87,13 @@ void _get_monitoring_plugin( monitoring_ + void + die (int result, const char *fmt, ...) + { +- va_list ap; +- va_start (ap, fmt); +- vprintf (fmt, ap); +- va_end (ap); ++ if(fmt!=NULL) { ++ va_list ap; ++ va_start (ap, fmt); ++ vprintf (fmt, ap); ++ va_end (ap); ++ } ++ + if(this_monitoring_plugin!=NULL) { + np_cleanup(); + } Property changes on: branches/2018Q4/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 481146) +++ branches/2018Q4 (revision 481147) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r481146