svn commit: r369208 - in head/net-mgmt: monitoring-plugins/files nagios-plugins/files
Mathieu Arnold
mat at FreeBSD.org
Wed Sep 24 21:27:54 UTC 2014
Author: mat
Date: Wed Sep 24 21:27:49 2014
New Revision: 369208
URL: http://svnweb.freebsd.org/changeset/ports/369208
QAT: https://qat.redports.org/buildarchive/r369208/
Log:
Fix building WITH=NLS
Many thanks to: tijl
Sponsored by: Absolight
Modified:
head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
head/net-mgmt/monitoring-plugins/files/patch-configure.ac
head/net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4
head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff
head/net-mgmt/nagios-plugins/files/patch-configure.ac
head/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in
head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c
head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c
Modified: head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,7 +1,7 @@
---- ./plugins/check_dig.c.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins/check_dig.c 2014-04-15 11:42:41.000000000 +0200
+--- plugins/check_dig.c.orig 2014-06-23 16:01:00 UTC
++++ plugins/check_dig.c
@@ -94,8 +94,8 @@
- timeout_interval_dig = ceil((double) timeout_interval / (double) number_tries);
+ timeout_interval_dig = timeout_interval / number_tries + number_tries;
/* get the command to run */
- xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
Modified: head/net-mgmt/monitoring-plugins/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-configure.ac Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/patch-configure.ac Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./configure.ac.orig 2014-06-24 15:08:41.000000000 +0200
-+++ ./configure.ac 2014-06-25 13:28:18.000000000 +0200
+--- configure.ac.orig 2014-07-11 09:15:18 UTC
++++ configure.ac
@@ -44,6 +44,7 @@
gl_EARLY
AC_PROG_GCC_TRADITIONAL
@@ -403,3 +403,12 @@
AC_PATH_PROG(PATH_TO_LSPS,lsps)
if (test -n "$PATH_TO_LSPS")
+@@ -1737,7 +1508,7 @@
+ AC_SUBST(DEPLIBS)
+
+ AM_GNU_GETTEXT([external], [need-ngettext])
+-AM_GNU_GETTEXT_VERSION(0.15)
++AM_GNU_GETTEXT_VERSION(0.18)
+
+ dnl Check for Redhat spopen problem
+ dnl Wierd problem where ECHILD is returned from a wait call in error
Modified: head/net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4 Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4 Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./gl/m4/extensions.m4.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./gl/m4/extensions.m4 2014-04-14 10:22:50.000000000 +0200
+--- gl/m4/extensions.m4.orig 2014-06-18 19:37:06 UTC
++++ gl/m4/extensions.m4
@@ -16,6 +16,7 @@
# warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
# or warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins-scripts/check_ircd.pl.orig 2014-07-06 19:55:03.000000000 +0200
-+++ ./plugins-scripts/check_ircd.pl 2014-07-29 15:15:32.000000000 +0200
+--- plugins-scripts/check_ircd.pl.orig 2014-07-06 17:55:03 UTC
++++ plugins-scripts/check_ircd.pl
@@ -66,6 +66,7 @@
$ENV{'PATH'}='@TRUSTED_PATH@';
$ENV{'BASH_ENV'}='';
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/Makefile.am.orig 2014-04-27 19:59:06.000000000 +0200
-+++ ./plugins/Makefile.am 2014-05-09 18:45:30.000000000 +0200
+--- plugins/Makefile.am.orig 2014-06-23 16:01:00 UTC
++++ plugins/Makefile.am
@@ -14,7 +14,7 @@
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
==============================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/check_ssh.c.orig 2014-07-06 12:26:39.000000000 +0200
-+++ ./plugins/check_ssh.c 2014-07-29 15:15:33.000000000 +0200
+--- plugins/check_ssh.c.orig 2014-07-06 10:26:39 UTC
++++ plugins/check_ssh.c
@@ -255,6 +255,7 @@
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
Modified: head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff
==============================================================================
--- head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/check_dig.c.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins/check_dig.c 2014-04-15 11:42:41.000000000 +0200
+--- plugins/check_dig.c.orig 2014-03-04 21:41:57 UTC
++++ plugins/check_dig.c
@@ -94,8 +94,8 @@
timeout_interval_dig = ceil((double) timeout_interval / (double) number_tries);
Modified: head/net-mgmt/nagios-plugins/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-configure.ac Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-configure.ac Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./configure.ac.orig 2014-05-20 21:15:34.000000000 +0200
-+++ ./configure.ac 2014-05-20 23:08:10.000000000 +0200
+--- configure.ac.orig 2014-06-26 16:17:12 UTC
++++ configure.ac
@@ -13,8 +13,6 @@
RELEASE=1
AC_SUBST(RELEASE)
@@ -412,3 +412,12 @@
AC_PATH_PROG(PATH_TO_LSPS,lsps)
if (test -n "$PATH_TO_LSPS")
+@@ -1755,7 +1523,7 @@
+ AC_SUBST(DEPLIBS)
+
+ AM_GNU_GETTEXT([external], [need-ngettext])
+-AM_GNU_GETTEXT_VERSION(0.15)
++AM_GNU_GETTEXT_VERSION(0.18)
+
+ dnl Check for Redhat spopen problem
+ dnl Wierd problem where ECHILD is returned from a wait call in error
Modified: head/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4 Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4 Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./gl/m4/extensions.m4.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./gl/m4/extensions.m4 2014-04-14 10:22:50.000000000 +0200
+--- gl/m4/extensions.m4.orig 2014-03-04 21:41:56 UTC
++++ gl/m4/extensions.m4
@@ -16,6 +16,7 @@
# warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
# or warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins-scripts/check_ircd.pl.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins-scripts/check_ircd.pl 2014-04-14 10:22:50.000000000 +0200
+--- plugins-scripts/check_ircd.pl.orig 2014-03-04 21:41:57 UTC
++++ plugins-scripts/check_ircd.pl
@@ -66,6 +66,7 @@
$ENV{PATH} = "";
$ENV{ENV} = "";
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins-scripts/check_ntp.pl.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins-scripts/check_ntp.pl 2014-04-14 10:22:50.000000000 +0200
+--- plugins-scripts/check_ntp.pl.orig 2014-03-04 21:41:57 UTC
++++ plugins-scripts/check_ntp.pl
@@ -313,7 +313,6 @@
}
} else {
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins-scripts/subst.in.orig 2014-03-04 22:41:57.000000000 +0100
-+++ ./plugins-scripts/subst.in 2014-05-09 18:08:34.000000000 +0200
+--- plugins-scripts/subst.in.orig 2014-03-04 21:41:57 UTC
++++ plugins-scripts/subst.in
@@ -1,7 +1,7 @@
#!/usr/bin/awk
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/Makefile.am.orig 2014-04-16 00:19:03.000000000 +0200
-+++ ./plugins/Makefile.am 2014-04-16 11:38:18.000000000 +0200
+--- plugins/Makefile.am.orig 2014-05-20 19:15:34 UTC
++++ plugins/Makefile.am
@@ -14,7 +14,7 @@
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/check_pgsql.c.orig 2014-04-16 00:19:03.000000000 +0200
-+++ ./plugins/check_pgsql.c 2014-05-20 23:08:11.000000000 +0200
+--- plugins/check_pgsql.c.orig 2014-04-15 22:19:03 UTC
++++ plugins/check_pgsql.c
@@ -36,6 +36,7 @@
#include "utils.h"
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c Wed Sep 24 21:23:16 2014 (r369207)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c Wed Sep 24 21:27:49 2014 (r369208)
@@ -1,5 +1,5 @@
---- ./plugins/check_ssh.c.orig 2014-03-04 22:41:57.000000000 +0100
-+++ ./plugins/check_ssh.c 2014-05-20 23:08:11.000000000 +0200
+--- plugins/check_ssh.c.orig 2014-03-04 21:41:57 UTC
++++ plugins/check_ssh.c
@@ -255,6 +255,7 @@
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
More information about the svn-ports-all
mailing list