pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-plugins Updated to 2.0.3. The NEWS is almos...
details: https://anonhg.NetBSD.org/pkgsrc/rev/daf59b0f0770
branches: trunk
changeset: 649474:daf59b0f0770
user: rodent <rodent%pkgsrc.org@localhost>
date: Fri Apr 03 17:50:27 2015 +0000
description:
Updated to 2.0.3. The NEWS is almost 3000 lines and interested parties may
find it here: https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS
For pkgsrc, the changes aren't very interesting. Upstream applied a lot of
the patches we had, notably integrating IDE S.M.A.R.T. plugin support for
NetBSD.
diffstat:
net/nagios-plugins/Makefile | 10 +-
net/nagios-plugins/Makefile.common | 6 +-
net/nagios-plugins/PLIST | 4 +-
net/nagios-plugins/distinfo | 31 +-
net/nagios-plugins/patches/patch-913085 | 40 -
net/nagios-plugins/patches/patch-ab | 160 ----
net/nagios-plugins/patches/patch-ad | 6 +-
net/nagios-plugins/patches/patch-ae | 13 -
net/nagios-plugins/patches/patch-af | 8 +-
net/nagios-plugins/patches/patch-ah | 4 +-
net/nagios-plugins/patches/patch-ai | 4 +-
net/nagios-plugins/patches/patch-ak | 28 +-
net/nagios-plugins/patches/patch-al | 92 --
net/nagios-plugins/patches/patch-am | 56 -
net/nagios-plugins/patches/patch-an | 8 +-
net/nagios-plugins/patches/patch-configure | 436 +++---------
net/nagios-plugins/patches/patch-configure.in | 50 -
net/nagios-plugins/patches/patch-plugins__check_swap.c | 6 +-
net/nagios-plugins/patches/patch-plugins_check_ide_smart.c | 157 ----
19 files changed, 174 insertions(+), 945 deletions(-)
diffs (truncated from 1339 to 300 lines):
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/Makefile
--- a/net/nagios-plugins/Makefile Fri Apr 03 17:20:53 2015 +0000
+++ b/net/nagios-plugins/Makefile Fri Apr 03 17:50:27 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2015/02/19 14:45:03 taca Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/03 17:50:27 rodent Exp $
#
-PKGREVISION= 10
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -15,7 +14,7 @@
.include "../../mk/bsd.prefs.mk"
-USE_TOOLS+= perl:run
+USE_TOOLS+= msgfmt msgmerge intltool perl:run xgettext
PKG_GROUPS+= ${NAGIOS_GROUP}
BUILD_DEFS+= ${NAGIOS_GROUP}
@@ -38,7 +37,6 @@
.endif
.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_ide_smart \
${REAL_ROOT_USER} ${NAGIOS_GROUP} 4551
.endif
@@ -61,6 +59,10 @@
DEPENDS+= bind-[0-9]*:../../net/bind910
.endif
+post-install:
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/libexec/nagios/utils.pm
+
+.include "../../mk/pthread.buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/Makefile.common
--- a/net/nagios-plugins/Makefile.common Fri Apr 03 17:20:53 2015 +0000
+++ b/net/nagios-plugins/Makefile.common Fri Apr 03 17:50:27 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2012/07/25 12:01:54 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.11 2015/04/03 17:50:27 rodent Exp $
#
# used by net/nagios-plugin-mysql/Makefile
# used by net/nagios-plugin-pgsql/Makefile
@@ -6,9 +6,9 @@
# used by net/nagios-plugin-snmp/Makefile
# used by net/nagios-plugins/Makefile
-PLUGINSVERSION= 1.4.15
+PLUGINSVERSION= 2.0.3
DISTNAME= nagios-plugins-${PLUGINSVERSION}
-MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
+MASTER_SITES?= http://nagios-plugins.org/download/
.include "../../net/nagios-base/Makefile.common"
.include "../../mk/bsd.prefs.mk"
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/PLIST
--- a/net/nagios-plugins/PLIST Fri Apr 03 17:20:53 2015 +0000
+++ b/net/nagios-plugins/PLIST Fri Apr 03 17:50:27 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2013/01/19 09:59:12 manu Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/04/03 17:50:27 rodent Exp $
libexec/nagios/check_by_ssh
libexec/nagios/check_clamd
libexec/nagios/check_dhcp
@@ -7,6 +7,7 @@
libexec/nagios/check_dns
libexec/nagios/check_dummy
libexec/nagios/check_file_age
+libexec/nagios/check_fping
libexec/nagios/check_ftp
libexec/nagios/check_http
libexec/nagios/check_icmp
@@ -23,6 +24,7 @@
libexec/nagios/check_nagios
libexec/nagios/check_nntp
libexec/nagios/check_nntps
+libexec/nagios/check_nt
libexec/nagios/check_ntp
libexec/nagios/check_ntp_peer
libexec/nagios/check_ntp_time
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/distinfo
--- a/net/nagios-plugins/distinfo Fri Apr 03 17:20:53 2015 +0000
+++ b/net/nagios-plugins/distinfo Fri Apr 03 17:50:27 2015 +0000
@@ -1,20 +1,13 @@
-$NetBSD: distinfo,v 1.15 2015/02/27 20:14:07 tnn Exp $
+$NetBSD: distinfo,v 1.16 2015/04/03 17:50:27 rodent Exp $
-SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
-RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
-Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
-SHA1 (patch-913085) = bf8d28555f50c24d12a67bbecdf7e44a404a5a89
-SHA1 (patch-ab) = fdde9e8e98f222ab7e24adea205ce402bd64342d
-SHA1 (patch-ad) = 1418682ff599f91aa01a1eeb90f11c9e571212c8
-SHA1 (patch-ae) = 9975dfe9e7a1e448fe273ccb8427dcf3a74e195f
-SHA1 (patch-af) = c63176a78c7f73730c9f2ef3877b274f99be5dfa
-SHA1 (patch-ah) = c4f579b9f9971c44252eaea9a40775a2fcf23638
-SHA1 (patch-ai) = 2e045b6c10b06703772d0b9156b2e2f81aa4402b
-SHA1 (patch-ak) = 64f067ad6b136048feb75932572e25b2fbaaa699
-SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
-SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
-SHA1 (patch-an) = 372a111ed040114479e363e42d66e2281d0d629f
-SHA1 (patch-configure) = 16eec1d6b42401184ef4892a68353c476cc63cc5
-SHA1 (patch-configure.in) = 7db3d0ac3bbb6c1f6b05a5a3e9e4813a9635aecf
-SHA1 (patch-plugins__check_swap.c) = d7557d1e6823e8bfeb02706ba914685c564bfdea
-SHA1 (patch-plugins_check_ide_smart.c) = 9eccab59931bbfe102f1166be36c6939a6e3a1ae
+SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
+RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
+Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
+SHA1 (patch-ad) = 7dc748ce7815f3f90212815a9fe9a9a7db961617
+SHA1 (patch-af) = 8fd2e50ca63f014f88195552884913c7383cb6a1
+SHA1 (patch-ah) = f884e80c1e09fefd5e37f087d95d3b76b9d44ab6
+SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c
+SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695
+SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4
+SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/patches/patch-913085
--- a/net/nagios-plugins/patches/patch-913085 Fri Apr 03 17:20:53 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-913085,v 1.1 2013/08/28 12:14:49 manu Exp $
-
-Bugfix from upstream: do not send error when value is just on limit
-https://bugzilla.redhat.com/show_bug.cgi?id=913085
-
---- plugins/check_ide_smart.c.orig 2013-08-28 14:05:08.000000000 +0200
-+++ plugins/check_ide_smart.c 2013-08-28 14:05:15.000000000 +0200
-@@ -361,9 +361,9 @@
- int passed = 0;
- int i;
- for (i = 0; i < NR_ATTRIBUTES; i++) {
- if (value->id && threshold->id && value->id == threshold->id) {
-- if (value->value <= threshold->threshold) {
-+ if (value->value < threshold->threshold) {
- ++failed;
- }
- else {
- ++passed;
-@@ -390,9 +390,9 @@
- int total = 0;
- int i;
- for (i = 0; i < NR_ATTRIBUTES; i++) {
- if (value->id && threshold->id && value->id == threshold->id) {
-- if (value->value <= threshold->threshold) {
-+ if (value->value < threshold->threshold) {
- ++failed;
- if (value->status & 1) {
- status = PREFAILURE;
- ++prefailure;
-@@ -447,9 +447,9 @@
- {
- printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
- p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory ",
- p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
-- p->value > t->threshold ? "Passed" : "Failed");
-+ p->value >= t->threshold ? "Passed" : "Failed");
- }
-
-
-
diff -r ed3db49f6b7c -r daf59b0f0770 net/nagios-plugins/patches/patch-ab
--- a/net/nagios-plugins/patches/patch-ab Fri Apr 03 17:20:53 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2012/07/25 12:01:55 fhajny Exp $
-
---- configure.orig 2010-07-27 20:48:13.000000000 +0000
-+++ configure
-@@ -14688,7 +14688,7 @@ _ACEOF
-
- fi
-
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-+if false; then
- EXTRAS="$EXTRAS check_radius"
- RADIUSLIBS="-lradiusclient"
-
-@@ -14843,7 +14843,7 @@ _ACEOF
-
- fi
-
--if test "$ac_cv_lib_ldap_main" = "yes"; then
-+if false; then
- LDAPLIBS="-lldap -llber"\
- LDAPINCLUDE="-I/usr/include/ldap"
-
-@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
- ac_cv_ps_cols=9
- { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
- echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
-- if test `isainfo -b` = 64 ; then
-+ if test "$MACHINE_ARCH" = "x86_64" ; then
- pst3_use_64bit=1
- { echo "$as_me:$LINENO: using 64bit pst3" >&5
- echo "$as_me: using 64bit pst3" >&6;}
-@@ -19037,7 +19037,7 @@ fi
- then
- { echo "$as_me:$LINENO: checking for nslookup syntax" >&5
- echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
-- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+ if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
- then
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- { echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -19260,7 +19260,7 @@ echo "${ECHO_T}no" >&6; }
- fi
-
-
--if test -x "$PATH_TO_LMSTAT"
-+if false
- then
-
- cat >>confdefs.h <<_ACEOF
-@@ -19431,7 +19431,7 @@ if test "${with_snmpget_command+set}" =
- withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
- fi
-
--if test -n "$PATH_TO_SNMPGET"
-+if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no"
- then
-
- cat >>confdefs.h <<_ACEOF
-@@ -19490,7 +19490,7 @@ if test "${with_snmpgetnext_command+set}
- withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval
- fi
-
--if test -n "$PATH_TO_SNMPGETNEXT"
-+if test -n "$PATH_TO_SNMPGETNEXT" -a "$PATH_TO_SNMPGETNEXT" != "no"
- then
-
- cat >>confdefs.h <<_ACEOF
-@@ -19499,7 +19499,7 @@ _ACEOF
-
- fi
-
--if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null )
-+if false
- then
- { echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
- echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; }
-@@ -19666,7 +19666,7 @@ if test "${with_fping_command+set}" = se
- withval=$with_fping_command; PATH_TO_FPING=$withval
- fi
-
--if test -n "$PATH_TO_FPING"
-+if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"
- then
-
- cat >>confdefs.h <<_ACEOF
-@@ -20200,6 +20200,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
-@@ -20258,6 +20262,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -20333,6 +20341,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -20400,6 +20412,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -20468,6 +20484,10 @@ cat confdefs.h >>conftest.$ac_ext
Home |
Main Index |
Thread Index |
Old Index