Removing CVS/SVN tags and replacing with git-based versioning

For contrib/, full tags have been imported from subversion


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c

BRANCHES

@@ -1,9 +0,0 @@
-# $Id$
-#
-# This file describes the current branches in CVS for nagiosplug
-# Used by sfsnapshot to generate the snapshots
-#
-# Format:
-# cvs_branch_name:description
-HEAD:Stable - 1.4.x releases
-r1_4-patches:Testing multiple branches

Makefile.am

@@ -5,7 +5,7 @@ SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERL
 # Have to list TAP_DIR manually to get in distribution
 EXTRA_DIST = config.rpath \
 	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
-	REQUIREMENTS SUPPORT THANKS \
+	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm contrib pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \
 	perlmods tools/build_perl_modules \
@@ -19,7 +19,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
-	rm -rf `find $(distdir) -name .svn`
+	echo ${VERSION} >$(distdir)/version
 
 install-root:
 	cd plugins-root && $(MAKE) $@
@@ -62,3 +62,4 @@ THANKS: THANKS.in
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
+

NP-VERSION-GEN

@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# This is from the Git repository (GIT-VERSION-GEN with modifications)
+#
+
+SRC_ROOT=`dirname $0`
+
+NPVF=NP-VERSION-FILE
+DEF_VER=1.4.13.git
+
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f $SRC_ROOT/version
+then
+	VN=`cat $SRC_ROOT/version` || VN="$DEF_VER"
+elif test -d $SRC_ROOT/.git -o -f $SRC_ROOT/.git &&
+	VN=`cd $SRC_ROOT; git describe --abbrev=4 HEAD 2>/dev/null` &&
+	case "$VN" in
+	*$LF*) (exit 1) ;;
+	release-[0-9]*)
+		git update-index -q --refresh
+		test -z "`git diff-index --name-only HEAD --`" ||
+		VN="$VN-dirty" ;;
+	esac
+then
+	VN=`echo "$VN" | sed -e 's/^release-//' | sed -e 's/-/./g'`;
+else
+	VN="$DEF_VER"
+fi
+
+VN=`expr "$VN" : v*'\(.*\)'`
+
+if test -r $NPVF
+then
+	VC=`sed -e 's/^NP_VERSION = //' <$NPVF`
+else
+	VC=unset
+fi
+test "$VN" = "$VC" || {
+	echo >&2 "NP_VERSION = $VN"
+	echo "NP_VERSION = $VN" >$NPVF
+}
+

NPTest.pm

@@ -21,7 +21,7 @@ use Data::Dumper;
 use Test;
 
 use vars qw($VERSION);
-$VERSION = do { my @r = (q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+$VERSION = "1556."; # must be all one line, for MakeMaker
 
 =head1 NAME
 

acinclude.m4

@@ -8,7 +8,6 @@ dnl e.g. 6 arguments (linux)
 dnl e.g. 5 arguments (solaris)
 dnl e.g. 3 arguments (osf/1)
 dnl
-dnl @version $Id$
 dnl @author Brian Stafford <brian@stafford.uklinux.net>
 dnl
 dnl based on version by Caolan McNamara <caolan@skynet.ie>

autogen.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # Requires: automake, autoconf, dpkg-dev
 # set -e
 

command.cfg.in

@@ -1,8 +1,6 @@
 ###############################################################################
 # COMMAND CONFIGURATION
 #
-# $Id$
-#
 # SYNTAX:
 # command[<command_name>]=<command_line>
 #

configure.in

@@ -1,5 +1,4 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION ($Revision$)
 AC_PREREQ(2.59)
 AC_INIT(nagios-plugins,1.4.13)
 AC_CONFIG_SRCDIR(NPTest.pm)

contrib/check_adptraid.sh

@@ -13,7 +13,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'`
 
 . $PROGPATH/utils.sh
 

contrib/check_apc_ups.pl

@@ -38,7 +38,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s"		=> \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 1771 $');
 	exit $ERRORS{'OK'};
 }
 
@@ -252,7 +252,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 1771 $');
 	print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop
 
 This plugin reports the status of an APC UPS equipped with an SNMP management

contrib/check_appletalk.pl

@@ -9,7 +9,7 @@
 # using "aecho"
 #
 # initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
-# current status: $Revision$
+# current status: $Revision: 1771 $
 #
 # Copyright Notice: GPL
 #
@@ -122,7 +122,7 @@ while (<CMD>) {
 }
 
 sub print_help() {
-     print_revision( $PROGNAME, '$Revision$ ' );
+     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
      print "Copyright (c) 2002 Stefan Beck\n";
      print "\n";
      print "Check if an atalkhost responds to an atalk echo using\n";
@@ -159,7 +159,7 @@ sub print_usage () {
 }
 
 sub version () {
-     print_revision( $PROGNAME, '$Revision$ ' );
+     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
      exit $ERRORS{'OK'};
 }
 

contrib/check_arping.pl

@@ -55,7 +55,7 @@ if ($status == 0)
 
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1112 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -115,6 +115,6 @@ sub print_help {
 	print "   -t (--timeout)    Timeout in seconds.\n";
 	print "   -V (--version)    Plugin version\n";
 	print "   -h (--help)       usage help \n\n";
-	print_revision($PROGNAME, '$Revision$');
+	print_revision($PROGNAME, '$Revision: 1112 $');
 	
 }

contrib/check_email_loop.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id$
+# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
 #
 # (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-)
 # Copyleft by GNU GPL

contrib/check_fan_cpq_present

@@ -111,7 +111,7 @@ sub print_usage () {
 	}
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@@ -122,7 +122,7 @@ sub print_help () {
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

contrib/check_fan_fsc_present

@@ -113,7 +113,7 @@ sub print_usage () {
 	}
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@@ -124,7 +124,7 @@ sub print_help () {
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

contrib/check_frontpage

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# $Id$
+# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $
 #
 # Check that FrontPage extensions appear to be working on a specified host.
 # Currently only checks that the hit counter is not returning an error.
@@ -42,7 +42,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$'); #'
+	print_revision($PROGNAME,'$Revision: 1112 $'); #'
 	exit $ERRORS{'OK'};
 }
 
@@ -139,7 +139,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-   print_revision($PROGNAME,'$Revision$');
+   print_revision($PROGNAME,'$Revision: 1112 $');
    print "Copyright (c) 2003 Kev Green\n";
    print "\n";
    print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n";

contrib/check_http-with-client-certificate.c

@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 const char *progname = "check_http";
-#define REVISION "$Revision$"
+#define REVISION "$Revision: 1117 $"
 #define CVSREVISION "1.24"
 #define COPYRIGHT "2003"
 #define AUTHORS "Fabian Pehla"

contrib/check_hw.sh

@@ -16,7 +16,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'`
 
 . $PROGPATH/utils.sh
 

contrib/check_ica_master_browser.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/25 09:09:33  stanleyhopcroft
 # New plugin - checks that ICA master browser is what it should be (important for firewalled dialup)
 #
@@ -170,7 +169,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1099 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 
 Perl Check Citrix Master Browser plugin for Nagios.
@@ -218,7 +217,7 @@ The ICA Client requests the address of the ICA master browser from the Citrix se
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1099 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/check_ica_metaframe_pub_apps.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/25 09:07:39  stanleyhopcroft
 # Replacement (structured name mainly) for check_citrix: check of ICA browse service
 #
@@ -303,7 +302,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1098 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 
 Perl Check Citrix plugin for Nagios.
@@ -350,7 +349,7 @@ The plugin works by
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1098 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/check_ica_program_neigbourhood.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/25 09:05:53  stanleyhopcroft
 # New plugin to check Citrix Metaframe XP "Program Neighbourhood"
 #
@@ -290,7 +289,7 @@ sub print_help() {
 #          1        2         3         4         5         6         7         8
 #12345678901234567890123456789012345678901234567890123456789012345678901234567890
 
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1097 $ ');
 
 my $help = <<EOHELP ;
 Copyright (c) 2004 Karl DeBisschop/S Hopcroft
@@ -345,7 +344,7 @@ sub usage {
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1097 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/check_inodes-freebsd.pl

@@ -41,7 +41,7 @@ GetOptions
 	
 
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 72 $ ');
         exit $ERRORS{'OK'};
 }
 
@@ -114,7 +114,7 @@ sub print_usage () {
 }
                 
 sub print_help () {
-        print_revision($PROGNAME,'$Revision$');
+        print_revision($PROGNAME,'$Revision: 72 $');
         print "Copyright (c) 2002 Andrew Ryder\n";
         print "\n";
         print_usage();

contrib/check_javaproc.pl

@@ -170,7 +170,7 @@ Perl Check java processes plugin for Nagios
 }
 
 sub revision() {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 211 $ ');
 }
 
 sub version () {

contrib/check_joy.sh

@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2 $' | sed -e 's/[^0-9.]//g'`
 STATUS=""
 
 . $PROGPATH/utils.sh

contrib/check_log2.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id$
+# $Id: check_log2.pl 1300 2005-12-16 18:41:45Z harpermann $
 #
 # Log file regular expression detector for Nagios.
 # Written by Aaron Bostick (abostick@mydoconline.com)
@@ -77,7 +77,7 @@ sub print_help ();
     $neg_re_pattern = '';
     $pattern_count = 0;
     $pattern_line = '';
-    $plugin_revision = '$Revision$ ';
+    $plugin_revision = '$Revision: 1300 $ ';
 
     # Grab options from command line
     GetOptions

contrib/check_lotus.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_lotus.pl 1096 2005-01-25 09:04:26Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/25 09:04:26  stanleyhopcroft
 # New plugin to check responsiveness of Louts Notes (v5 at least) servers
 #
@@ -219,7 +218,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1096 $ ');
 	print "Copyright (c) 2004 Ed Rolison/S Hopcroft
 
 Perl Check Lotus Notes plugin for Nagios.
@@ -250,7 +249,7 @@ Returns OK if the named server responds with its name.
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1096 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/check_mem.pl

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id$
+# $Id: check_mem.pl 2 2002-02-28 06:42:51Z egalstad $
 
 # check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net>
 #

contrib/check_ms_spooler.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2002/07/16 00:04:42  stanleyhopcroft
 # Primitive and in need of refinement test of MS spooler (with smbclient)
 #
@@ -268,7 +267,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 64 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 
 Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler.
@@ -292,7 +291,7 @@ Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 64 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/check_ora_table_space.pl

@@ -4,8 +4,8 @@
 # Written by: Erwan Arzur (erwan@netvalue.com)
 # License: GPL
 #
-# Last Modified: $Date$
-# Revisiin: $Revision$
+# Last Modified: $Date: 2002-02-28 01:42:51 -0500 (Thu, 28 Feb 2002) $
+# Revisiin: $Revision: 2 $
 #
 # "check_ora_table_space.pl" plugin to check the state of Oracle 
 # table spaces. Scarce documentation.

contrib/check_oracle_instance.pl

@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id$
+# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $
 
 #  Copyright (c) 2002  Sven Dolderer
 #  some pieces of Code adopted from Adam vonNieda's oracletool.pl
@@ -23,7 +23,7 @@ require DBD::Oracle || die "It appears that the DBD::Oracle module is not instal
 
 use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical);
 
-'$Revision$' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
+'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
 $VERSION = $1;
 $0 =~ m!^.*/([^/]+)$!;
 $PROGNAME = $1;

contrib/check_oracle_tbs

@@ -30,7 +30,7 @@ if (!$ENV{ORACLE_HOME}) {
 my $state = $ERRORS{'UNKNOWN'};
 my $answer = undef;
 
-my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision$ =~ /(\d+)\.(\d+)/;
+my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/;
 my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION);
 
 my $opt_debug;                  # -d|--debug

contrib/check_pfstate

@@ -27,7 +27,7 @@ GetOptions
 	 "c=s" => \$opt_c, "critical=s"	=> \$opt_c);
 
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision$');
+        print_revision($PROGNAME,'$Revision: 1112 $');
         exit $ERRORS{'OK'};
 }
 if ($opt_h) {
@@ -67,7 +67,7 @@ exit $ERRORS{'OK'};
 
 
 sub print_help {
-        print_revision($PROGNAME,'$Revision$');
+        print_revision($PROGNAME,'$Revision: 1112 $');
         print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n";
         print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n";
         support();

contrib/check_rbl.c

@@ -11,7 +11,7 @@
 * * License: GPL
 * * Copyright (c) 2000
 * * 
-* * $Id$
+* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
 *
 *****************************************************************************/
 
@@ -22,7 +22,7 @@
 #include "string.h"
 
 const char progname = "check_rbl";
-const char *revision = "$Revision$";
+const char *revision = "$Revision: 970 $";
 //const char *copyright = "2000-2003";
 //const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -263,7 +263,7 @@ int call_getopt(int argc, char **argv)
 				}
 				break;
       case 'V': /* version */
-				print_revision(progname,"$Revision$");
+				print_revision(progname,"$Revision: 970 $");
 				exit(STATE_OK);
       case 'h': /* help */
 				print_help();
@@ -291,7 +291,7 @@ int validate_arguments(void)
 
 void print_help(void)
 {
-	print_revision(progname,"$Revision$");
+	print_revision(progname,"$Revision: 970 $");
 	printf
 		("Copyright (c) 2000 Karl DeBisschop\n\n"
 		 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");

contrib/check_smb.sh

@@ -26,7 +26,7 @@
 #
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'`
 
 
 . $PROGPATH/utils.sh

contrib/check_snmp_disk_monitor.pl

@@ -52,7 +52,7 @@ sub process_options {
 }
 
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision$ ' )
+        print_revision( $PROGNAME, '$Revision: 82 $ ' )
 }
 
 sub print_usage {

contrib/check_snmp_printer.pl

@@ -116,7 +116,7 @@ GetOptions
 $PROGNAME = "check_snmp_printer";
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 795 $');
 	exit $ERRORS{'OK'};
 }
 
@@ -572,7 +572,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 795 $');
 	print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad.
 
 This plugin reports the status of an network printer with an SNMP management

contrib/check_snmp_process_monitor.pl

@@ -91,7 +91,7 @@ sub process_options {
 }
 
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision$ ' )
+        print_revision( $PROGNAME, '$Revision: 84 $ ' )
 }
 
 sub print_usage {

contrib/check_snmp_procs.pl

@@ -109,7 +109,7 @@ if (GetOptions(
 }
 
 if ($opt_version) {
-	print_revision($PROGNAME, "\$Revision$REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
 	exit $ERRORS{'OK'};
 }
 
@@ -529,7 +529,7 @@ sub print_usage {
 
 #
 sub print_help {
-	print_revision($PROGNAME, "\$Revision$REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
 	print "Copyright (c) 2003 David Alden
 
 Check if processes are running on a host via snmp

contrib/check_temp_cpq

@@ -138,7 +138,7 @@ sub print_usage () {
 	}
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@@ -151,7 +151,7 @@ sub print_help () {
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

contrib/check_temp_fsc

@@ -138,7 +138,7 @@ sub print_usage () {
 	}
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@@ -149,7 +149,7 @@ sub print_help () {
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

contrib/check_traceroute.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 
-# $Id$
+# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/27 10:34:16  stanleyhopcroft
 # Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak
 #
@@ -32,7 +31,7 @@ getopts('i:H:N:R:T:dhrvV');
 do { print_help ; exit $ERRORS{OK}; }
 	if $opt_h ;
 
-do { print_revision($PROGNAME, '$Revision$'); exit $ERRORS{OK}; }
+do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; }
 	if $opt_V ;
 
 do { print_help; exit $ERRORS{OK}; }
@@ -176,7 +175,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME, '$Revision$') ;
+	print_revision($PROGNAME, '$Revision: 1115 $') ;
 	print "Copyright (c) 2004 J Meek/Karl DeBisschop
 
 This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers

contrib/check_uptime.c

@@ -9,7 +9,7 @@
  * Based on CHECK_LOAD.C
  * Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>
  *
- * Last Modified: $Date$
+ * Last Modified: $Date: 2002-02-28 21:42:56 -0500 (Thu, 28 Feb 2002) $
  *
  * Command line: CHECK_UPTIME <host_address>
  * 
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
   if(argc != 2){
     printf("Incorrect number of arguments supplied\n");
     printf("\n");
-    print_revision(argv[0],"$Revision$");
+    print_revision(argv[0],"$Revision: 6 $");
     printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n");
     printf("\n");
     printf("Usage: %s <host_address>\n",argv[0]);

contrib/check_vcs.pl

@@ -71,7 +71,7 @@ sub print_help ();
     $vcs_negate = '';
     $vcs_result = '';
     $vcs_expected_result = 'ONLINE';
-    $plugin_revision = '$Revision$ ';
+    $plugin_revision = '$Revision: 33 $ ';
 
     # Grab options from command line
     GetOptions

contrib/check_wins.pl

@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
-# $Id$
+# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.3  2004/11/25 04:46:16  stanleyhopcroft
 # Non functional tidy ups to check_wins
 #
@@ -190,7 +189,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 940 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 
 Perl Check WINS plugin for NetSaint.
@@ -237,7 +236,7 @@ The plugin works by
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 940 $ ');
 	exit $ERRORS{'OK'};
 }
 

contrib/packet_utils.pm

@@ -1,8 +1,7 @@
 package packet_utils;
 
-# $Id$
+# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $
 
-# $Log$
 # Revision 1.1  2005/01/25 09:12:47  stanleyhopcroft
 # packet creation and dumping hacks used by check_ica* and check_lotus
 #

contrib/utils.py

@@ -8,7 +8,7 @@
 
 #==========================================================================
 #
-# Version: = '$Id$'
+# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
 #
 # (C) Rob W.W. Hooft, Nonius BV, 1998
 #

doc/BRANCHING

@@ -1,10 +0,0 @@
-NOTES ON BRANCHING NAGIOSPLUG
-
-Questions:
-Is this necessary?
-
-Branch format: b1_4_1
-
-cvs tab -b r1_4-patches
-
-Consider the SF snapshot branches - should you remove any other branches?

doc/developer-guidelines.sgml

@@ -16,8 +16,8 @@
 	
     <revhistory>
        <revision>
-          <revnumber>$Revision$</revnumber>
-          <date>$Date$</date>
+          <revnumber>1796</revnumber>
+          <date>2007-09-24 14:51:07 -0400 (Mon, 24 Sep 2007)</date>
        </revision>
     </revhistory>
 

lib/extra_opts.c

@@ -5,9 +5,6 @@
 * License: GPL
 * Copyright (c) 2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date: 2008-03-15 18:42:01 -0400 (Sat, 15 Mar 2008) $
-* 
-* 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@@ -21,8 +18,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id: parse_ini.c 1950 2008-03-15 22:42:01Z dermoth $
-* 
 *****************************************************************************/
 
 #include "common.h"

lib/parse_ini.c

@@ -5,9 +5,6 @@
 * License: GPL
 * Copyright (c) 2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
-* 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +18,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_base64.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_cmd.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_disk.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_ini.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_opts.c

@@ -13,8 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id: test_ini.c 1951 2008-03-16 18:10:47Z dermoth $
-* 
 *****************************************************************************/
 
 #include "common.h"

lib/tests/test_tcp.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/tests/test_utils.c

@@ -13,7 +13,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/utils_base.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2006 Nagios Plugins Development Team
 *
-* Last Modified: $Date$
-*
 * Library of useful functions for plugins
 * 
 *
@@ -23,7 +21,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 *
 *****************************************************************************/
 

lib/utils_cmd.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2005-2006 Nagios Plugins Development Team
 *
-* Last Modified: $Date$
-*
 * Description :
 *
 * A simple interface to executing programs from other programs, using an
@@ -35,7 +33,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
-* $Id$
 *
 *****************************************************************************/
 

lib/utils_disk.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains utilities for check_disk. These are tested by libtap
@@ -25,7 +23,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

lib/utils_tcp.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains utilities for check_tcp. These are tested by libtap
@@ -25,7 +23,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 

plugins-root/Makefile.am

@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
@@ -74,3 +80,10 @@ pst3_LDFLAGS = @PST3CFLAGS@
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
 check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)
+
+all-local: .FORCE-NP-VERSION-FILE
+
+clean-local:
+	rm -f NP-VERSION-FILE
+
+.PHONY: .FORCE-NP-VERSION-FILE

plugins-root/check_dhcp.c

@@ -6,8 +6,6 @@
 * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
 * Copyright (c) 2001-2007 Nagios Plugin Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dhcp plugin
@@ -32,12 +30,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_dhcp";
-const char *revision = "$Revision$";
 const char *copyright = "2001-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -1168,7 +1164,7 @@ int call_getopt(int argc, char **argv){
 			break;
 
 		case 'V': /* version */
-			print_revision(progname,revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 
 		case 'h': /* help */
@@ -1385,7 +1381,7 @@ void print_hardware_address(const unsigned char *address){
 /* print usage help */
 void print_help(void){
 
-	print_revision(progname,revision);
+	print_revision(progname, NP_VERSION);
 
 	printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
 	printf (COPYRIGHT, copyright, email);

plugins-root/check_icmp.c

@@ -6,8 +6,6 @@
 * Copyright (c) 2005-2008 Nagios Plugins Development Team
 * Original Author : Andreas Ericsson <ae@op5.se>
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_icmp plugin
@@ -35,14 +33,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 /* progname may change */
 /* char *progname = "check_icmp"; */
 char *progname;
-const char *revision = "$Revision$";
 const char *copyright = "2005-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -516,7 +512,7 @@ main(int argc, char **argv)
 				set_source_ip(optarg);
 				break;
       case 'V':                 /* version */
-        /*print_revision (progname, revision);*/ /* FIXME: Why? */
+        print_revision (progname, NP_VERSION);
         exit (STATE_OK);
       case 'h':                 /* help */
         print_help ();
@@ -1272,7 +1268,7 @@ void
 print_help(void)
 {
 
-  /*print_revision (progname, revision);*/ /* FIXME: Why? */
+  /*print_revision (progname);*/ /* FIXME: Why? */
 
   printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
   printf (COPYRIGHT, copyright, email);

plugins-root/t/check_icmp.t

@@ -2,8 +2,6 @@
 #
 # Ping Response Tests via check_icmp
 #
-# $Id$
-#
 
 use strict;
 use Test::More;

plugins-scripts/Makefile.am

@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+export NP_VERSION:= $(NP_VERSION)
+
 SUFFIXES = .pl .sh
 
 VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t
@@ -18,6 +24,8 @@ TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)
 
 TESTS = @SCRIPT_TEST@
 
+all-local: NP-VERSION-FILE
+
 test:
 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t	# utils.t is excluded from above, so manually ask to test
@@ -35,3 +43,8 @@ CLEANFILES=$(libexec_SCRIPTS)
 .sh :
 	$(AWK) -f ./subst $< > $@
 	chmod +x $@
+
+clean-local:
+	rm -f NP-VERSION-FILE
+
+.PHONY: .FORCE-NP-VERSION-FILE

plugins-scripts/check_breeze.pl

@@ -26,7 +26,7 @@ GetOptions
 	 "C=s" => \$opt_C, "community=s" => \$opt_C);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	exit $ERRORS{'OK'};
 }
 
@@ -65,7 +65,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2000 Jeffrey Blank/Karl DeBisschop
 
 This plugin reports the signal strength of a Breezecom wireless equipment

plugins-scripts/check_disk_smb.pl

@@ -16,7 +16,6 @@
 #  drives is a pain in the butt
 # 2-May-2002 - SGhosh fix for embedded perl
 #
-# $Id$
 #
 
 require 5.004;
@@ -52,7 +51,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$'); #'
+	print_revision($PROGNAME,'@NP_VERSION@'); #'
 	exit $ERRORS{'OK'};
 }
 
@@ -243,7 +242,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
 
 Perl Check SMB Disk plugin for Nagios

plugins-scripts/check_file_age.pl

@@ -1,5 +1,4 @@
 #!/bin/perl -w
-# $Id$
 
 # check_file_age.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com>
 #
@@ -55,7 +54,7 @@ GetOptions(
 	"C=f" => \$opt_C, "critical-size=f" => \$opt_C);
 
 if ($opt_V) {
-	print_revision($PROGNAME, '$Revision$');
+	print_revision($PROGNAME, '@NP_VERSION@');
 	exit $ERRORS{'OK'};
 }
 
@@ -102,7 +101,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME, '$Revision$');
+	print_revision($PROGNAME, '@NP_VERSION@');
 	print "Copyright (c) 2003 Steven Grimm\n\n";
 	print_usage();
 	print "\n";

plugins-scripts/check_flexlm.pl

@@ -26,7 +26,6 @@
 # initial version: 9-10-99 Ernst-Dieter Martin edmt@infineon.com
 #
 # License: GPL
-# $Id$
 #
 # lmstat output patches from Steve Rigler/Cliff Rice 13-Apr-2002
 # srigler@marathonoil.com,cerice@marathonoil.com
@@ -57,7 +56,7 @@ GetOptions
 	 "t=i" => \$opt_t, "timeout=i"  => \$opt_t);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	exit $ERRORS{'OK'};
 }
 
@@ -217,7 +216,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2000 Ernst-Dieter Martin/Karl DeBisschop
 
 Check available flexlm license managers

plugins-scripts/check_ifoperstatus.pl

@@ -25,7 +25,6 @@
 # Report bugs to:  nagiosplug-help@lists.sourceforge.net
 #
 # 11.01.2000 Version 1.0
-# $Id$
 #
 # Patches from Guy Van Den Bergh to warn on ifadminstatus down interfaces
 # instead of critical.
@@ -313,7 +312,7 @@ sub print_help() {
 	printf "intensive.  Use it sparingly or not at all.  -n is used to match against\n";
 	printf "a much more descriptive ifName value in the IfXTable to verify that the\n";
 	printf "snmpkey has not changed to some other network interface after a reboot.\n\n";
-	print_revision($PROGNAME, '$Revision$');
+	print_revision($PROGNAME, '@NP_VERSION@');
 	
 }
 
@@ -351,7 +350,7 @@ sub process_arguments() {
 	}
   
 	if ($opt_V) {
-		print_revision($PROGNAME,'$Revision$ ');
+		print_revision($PROGNAME,'@NP_VERSION@');
 		exit $ERRORS{'OK'};
 	}
 

plugins-scripts/check_ifstatus.pl

@@ -29,7 +29,6 @@
 # 
 # 11.01.2000 Version 1.0
 #
-# $Id$
 
 use POSIX;
 use strict;
@@ -255,7 +254,7 @@ sub print_help (){
 	printf "   -t (--timeout)    seconds before the plugin times out (default=$TIMEOUT)\n";
 	printf "   -V (--version)    Plugin version\n";
 	printf "   -h (--help)       usage help \n\n";
-	print_revision($PROGNAME, '$Revision$');
+	print_revision($PROGNAME, '@NP_VERSION@');
 	
 }
 
@@ -285,7 +284,7 @@ sub process_arguments() {
 		exit $ERRORS{'OK'};
 	}
 	if ($opt_V) {
-		print_revision($PROGNAME,'$Revision$ ');
+		print_revision($PROGNAME,'@NP_VERSION@');
 		exit $ERRORS{'OK'};
 	}
 

plugins-scripts/check_ircd.pl

@@ -7,7 +7,6 @@
 #
 # Date:			1999/09/20
 #
-# $Id$
 #
 # Description:		This script will check to see if an IRCD is running
 #			about how many users it has
@@ -119,7 +118,7 @@ sub print_usage () {
 
 sub print_help ()
 {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
 
 Perl Check IRCD plugin for Nagios
@@ -190,7 +189,7 @@ MAIN:
 		"H=s" => \$opt_H,  "hostname=s" => \$opt_H);
 
 	if ($opt_V) {
-		print_revision($PROGNAME,'$Revision$ ');
+		print_revision($PROGNAME,'@NP_VERSION@');
 		exit $ERRORS{'OK'};
 	}
 

plugins-scripts/check_log.sh

@@ -71,7 +71,7 @@ TOUCH="/bin/touch"
 
 PROGNAME=`/bin/basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
 
 . $PROGPATH/utils.sh
 

plugins-scripts/check_mailq.pl

@@ -22,7 +22,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id$
 #
 ############################################################################
 
@@ -522,7 +521,7 @@ sub process_arguments(){
 		 );
 
 	if ($opt_V) {
-		print_revision($PROGNAME,'$Revision$ ');
+		print_revision($PROGNAME,'@NP_VERSION@');
 		exit $ERRORS{'OK'};
 	}
 
@@ -580,7 +579,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n";
 	print "\n";
 	print_usage();

plugins-scripts/check_mssql.pl

@@ -23,7 +23,6 @@
 #
 # Report bugs to: nagiosplug-help@lists.sourceforge.net
 # 
-# $Id$
 #
 
 
@@ -125,7 +124,7 @@ sub process_arguments {
 		 "V" => \$opt_V, "version" => \$opt_V);
 
 	if (defined $opt_V) {
-		print_revision($PROGNAME,'$Revision$');
+		print_revision($PROGNAME,'@NP_VERSION@');
 		exit $ERRORS{'OK'};
 	}
 

plugins-scripts/check_netdns.pl

@@ -5,7 +5,6 @@
 #
 # Copyright 2000, virCIO, LLP
 #
-# $Log$
 # Revision 1.3  2002/05/07 05:35:49  sghosh
 # 2nd fix for ePN
 #

plugins-scripts/check_ntp.pl

@@ -7,7 +7,6 @@
 # be installed on the system, however since it's part of the ntp suite, you 
 # should already have it installed.
 #
-# $Id$
 #
 # Nothing clever done in this program - its a very simple bare basics hack to
 # get the job done.
@@ -97,7 +96,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	exit $ERRORS{'OK'};
 }
 
@@ -443,7 +442,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n";
 	print "\n";
 	print_usage();

plugins-scripts/check_oracle.sh

@@ -8,7 +8,7 @@
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
 
 . $PROGPATH/utils.sh
 

plugins-scripts/check_rpc.pl

@@ -15,10 +15,8 @@
 #
 # initial version: 3 May 2000 by Truongchinh Nguyen and Karl DeBisschop
 # Modified May 2002 Subhendu Ghosh - support for ePN and patches
-# current status: $Revision$
 #
 # Copyright Notice: GPL
-# $Id$
 #
 
 use strict;
@@ -38,13 +36,13 @@ sub print_help ();
 sub print_usage ();
 sub in ($$);
 
-$ENV{'BASH_ENV'}=''; 
+$ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
 $ENV{'PATH'}='';
 $ENV{'LC_ALL'}='C';
 
 #Initialise protocol for each progname number
-# 'u' for UDP, 't' for TCP 
+# 'u' for UDP, 't' for TCP
 $proto[10003]='u';
 $proto[10004]='u';
 $proto[10007]='u';
@@ -67,9 +65,9 @@ GetOptions(
 if ($opt_h) { print_help(); exit $ERRORS{'OK'}; }
 
 # -V means display version number
-if ($opt_V) { 
-	print_revision($PROGNAME,'$Revision$ '); 
-	exit $ERRORS{'OK'}; 
+if ($opt_V) {
+	print_revision($PROGNAME,'@NP_VERSION@');
+	exit $ERRORS{'OK'};
 }
 
 # Hash containing all RPC program names and numbers
@@ -275,7 +273,7 @@ if (defined $opt_c ) {
 		}else{
 			print "Version $vers is not an integer\n" if $verbose;
 		}
-	
+
 	}
 }else{
 	get_rpcinfo();
@@ -311,7 +309,7 @@ sub get_rpcinfo {
 	while ( $line = <CMD> ) {
 		printf "$line " if $verbose;
 		chomp $line;
-	
+
     	if ( $line =~ /program $prognum version ([0-9]*) ready and waiting/ ) {
 			$response .= " version $1";
 			$state = 'OK' unless $state ne 'UNKNOWN';
@@ -336,7 +334,7 @@ sub get_rpcinfo {
 
 
 sub print_help() {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2002 Karl DeBisschop/Truongchinh Nguyen/Subhendu Ghosh\n";
 	print "\n";
 	print "Check if a rpc service is registered and running using\n";

plugins-scripts/check_sensors.sh

@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
 
 . $PROGPATH/utils.sh
 

plugins-scripts/check_wave.pl

@@ -1,6 +1,5 @@
 #!/usr/bin/perl -wT
 #
-# $Id$
 
 
 use strict;
@@ -30,7 +29,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$'); #'
+	print_revision($PROGNAME,'@NP_VERSION@'); #'
 	exit $ERRORS{'OK'};
 }
 
@@ -112,7 +111,7 @@ sub print_usage () {
 }
 
 sub print_help () {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'@NP_VERSION@');
 	print "Copyright (c) 2000 Jeffery Blank/Karl DeBisschop\n";
 	print "\n";
 	print_usage();

plugins-scripts/subst.in

@@ -37,6 +37,9 @@ BEGIN {
 
 }
 
+# Plugin revision
+/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);}
+
 # scripting language (first line)
 
 /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}

plugins-scripts/t/check_file_age.t

@@ -2,7 +2,6 @@
 #
 # check_file_age tests
 #
-# $Id$
 #
 
 use strict;

plugins-scripts/t/check_rpc.t

@@ -2,7 +2,6 @@
 #
 # Remote Procedure Call (RPC) Tests via check_rpc
 #
-# $Id$
 #
 
 use strict;

plugins-scripts/t/utils.t

@@ -2,7 +2,6 @@
 #
 # utils.pm tests
 #
-# $Id$
 #
 # Run with perl t/utils.t
 

plugins-scripts/utils.pm.in

@@ -1,5 +1,4 @@
 # Utility drawer for Nagios plugins.
-# $Id$
 #
 # This will be deprecated soon. Please use Nagios::Plugin from CPAN
 # for new plugins
@@ -32,8 +31,6 @@ $TIMEOUT = 15;
 sub print_revision ($$) {
 	my $commandName = shift;
 	my $pluginRevision = shift;
-	$pluginRevision =~ s/^\$Revision: //;
-	$pluginRevision =~ s/ \$\s*$//;
 	print "$commandName v$pluginRevision (@PACKAGE@ @VERSION@)\n";
 	print "@WARRANTY@";
 }

plugins/Makefile.am

@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
 
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
@@ -65,10 +71,10 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
 check_load_LDADD = $(BASEOBJS) popen.o
 check_mrtg_LDADD = $(BASEOBJS)
 check_mrtgtraf_LDADD = $(BASEOBJS)
-check_mysql_CFLAGS = $(MYSQLCFLAGS)
+check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
 check_mysql_CPPFLAGS = $(MYSQLINCLUDE)
 check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
-check_mysql_query_CFLAGS = $(MYSQLCFLAGS)
+check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
 check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
 check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
 check_nagios_LDADD = $(BASEOBJS) runcmd.o
@@ -153,7 +159,7 @@ getaddrinfo.o: getaddrinfo.h $(PLUGINHDRS)
 
 gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
 
-all-local: $(check_tcp_programs)
+all-local: $(check_tcp_programs) NP-VERSION-FILE
 
 $(check_tcp_programs): check_tcp
 	rm -f $@
@@ -166,6 +172,10 @@ install-exec-hook:
 	
 clean-local:
 	rm -f $(check_tcp_programs)
+	rm -f NP-VERSION-FILE
 
 uninstall-local:
 	cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
+
+.PHONY: .FORCE-NP-VERSION-FILE
+

plugins/check_apt.c

@@ -7,8 +7,6 @@
 * 
 * Original author: Sean Finney
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_apt plugin
@@ -29,12 +27,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
-* 
 *****************************************************************************/
 
 const char *progname = "check_apt";
-const char *revision = "$Revision$";
 const char *copyright = "2006-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -159,7 +154,7 @@ int process_arguments (int argc, char **argv) {
 			print_help();
 			exit(STATE_OK);
 		case 'V':
-			print_revision(progname, revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 		case 'v':
 			verbose++;
@@ -404,7 +399,7 @@ char* construct_cmdline(upgrade_type u, const char *opts){
 void
 print_help (void)
 {
-  print_revision(progname, revision);
+  print_revision(progname, NP_VERSION);
 
   printf(_(COPYRIGHT), copyright, email);
 

plugins/check_by_ssh.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_by_ssh plugin
@@ -25,12 +23,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_by_ssh";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -201,7 +197,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -339,7 +335,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
 	printf (COPYRIGHT, copyright, email);

plugins/check_cluster.c

@@ -6,9 +6,6 @@
 * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
 * Copyright (c) 2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
-* 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@@ -22,12 +19,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_cluster";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -204,7 +199,7 @@ int process_arguments(int argc, char **argv){
 			break;
 
 		case 'V': /* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 			break;
 
@@ -228,7 +223,7 @@ int process_arguments(int argc, char **argv){
 void
 print_help(void)
 {
-	print_revision(progname, revision);
+	print_revision(progname, NP_VERSION);
 	printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
 	printf(COPYRIGHT, copyright, email);
 

plugins/check_dig.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2002-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dig plugin
@@ -25,7 +23,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
@@ -36,7 +33,6 @@
  *  because on some architectures those strings are in non-writable memory */
 
 const char *progname = "check_dig";
-const char *revision = "$Revision$";
 const char *copyright = "2002-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -220,7 +216,7 @@ process_arguments (int argc, char **argv)
       print_help ();
       exit (STATE_OK);
     case 'V':                 /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
     case 'H':                 /* hostname */
       host_or_die(optarg);
@@ -312,7 +308,7 @@ print_help (void)
 
   asprintf (&myport, "%d", DEFAULT_PORT);
 
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_disk.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -25,13 +23,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_disk";
 const char *program_name = "check_disk";  /* Required for coreutils libs */
-const char *revision = "$Revision$";
 const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -787,7 +783,7 @@ process_arguments (int argc, char **argv)
       group = NULL;
       break;
     case 'V':                 /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
     case 'h':                 /* help */
       print_help ();
@@ -896,7 +892,7 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_dns.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dns plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_dns";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -363,7 +359,7 @@ process_arguments (int argc, char **argv)
       print_help ();
       exit (STATE_OK);
     case 'V': /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
     case 'v': /* version */
       verbose = TRUE;
@@ -446,7 +442,7 @@ validate_arguments ()
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_dummy.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dummy plugin
@@ -27,12 +25,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_dummy";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -55,7 +51,7 @@ main (int argc, char **argv)
   if (argc < 2)
     usage4 (_("Could not parse arguments"));
   else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
-    print_revision (progname, revision);
+    print_revision (progname, NP_VERSION);
     exit (STATE_OK);
   }
   else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) {
@@ -100,7 +96,7 @@ main (int argc, char **argv)
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_fping.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_fping";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -264,7 +260,7 @@ process_arguments (int argc, char **argv)
       print_help ();
       exit (STATE_OK);
     case 'V':                 /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
     case 'v':                 /* verbose mode */
       verbose = TRUE;
@@ -368,7 +364,7 @@ void
 print_help (void)
 {
 
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_game.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2002-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_game plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 *
 *****************************************************************************/
 
 const char *progname = "check_game";
-const char *revision = "$Revision$";
 const char *copyright = "2002-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -202,7 +198,7 @@ process_arguments (int argc, char **argv)
       print_help ();
       exit (STATE_OK);
     case 'V': /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
     case 'v': /* version */
       verbose = TRUE;
@@ -293,7 +289,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_hpjd.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_hpjd plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_hpjd";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -346,7 +342,7 @@ process_arguments (int argc, char **argv)
 			community = strscpy (community, optarg);
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -387,7 +383,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
 	printf (COPYRIGHT, copyright, email);

plugins/check_http.c

@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_http plugin
@@ -30,14 +28,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 /* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
 
 const char *progname = "check_http";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -144,8 +140,8 @@ main (int argc, char **argv)
   /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
   server_url = strdup(HTTP_URL);
   server_url_length = strlen(server_url);
-  asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
-            clean_revstring (revision), VERSION);
+  asprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
+            NP_VERSION, VERSION);
 
 	/* Parse extra opts if any */
 	argv=np_extra_opts (&argc, argv, progname);
@@ -242,7 +238,7 @@ process_arguments (int argc, char **argv)
       exit (STATE_OK);
       break;
     case 'V': /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
       break;
     case 't': /* timeout period */
@@ -1271,7 +1267,7 @@ char *perfd_size (int page_len)
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
   printf (COPYRIGHT, copyright, email);

plugins/check_ide_smart.c

@@ -9,8 +9,6 @@
 * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ide_smart plugin
@@ -32,12 +30,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_ide_smart";
-const char *revision = "$Revision$";
 const char *copyright = "1998-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 	
@@ -211,7 +207,7 @@ main (int argc, char *argv[])
 			print_help ();
 			return STATE_OK;
 		case 'V':
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			return STATE_OK;
 		default:
 			usage5 ();
@@ -481,7 +477,7 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
 	printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");