pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-plugin-snmp Use common patches and reset PK...
details: https://anonhg.NetBSD.org/pkgsrc/rev/47b604fa9653
branches: trunk
changeset: 364805:47b604fa9653
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Jul 04 19:49:40 2017 +0000
description:
Use common patches and reset PKGREVISION.
diffstat:
net/nagios-plugin-snmp/Makefile | 3 +-
net/nagios-plugin-snmp/distinfo | 10 --
net/nagios-plugin-snmp/patches/patch-ad | 13 ---
net/nagios-plugin-snmp/patches/patch-ae | 81 --------------------
net/nagios-plugin-snmp/patches/patch-ak | 76 ------------------
net/nagios-plugin-snmp/patches/patch-configure | 101 -------------------------
6 files changed, 1 insertions(+), 283 deletions(-)
diffs (truncated from 314 to 300 lines):
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/Makefile
--- a/net/nagios-plugin-snmp/Makefile Tue Jul 04 19:49:06 2017 +0000
+++ b/net/nagios-plugin-snmp/Makefile Tue Jul 04 19:49:40 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2016/07/09 06:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2017/07/04 19:49:40 jperkin Exp $
#
PKGNAME= nagios-plugin-snmp-${PLUGINSVERSION}
-PKGREVISION= 3
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/distinfo
--- a/net/nagios-plugin-snmp/distinfo Tue Jul 04 19:49:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.13 2015/11/04 00:35:14 agc Exp $
-
-SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
-RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
-SHA512 (nagios-plugins-2.0.3.tar.gz) = 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
-Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
-SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
-SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
-SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
-SHA1 (patch-configure) = 91bba469ceb22c7f7dae5a905669103f1ca21763
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/patches/patch-ad
--- a/net/nagios-plugin-snmp/patches/patch-ad Tue Jul 04 19:49:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
-
---- plugins-scripts/check_breeze.pl.orig 2005-08-04 07:37:19.000000000 -0700
-+++ plugins-scripts/check_breeze.pl 2005-08-04 07:47:00.000000000 -0700
-@@ -47,7 +47,7 @@
- ($opt_C) || ($opt_C = "public") ;
-
- my $sig=0;
--$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
-+$sig = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
- my @test=split(/ /,$sig);
- $sig=$test[2];
- $sig=int($sig);
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/patches/patch-ae
--- a/net/nagios-plugin-snmp/patches/patch-ae Tue Jul 04 19:49:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
-
---- plugins-scripts/check_wave.pl.orig 2002-10-28 05:05:08.000000000 -0800
-+++ plugins-scripts/check_wave.pl 2005-08-10 13:50:01.000000000 -0700
-@@ -8,7 +8,7 @@
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
- use vars qw($PROGNAME);
- use Getopt::Long;
--use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H);
-+use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H $opt_C);
- my (@test, $low1, $med1, $high1, $snr, $low2, $med2, $high2);
- my ($low, $med, $high, $lowavg, $medavg, $highavg, $tot, $ss);
-
-@@ -27,6 +27,7 @@
- "v" => \$verbose, "verbose" => \$verbose,
- "w=s" => \$opt_w, "warning=s" => \$opt_w,
- "c=s" => \$opt_c, "critical=s" => \$opt_c,
-- "H=s" => \$opt_H, "hostname=s" => \$opt_H);
-+ "H=s" => \$opt_H, "hostname=s" => \$opt_H,
-+ "C=s" => \$opt_C, "community=s" => \$opt_C);
-
- if ($opt_V) {
-@@ -40,6 +41,7 @@
- }
-
- $opt_H = shift unless ($opt_H);
-+$opt_C = "public" unless ($opt_C);
- print_usage() unless ($opt_H);
- my $host = $1 if ($opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0]+(\.[a-zA-Z][-a-zA-Z0]+)*)$/);
- print_usage() unless ($host);
-@@ -50,34 +52,34 @@
- ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
- my $warning = $1 if ($opt_w =~ /([0-9]+)/);
-
--$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
-+$low1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
- @test = split(/ /,$low1);
- $low1 = $test[2];
-
--$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
-+$med1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
- @test = split(/ /,$med1);
- $med1 = $test[2];
-
--$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
-+$high1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
- @test = split(/ /,$high1);
- $high1 = $test[2];
-
- sleep(2);
-
--$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
-+$snr = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.762.2.5.2.1.17.1`;
- @test = split(/ /,$snr);
- $snr = $test[2];
- $snr = int($snr*25);
-
--$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
-+$low2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
- @test = split(/ /,$low2);
- $low2 = $test[2];
-
--$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
-+$med2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
- @test = split(/ /,$med2);
- $med2 = $test[2];
-
--$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
-+$high2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
- @test = split(/ /,$high2);
- $high2 = $test[2];
-
-@@ -108,7 +110,7 @@
-
-
- sub print_usage () {
-- print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>]\n";
-+ print "Usage: $PROGNAME -H <host> [-C <community>] [-w <warn>] [-c <crit>]\n";
- }
-
- sub print_help () {
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/patches/patch-ak
--- a/net/nagios-plugin-snmp/patches/patch-ak Tue Jul 04 19:49:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2015/04/03 18:45:12 rodent Exp $
-
---- gl/mountlist.c.orig 2014-03-04 21:41:56.000000000 +0000
-+++ gl/mountlist.c
-@@ -52,7 +52,11 @@
- # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
- # define FS_TYPE(Ent) ((Ent).f_fstypename)
- # else
--# define FS_TYPE(Ent) mnt_names[(Ent).f_type]
-+# ifdef STAT_STATVFS
-+# define FS_TYPE(Ent) mnt_names[(Ent).f_fsid]
-+# else
-+# define FS_TYPE(Ent) mnt_names[(Ent).f_type]
-+# endif
- # endif
- #endif /* MOUNTED_GETFSSTAT */
-
-@@ -99,6 +103,10 @@
- # include <sys/statfs.h>
- #endif
-
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#endif
-+
- #ifdef MOUNTED_LISTMNTENT
- # include <mntent.h>
- #endif
-@@ -223,7 +231,7 @@ me_remote (char const *fs_name, char con
-
- #if MOUNTED_GETMNTINFO
-
--# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
-+# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME && ! STAT_STATVFS
- static char *
- fstype_to_string (short int t)
- {
-@@ -320,9 +328,13 @@ fstype_to_string (short int t)
- # endif
-
- static char *
-+#ifdef STAT_STATVFS
-+fsp_to_string (const struct statvfs *fsp)
-+#else
- fsp_to_string (const struct statfs *fsp)
-+#endif
- {
--# if HAVE_STRUCT_STATFS_F_FSTYPENAME
-+# if defined HAVE_STRUCT_STATFS_F_FSTYPENAME || defined STAT_STATVFS
- return (char *) (fsp->f_fstypename);
- # else
- return fstype_to_string (fsp->f_type);
-@@ -648,7 +660,11 @@ read_file_system_list (bool need_fs_type
- {
- int numsys, counter;
- size_t bufsize;
-+#ifdef STAT_STATVFS
-+ struct statvfs *stats;
-+#else
- struct statfs *stats;
-+#endif
-
- numsys = getfsstat (NULL, 0L, MNT_NOWAIT);
- if (numsys < 0)
-@@ -658,7 +674,11 @@ read_file_system_list (bool need_fs_type
-
- bufsize = (1 + numsys) * sizeof *stats;
- stats = xmalloc (bufsize);
-+#ifdef STAT_STATVFS
-+ numsys = getfsstat ((struct statvfs *)stats, bufsize, MNT_NOWAIT);
-+#else
- numsys = getfsstat (stats, bufsize, MNT_NOWAIT);
-+#endif
-
- if (numsys < 0)
- {
diff -r facf636ba313 -r 47b604fa9653 net/nagios-plugin-snmp/patches/patch-configure
--- a/net/nagios-plugin-snmp/patches/patch-configure Tue Jul 04 19:49:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2015/04/03 18:45:12 rodent Exp $
-
---- configure.orig 2014-06-26 16:17:37.000000000 +0000
-+++ configure
-@@ -17188,7 +17188,7 @@ _ACEOF
-
- fi
-
-- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-+ if false; then
- EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
- RADIUSLIBS="-lradiusclient"
-
-@@ -17363,7 +17363,7 @@ _ACEOF
-
- fi
-
-- if test "$ac_cv_lib_ldap_main" = "yes"; then
-+ if false; then
- LDAPLIBS="-lldap -llber"\
- LDAPINCLUDE="-I/usr/include/ldap"
-
-@@ -18791,6 +18791,9 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #ifdef HAVE_UNISTD_H
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
- #include <unistd.h>
- #endif
- #include <netinet/in.h>
-@@ -21524,7 +21527,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
- ac_cv_ps_cols=9
- { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
- $as_echo "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
- { $as_echo "$as_me:$LINENO: using 64bit pst3" >&5
- $as_echo "$as_me: using 64bit pst3" >&6;}
-@@ -22521,7 +22524,7 @@ fi
- then
- { $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5
- $as_echo_n "checking for nslookup syntax... " >&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 | grep -F "Invalid option: sil" >/dev/null
- then
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -23134,7 +23137,7 @@ IFS=$as_save_IFS
- esac
- fi
- PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING
--if test -n "$PATH_TO_FPING"; then
-+if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then
- { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5
- $as_echo "$PATH_TO_FPING" >&6; }
- else
-@@ -23174,7 +23177,7 @@ IFS=$as_save_IFS
- esac
- fi
- PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6
--if test -n "$PATH_TO_FPING6"; then
-+if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
- { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5
- $as_echo "$PATH_TO_FPING6" >&6; }
- else
-@@ -23750,6 +23753,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
-@@ -23812,6 +23819,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
-+
Home |
Main Index |
Thread Index |
Old Index