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

38 files changed, 73 insertions, 81 deletions

diff --git a/contrib/check_adptraid.sh b/contrib/check_adptraid.sh
index d7f8d0c3..e3c47bee 100644
--- a/contrib/check_adptraid.sh
+++ b/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
 
diff --git a/contrib/check_apc_ups.pl b/contrib/check_apc_ups.pl
index 2b6990f7..6bf17662 100644
--- a/contrib/check_apc_ups.pl
+++ b/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
diff --git a/contrib/check_appletalk.pl b/contrib/check_appletalk.pl
index 6df4c7a1..9277686c 100644
--- a/contrib/check_appletalk.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_arping.pl b/contrib/check_arping.pl
index b78ec68f..c41c4a8a 100644
--- a/contrib/check_arping.pl
+++ b/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 $');
         
 }
diff --git a/contrib/check_email_loop.pl b/contrib/check_email_loop.pl
index fb418ee3..1b02ea3c 100644
--- a/contrib/check_email_loop.pl
+++ b/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
diff --git a/contrib/check_fan_cpq_present b/contrib/check_fan_cpq_present
index 476a0c36..0bd13909 100644
--- a/contrib/check_fan_cpq_present
+++ b/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'};
 }
 
diff --git a/contrib/check_fan_fsc_present b/contrib/check_fan_fsc_present
index 5bddb87c..19f8e7f0 100644
--- a/contrib/check_fan_fsc_present
+++ b/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'};
 }
 
diff --git a/contrib/check_frontpage b/contrib/check_frontpage
index ee958d30..21c5267b 100644
--- a/contrib/check_frontpage
+++ b/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";
diff --git a/contrib/check_http-with-client-certificate.c b/contrib/check_http-with-client-certificate.c
index 157d028a..60e14812 100644
--- a/contrib/check_http-with-client-certificate.c
+++ b/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"
diff --git a/contrib/check_hw.sh b/contrib/check_hw.sh
index f03398ea..9d3b5743 100644
--- a/contrib/check_hw.sh
+++ b/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
 
diff --git a/contrib/check_ica_master_browser.pl b/contrib/check_ica_master_browser.pl
index 1bbab60b..922e7187 100755
--- a/contrib/check_ica_master_browser.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_ica_metaframe_pub_apps.pl b/contrib/check_ica_metaframe_pub_apps.pl
index cc1325ba..0edbdcaf 100755
--- a/contrib/check_ica_metaframe_pub_apps.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_ica_program_neigbourhood.pl b/contrib/check_ica_program_neigbourhood.pl
index f29c0d1d..1f0fb455 100755
--- a/contrib/check_ica_program_neigbourhood.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_inodes-freebsd.pl b/contrib/check_inodes-freebsd.pl
index 6dc83754..d66e5e3f 100644
--- a/contrib/check_inodes-freebsd.pl
+++ b/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();
diff --git a/contrib/check_javaproc.pl b/contrib/check_javaproc.pl
index a9b52bc9..b68764ef 100644
--- a/contrib/check_javaproc.pl
+++ b/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 () {
diff --git a/contrib/check_joy.sh b/contrib/check_joy.sh
index cd076db9..8783a59f 100755
--- a/contrib/check_joy.sh
+++ b/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
diff --git a/contrib/check_log2.pl b/contrib/check_log2.pl
index 61a11708..f1533a0c 100644
--- a/contrib/check_log2.pl
+++ b/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
diff --git a/contrib/check_lotus.pl b/contrib/check_lotus.pl
index c94e6c2d..8bedced8 100755
--- a/contrib/check_lotus.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_mem.pl b/contrib/check_mem.pl
index f0c82129..3227ce24 100644
--- a/contrib/check_mem.pl
+++ b/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>
 #
diff --git a/contrib/check_ms_spooler.pl b/contrib/check_ms_spooler.pl
index cf2464af..3a80a76a 100755
--- a/contrib/check_ms_spooler.pl
+++ b/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'};
 }
 
diff --git a/contrib/check_ora_table_space.pl b/contrib/check_ora_table_space.pl
index 24497b24..7ce90c8f 100644
--- a/contrib/check_ora_table_space.pl
+++ b/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.
diff --git a/contrib/check_oracle_instance.pl b/contrib/check_oracle_instance.pl
index 1175c1ed..3ba8d57a 100644
--- a/contrib/check_oracle_instance.pl
+++ b/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;
diff --git a/contrib/check_oracle_tbs b/contrib/check_oracle_tbs
index 0efdd1e8..8281a4e2 100644
--- a/contrib/check_oracle_tbs
+++ b/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
diff --git a/contrib/check_pfstate b/contrib/check_pfstate
index 6fe0d9b0..57dde3f6 100644
--- a/contrib/check_pfstate
+++ b/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();
diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c
index 6831b657..eec84ad8 100644
--- a/contrib/check_rbl.c
+++ b/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");
diff --git a/contrib/check_smb.sh b/contrib/check_smb.sh
index 728535a1..9d0da726 100644
--- a/contrib/check_smb.sh
+++ b/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
diff --git a/contrib/check_snmp_disk_monitor.pl b/contrib/check_snmp_disk_monitor.pl
index 7a70f71a..9a2edaae 100644
--- a/contrib/check_snmp_disk_monitor.pl
+++ b/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 {
diff --git a/contrib/check_snmp_printer.pl b/contrib/check_snmp_printer.pl
index 9fc5fedd..cc7943bf 100755
--- a/contrib/check_snmp_printer.pl
+++ b/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
diff --git a/contrib/check_snmp_process_monitor.pl b/contrib/check_snmp_process_monitor.pl
index c98ee7dc..0f445970 100644
--- a/contrib/check_snmp_process_monitor.pl
+++ b/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 {
diff --git a/contrib/check_snmp_procs.pl b/contrib/check_snmp_procs.pl
index 991fc715..4d19ff17 100644
--- a/contrib/check_snmp_procs.pl
+++ b/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
diff --git a/contrib/check_temp_cpq b/contrib/check_temp_cpq
index 14b06a2b..6edae6ef 100644
--- a/contrib/check_temp_cpq
+++ b/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'};
 }
 
diff --git a/contrib/check_temp_fsc b/contrib/check_temp_fsc
index 6cae859c..33470ea1 100644
--- a/contrib/check_temp_fsc
+++ b/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'};
 }
 
diff --git a/contrib/check_traceroute.pl b/contrib/check_traceroute.pl
index c8d497b0..569dc532 100755
--- a/contrib/check_traceroute.pl
+++ b/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
diff --git a/contrib/check_uptime.c b/contrib/check_uptime.c
index fe981237..7afeb232 100644
--- a/contrib/check_uptime.c
+++ b/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]);
diff --git a/contrib/check_vcs.pl b/contrib/check_vcs.pl
index 7ee00728..38afdae2 100644
--- a/contrib/check_vcs.pl
+++ b/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
diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl
index 0d11737f..f11f8645 100755
--- a/contrib/check_wins.pl
+++ b/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'};
 }
 
diff --git a/contrib/packet_utils.pm b/contrib/packet_utils.pm
index cd1e830b..783b3333 100755
--- a/contrib/packet_utils.pm
+++ b/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
 #
diff --git a/contrib/utils.py b/contrib/utils.py
index 73d795c9..db0f1c90 100644
--- a/contrib/utils.py
+++ b/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
 #