mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Update to 2.3.2.

Browse Source 
General cleanup.
This commit is contained in:
Mathieu Arnold 2020-02-24 15:38:17 +00:00
parent 12b8caf42e
commit 4380fd6e3c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=526977
8 changed files with 585 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
net-mgmt/nagios-plugins/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nagios-plugins
DISTVERSION= 2.3.1
DISTVERSION= 2.3.2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
@ -14,102 +14,57 @@ COMMENT= Plugins for Nagios
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= monitoring-plugins-*
USES= charsetfix gmake perl5 libtool ssl
USES= charsetfix gmake libtool perl5 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
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= Use drill for check_dig, check_dns not available
DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools
EXTRAOPTS_CONFIGURE_ENABLE= extra-opts
GNU_CONFIGURE= yes
NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
NAGIOSWWWDIR?= www/nagios
NAGIOSHTMURL?= /nagios
NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \
--with-nagios-group=${NAGIOSGROUP} \
--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}
CONFIGURE_ARGS+= --datadir=${PREFIX}/share \
--libexecdir=${PREFIX}/libexec/nagios \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX} \
--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
--sysconfdir=${PREFIX}/etc/nagios \
--with-cgiurl=${NAGIOSCGIURL} \
--with-nagios-group=${NAGIOSGROUP} \
--with-nagios-user=${NAGIOSUSER} \
--with-perl=${PERL}
# 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
CONFIGURE_ARGS+= --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_PING6=/sbin/ping6 \
ac_cv_path_PATH_TO_PING=/sbin/ping \
ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient \
ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo
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=
CONFLICTS_INSTALL= monitoring-plugins-*
IPV6_CONFIGURE_WITH= ipv6
OPTIONS_DEFINE= DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \
QSTAT RADIUS SSH_PORTABLE
OPTIONS_DEFAULT= DNS_BASE EXTRAOPTS
OPTIONS_SINGLE= DNS
OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS
OPTIONS_SUB= yes
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_USES= mysql
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_DESC= Check database using DBI
DNS_BASE_DESC= Use drill for check_dig, check_dns not available
DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools
DNS_DESC= Configuration of check_dig and check_dns
EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options
FPING_DESC= Support for non-flooding fast ping (check_fping)
LDAP_DESC= OpenLDAP support (check_ldap)
MYSQL_DESC= MySQL support (check_mysql)
NETSNMP_DESC= SNMP support (check_snmp)
PGSQL_DESC= PostgreSQL support (check_pgsql)
QSTAT_DESC= Game server query support (check_game)
RADIUS_DESC= Radius support (check_radius)
SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base)
DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
DBI_CONFIGURE_WITH= dbi
@ -119,19 +74,63 @@ DNS_BINDTOOLS_RUN_DEPENDS= ${DNS_BINDTOOLS_BUILD_DEPENDS}
DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \
--with-nslookup-command=${LOCALBASE}/bin/nslookup
EXTRAOPTS_CONFIGURE_ENABLE= extra-opts
FPING_BUILD_DEPENDS= fping:net/fping
FPING_RUN_DEPENDS= fping:net/fping
FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING6= \
ac_cv_path_PATH_TO_FPING=
IPV6_CONFIGURE_WITH= ipv6
LDAP_USE= OPENLDAP=yes
LDAP_CONFIGURE_WITH= ldap
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE}
NETSNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
snmpcheck:net-mgmt/net-snmp
NETSNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
snmpcheck:net-mgmt/net-snmp
NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \
ac_cv_path_PATH_TO_SNMPGETNEXT=
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE}
QSTAT_BUILD_DEPENDS= qstat:games/qstat
QSTAT_RUN_DEPENDS= qstat:games/qstat
QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QSTAT= \
ac_cv_path_PATH_TO_QUAKESTAT=
RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient
RADIUS_CONFIGURE_WITH= radius
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
NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
NAGIOSWWWDIR?= www/nagios
NAGIOSHTMURL?= /nagios
NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
.include <bsd.port.options.mk>
.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 "
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
PLIST_SUB+= CHECK_DNS=""
PLIST_SUB+= CHECK_DNS=""
.endif
.if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE)
@ -141,13 +140,6 @@ 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
# add a fake PATH so that it gets set to a correct value during build.
@${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|; \
s|/usr/bin/|${LOCALBASE}/bin/|g" \

6
net-mgmt/nagios-plugins/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576489470
SHA256 (nagios-plugins-2.3.1.tar.gz) = 06924416be052def988d3470519989ed1289216fc2e1c4d41835b4bff17902cc
SIZE (nagios-plugins-2.3.1.tar.gz) = 2833267
TIMESTAMP = 1582556056
SHA256 (nagios-plugins-2.3.2.tar.gz) = b074c27a4a2bb08bae30c724b28c1f33f2c5f37dc4b0c5dad0171ca39356a5c9
SIZE (nagios-plugins-2.3.2.tar.gz) = 2782371

442
net-mgmt/nagios-plugins/files/patch-locale Normal file
View File

@ -0,0 +1,442 @@
Make sure we have a sane numeric locale.
--- plugins-root/check_dhcp.c.orig 2019-12-04 21:53:08 UTC
+++ plugins-root/check_dhcp.c
@@ -254,7 +254,7 @@ int main(int argc, char **argv) {
int dhcp_socket;
int result = STATE_UNKNOWN;
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
--- plugins-root/check_icmp.c.orig 2020-02-20 19:14:52 UTC
+++ plugins-root/check_icmp.c
@@ -501,7 +501,7 @@ int main(int argc, char **argv) {
int on = 1;
#endif
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
--- plugins/check_by_ssh.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_by_ssh.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
remotecmd = "";
comm_append(SSH_COMMAND);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_cluster.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_cluster.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv){
int return_code=STATE_OK;
thresholds *thresholds = NULL;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_dbi.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_dbi.c
@@ -117,7 +117,7 @@ main (int argc, char **argv)
int i;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_dig.c.orig 2020-02-24 15:32:00 UTC
+++ plugins/check_dig.c
@@ -76,7 +76,7 @@ main (int argc, char **argv)
int result = STATE_UNKNOWN;
int timeout_interval_dig;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_disk.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_disk.c
@@ -250,7 +250,7 @@ main (int argc, char **argv)
perf = strdup ("");
stat_buf = malloc(sizeof *stat_buf);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_dns.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_dns.c
@@ -120,7 +120,7 @@ main (int argc, char **argv)
output chld_out, chld_err;
size_t i;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_dummy.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_dummy.c
@@ -44,7 +44,7 @@ main (int argc, char **argv)
{
int result = STATE_UNKNOWN;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_fping.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_fping.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
char *option_string = "";
input_buffer = malloc (MAX_INPUT_BUFFER);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_game.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_game.c
@@ -71,7 +71,7 @@ main (int argc, char **argv)
size_t i = 0;
output chld_out;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_hpjd.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_hpjd.c
@@ -94,7 +94,7 @@ main (int argc, char **argv)
errmsg = malloc(MAX_INPUT_BUFFER);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_http.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_http.c
@@ -156,7 +156,7 @@ main (int argc, char **argv)
{
int result = STATE_UNKNOWN;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ide_smart.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_ide_smart.c
@@ -200,7 +200,7 @@ main (int argc, char *argv[])
/* Parse extra opts if any */
argv=np_extra_opts (&argc, argv, progname);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ldap.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_ldap.c
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
int status_entries = STATE_OK;
int num_entries = 0;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_mrtg.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_mrtg.c
@@ -64,7 +64,7 @@ main (int argc, char **argv)
unsigned long maximum_value_rate = 0L;
unsigned long rate = 0L;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_mrtgtraf.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_mrtgtraf.c
@@ -76,7 +76,7 @@ main (int argc, char **argv)
char incoming_speed_rating[8];
char outgoing_speed_rating[8];
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_mysql.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_mysql.c
@@ -113,7 +113,7 @@ main (int argc, char **argv)
perf = strdup ("");
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_mysql_query.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_mysql_query.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
char *error = NULL;
int status;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_nagios.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_nagios.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
output chld_out, chld_err;
size_t i;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_nt.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_nt.c
@@ -116,7 +116,7 @@ int main(int argc, char **argv){
int isPercent = FALSE;
int allRight = FALSE;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ntp.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_ntp.c
@@ -782,7 +782,7 @@ int main(int argc, char *argv[]){
double offset=0, jitter=0;
char *result_line, *perfdata_line;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ntp_peer.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_ntp_peer.c
@@ -564,7 +564,7 @@ int main(int argc, char *argv[]){
double offset=0, jitter=0;
char *result_line, *perfdata_line;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
setlocale (LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ntp_time.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_ntp_time.c
@@ -575,7 +575,7 @@ int main(int argc, char *argv[]){
double offset=0;
char *result_line, *perfdata_line;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
setlocale (LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_nwstat.c.orig 2017-01-19 16:01:31 UTC
+++ plugins/check_nwstat.c
@@ -162,7 +162,7 @@ main(int argc, char **argv) {
unsigned long sap_entries=0;
char uptime[MAX_INPUT_BUFFER];
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_overcr.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_overcr.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
int uptime_hours = 0;
int uptime_minutes = 0;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ping.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_ping.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
int this_result = STATE_UNKNOWN;
int i;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
setlocale (LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_procs.c.orig 2020-02-20 19:14:52 UTC
+++ plugins/check_procs.c
@@ -169,7 +169,7 @@ main (int argc, char **argv)
int ret = 0;
output chld_out, chld_err;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
setlocale(LC_NUMERIC, "POSIX");
--- plugins/check_radius.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_radius.c
@@ -170,7 +170,7 @@ main (int argc, char **argv)
char *ether;
char *str;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_real.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_real.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
char buffer[MAX_INPUT_BUFFER];
char *status_line = NULL;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_smtp.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_smtp.c
@@ -148,7 +148,7 @@ main (int argc, char **argv)
(void) signal (SIGPIPE, SIG_IGN);
#endif /* HAVE_SIGACTION */
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_snmp.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_snmp.c
@@ -212,7 +212,7 @@ main (int argc, char **argv)
int command_interval;
int is_ticks= 0;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_swap.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_swap.c
@@ -100,7 +100,7 @@ main (int argc, char **argv)
char str[32];
char *status;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_tcp.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_tcp.c
@@ -108,7 +108,7 @@ main (int argc, char **argv)
FD_ZERO(&rfds);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_time.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/check_time.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
int result = STATE_UNKNOWN;
time_t conntime;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_ups.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_ups.c
@@ -110,7 +110,7 @@ main (int argc, char **argv)
double ups_utility_deviation = 0.0;
int res;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/check_users.c.orig 2017-04-19 16:03:12 UTC
+++ plugins/check_users.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
char input_buffer[MAX_INPUT_BUFFER];
#endif
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/negate.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/negate.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
output chld_out, chld_err;
int i;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- plugins/remove_perfdata.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/remove_perfdata.c
@@ -63,7 +63,7 @@ main(int argc, char **argv)
output chld_out;
output chld_err;
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
--- plugins/urlize.c.orig 2017-01-16 17:24:03 UTC
+++ plugins/urlize.c
@@ -63,7 +63,7 @@ main (int argc, char **argv)
{0, 0, 0, 0}
};
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);

21
net-mgmt/nagios-plugins/files/patch-plugins-root_Makefile.in Normal file
View File

@ -0,0 +1,21 @@
Make sure we don't `chown root`, it will fail.
--- plugins-root/Makefile.in.orig 2020-02-20 19:15:04 UTC
+++ plugins-root/Makefile.in
@@ -1372,8 +1372,6 @@ INSTALL_SUID = \
p=$$f; \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
- echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
- chown root $(DESTDIR)$(libexecdir)/$$p; \
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done
@@ -1815,7 +1813,6 @@ install-exec-local: $(noinst_PROGRAMS)
rm -f $$TMPFILE; \
echo > $$TMPFILE; \
can_create_suid_root_executable=no; \
- chown root $$TMPFILE > /dev/null 2>&1 \
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
&& can_create_suid_root_executable=yes; \
rm -f $$TMPFILE; \

11
net-mgmt/nagios-plugins/files/patch-plugins_check__load.c
View File

@ -1,5 +1,14 @@
--- plugins/check_load.c.orig 2019-12-09 11:57:36 UTC
--- plugins/check_load.c.orig 2020-02-24 15:17:13 UTC
+++ plugins/check_load.c
@@ -111,7 +111,7 @@ main (int argc, char **argv)
int len;
#endif
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
setlocale(LC_NUMERIC, "POSIX");
@@ -351,6 +351,7 @@ int cmpstringp(const void *p1, const void *p2) {
pid_t kthread_ppid = 0;
int procvsz = 0;

13
net-mgmt/nagios-plugins/files/patch-plugins_check__pgsql.c
View File

@ -1,6 +1,6 @@
--- plugins/check_pgsql.c.orig 2015-07-30 21:40:06 UTC
--- plugins/check_pgsql.c.orig 2019-12-04 21:53:08 UTC
+++ plugins/check_pgsql.c
@@ -36,6 +36,7 @@ const char *email = "devel@nagios-plugin
@@ -36,6 +36,7 @@ const char *email = "devel@nagios-plugins.org";
#include "utils.h"
#include "netutils.h"
@ -8,3 +8,12 @@
#include <libpq-fe.h>
#include <pg_config_manual.h>
@@ -162,7 +163,7 @@ main (int argc, char **argv)
pgoptions = NULL; /* special options to start up the backend server */
pgtty = NULL; /* debugging tty for the backend server */
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);

11
net-mgmt/nagios-plugins/files/patch-plugins_check__ssh.c
View File

@ -1,5 +1,14 @@
--- plugins/check_ssh.c.orig 2015-07-30 21:40:06 UTC
--- plugins/check_ssh.c.orig 2020-02-24 15:17:13 UTC
+++ plugins/check_ssh.c
@@ -63,7 +63,7 @@ main (int argc, char **argv)
{
int result = STATE_UNKNOWN;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
@@ -252,6 +252,7 @@ ssh_connect (char *haddr, int hport, cha
printf
(_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),

18
net-mgmt/nagios-plugins/pkg-help
View File

@ -1,18 +0,0 @@
** DNS **
Starting from FreeBSD 10.0, BIND has been replaced in base
by unbound. This means that there are no dig and nslookup
utilities for check_dig and check_dns to use. If you choose
DNS_BASE, check_dig will be built using drill instead of
dig, if you use -A the dig options will generally not work,
check drill(1) for the correct ones, also, timeout and retry
will be ignored, and check_dns won't be installed. If you
check any other option, the installed dig and nslookup will
be used.
If you run FreeBSD < 10, you can still use the DNS_BIND*
options to have check_dig and check_dns use the newer dig
and nslookup utilities.
If you use REPLACE_BASE with BIND, choose the DNS_BASE option.