aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-02-13 19:17:27 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2014-02-14 01:35:57 +0000
commit82e2865739d549a54199f0d22cdc2062347ed9ff (patch)
tree6729a25216070c41f6aabc58d77a13314be8e858
parentb6a9b8494cb3d3d72f7d4aa4a0b21e75f5211449 (diff)
Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention. Don't regenerate anything now. Change-Id: I283c224d3523212144707fca3d6265916cb11792 Reviewed-on: https://code.wireshark.org/review/205 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/Makefile.nmake2
-rwxr-xr-xtools/asn2wrs.py2
-rwxr-xr-xtools/backport-change2
-rwxr-xr-xtools/backport-rev2
-rwxr-xr-xtools/checkfiltername.pl2
-rwxr-xr-xtools/checkhf.pl2
-rwxr-xr-xtools/compare-abis.sh2
-rwxr-xr-xtools/convert-proto-tree-new.awk2
-rwxr-xr-xtools/convert_expert_add_info_format.pl2
-rwxr-xr-xtools/convert_proto_tree_add_text.pl2
-rwxr-xr-xtools/debian-setup.sh2
-rwxr-xr-xtools/dfilter-test.py2
-rwxr-xr-xtools/extract_asn1_from_spec.pl4
-rwxr-xr-xtools/fix-encoding-args.pl2
-rwxr-xr-xtools/fixhf.pl2
-rwxr-xr-xtools/fuzz-test.sh2
-rwxr-xr-xtools/gen-bugnote2
-rwxr-xr-xtools/git-compare-abis.sh2
-rwxr-xr-xtools/idl2wrs2
-rwxr-xr-xtools/indexcap.py2
-rwxr-xr-xtools/install_rpms_for_devel.sh2
-rwxr-xr-xtools/list_protos_in_cap.sh2
-rwxr-xr-xtools/make-dissector-reg4
-rwxr-xr-xtools/make-dissector-reg.py2
-rwxr-xr-xtools/make-manuf7
-rwxr-xr-xtools/make-services.pl9
-rwxr-xr-xtools/make-services.py2
-rwxr-xr-xtools/make-sminmpec.pl9
-rwxr-xr-xtools/make-tap-reg.py2
-rwxr-xr-xtools/make-tapreg-dotc4
-rwxr-xr-xtools/make-usb.py4
-rw-r--r--tools/make_charset_table.c1
-rwxr-xr-xtools/ncp2222.py3
-rwxr-xr-xtools/netscreen2dump.py2
-rwxr-xr-xtools/pkt-from-core.py3
-rwxr-xr-xtools/pre-commit2
-rwxr-xr-xtools/process-x11-fields.pl2
-rwxr-xr-xtools/process-x11-xcb.pl2
-rwxr-xr-xtools/randpkt-test.sh2
-rwxr-xr-xtools/rdps.py2
-rwxr-xr-xtools/runlex.sh2
-rwxr-xr-xtools/setuid-root.pl.in2
-rwxr-xr-xtools/svnadd2
-rwxr-xr-xtools/test-captures.sh2
-rw-r--r--tools/test-common.sh2
-rwxr-xr-xtools/textify.sh2
-rwxr-xr-xtools/usb-ptp-extract-models.pl2
-rwxr-xr-xtools/valgrind-wireshark.sh2
-rwxr-xr-xtools/win-setup.sh2
-rwxr-xr-xtools/win32-setup.sh2
-rwxr-xr-xtools/win64-setup.sh2
-rwxr-xr-xtools/wireshark_be.py2
-rwxr-xr-xtools/wireshark_gen.py4
-rw-r--r--tools/ws-coding-style.cfg2
55 files changed, 3 insertions, 137 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dc47eb16d4..734a16b4ba 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,6 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index d1a490b03d..e89f47d045 100644
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -1,7 +1,5 @@
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-# $Id$
all: lemon
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index dc89169265..0ed1e4f1bd 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -5,8 +5,6 @@
# ASN.1 to Wireshark dissector compiler
# Copyright 2004 Tomas Kukosa
#
-# $Id$
-#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
diff --git a/tools/backport-change b/tools/backport-change
index 2585140f8e..3f197b2a37 100755
--- a/tools/backport-change
+++ b/tools/backport-change
@@ -3,8 +3,6 @@
# backport-change - Given a master git commit or trunk SVN revision, creates
# a backport request in Gerrit.
#
-# $Id$
-#
# Copyright 2013 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/backport-rev b/tools/backport-rev
index 39dc16ef6b..6a7a92b9f7 100755
--- a/tools/backport-rev
+++ b/tools/backport-rev
@@ -5,8 +5,6 @@
#
# Usage: backport-rev <svn revision>
#
-# $Id$
-#
# Copyright 2013 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/checkfiltername.pl b/tools/checkfiltername.pl
index 4708710d8d..0955573250 100755
--- a/tools/checkfiltername.pl
+++ b/tools/checkfiltername.pl
@@ -12,8 +12,6 @@ my $debug = 0;
#
# Usage: checkfiltername.pl <file or files>
-# $Id$
-
#
# Copyright 2011 Michael Mann (see AUTHORS file)
#
diff --git a/tools/checkhf.pl b/tools/checkhf.pl
index 5de607cfe3..64241fb7ea 100755
--- a/tools/checkhf.pl
+++ b/tools/checkhf.pl
@@ -6,8 +6,6 @@
#
# Usage: checkhf.pl [--debug=?] <file or files>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/compare-abis.sh b/tools/compare-abis.sh
index 6a308162ce..a1cc48cdc3 100755
--- a/tools/compare-abis.sh
+++ b/tools/compare-abis.sh
@@ -4,8 +4,6 @@
#
# Copyright 2013 Balint Reczey <balint at balintreczey.hu>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/convert-proto-tree-new.awk b/tools/convert-proto-tree-new.awk
index c2403870d8..f4ee3a531b 100755
--- a/tools/convert-proto-tree-new.awk
+++ b/tools/convert-proto-tree-new.awk
@@ -1,7 +1,5 @@
#!/usr/bin/gawk -f
-# $Id$
-
function again(i)
{
# shift remaining arguments up
diff --git a/tools/convert_expert_add_info_format.pl b/tools/convert_expert_add_info_format.pl
index fccde630f7..0584f93ce8 100755
--- a/tools/convert_expert_add_info_format.pl
+++ b/tools/convert_expert_add_info_format.pl
@@ -28,8 +28,6 @@
#
# Based off of convert_proto_tree_add_text.pl
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl
index 2bcb0aaaef..0efcc10cb0 100755
--- a/tools/convert_proto_tree_add_text.pl
+++ b/tools/convert_proto_tree_add_text.pl
@@ -32,8 +32,6 @@
#
# Lots of code shamelessly borrowed from fix-encoding-args.pl (Thanks Bill!)
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh
index 00699ac973..aba666912c 100755
--- a/tools/debian-setup.sh
+++ b/tools/debian-setup.sh
@@ -1,8 +1,6 @@
#!/bin/sh
# Setup development environment on Debian and derivatives such as Ubuntu
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/dfilter-test.py b/tools/dfilter-test.py
index cd0f93ce6c..746402cf64 100755
--- a/tools/dfilter-test.py
+++ b/tools/dfilter-test.py
@@ -4,8 +4,6 @@ Test-suite to test wireshark's dfilter mechanism.
"""
#
-# $Id$
-#
# Copyright (C) 2003-2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/extract_asn1_from_spec.pl b/tools/extract_asn1_from_spec.pl
index 118c824f14..33aa4ef9f9 100755
--- a/tools/extract_asn1_from_spec.pl
+++ b/tools/extract_asn1_from_spec.pl
@@ -10,8 +10,6 @@
#
# Copyright 2011 Vincent Helfre and Erwan Yvin
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
@@ -75,7 +73,6 @@ sub extract_asn1 {
$output_file_name = "LPP.asn";
print "generating $output_file_name\n";
open(OUTPUT_FILE, "> $output_file_name") or die "Can not open file $output_file_name";
- syswrite OUTPUT_FILE,"-- $version-- \$Id\$\n--\n";
$file_name_found = 1;
}
@@ -84,7 +81,6 @@ sub extract_asn1 {
$output_file_name = "$output_file_name".".asn";
print "generating $output_file_name\n";
open(OUTPUT_FILE, "> $output_file_name") or die "Can not open file $output_file_name";
- syswrite OUTPUT_FILE,"-- $version-- \$Id\$\n--\n";
$is_asn1 = 1;
$file_name_found = 1;
}
diff --git a/tools/fix-encoding-args.pl b/tools/fix-encoding-args.pl
index 910d106ef1..1f54da029b 100755
--- a/tools/fix-encoding-args.pl
+++ b/tools/fix-encoding-args.pl
@@ -19,8 +19,6 @@
# - ptvcursor_add_with_subtree !! ToDo: encoding arg not last arg
#
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/fixhf.pl b/tools/fixhf.pl
index b8bd1cbda5..393bf6c856 100755
--- a/tools/fixhf.pl
+++ b/tools/fixhf.pl
@@ -10,8 +10,6 @@
# Usage:
# fixhf.pl file1 [file2 file3 ...]
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh
index 1a8f54bf69..082c96e3c4 100755
--- a/tools/fuzz-test.sh
+++ b/tools/fuzz-test.sh
@@ -9,8 +9,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/gen-bugnote b/tools/gen-bugnote
index 1b753f845d..e91fabfb4b 100755
--- a/tools/gen-bugnote
+++ b/tools/gen-bugnote
@@ -5,8 +5,6 @@
#
# Usage: gen-bugnote <bug number>
#
-# $Id$
-#
# Copyright 2013 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/git-compare-abis.sh b/tools/git-compare-abis.sh
index 712ae1c1f4..a455bee229 100755
--- a/tools/git-compare-abis.sh
+++ b/tools/git-compare-abis.sh
@@ -4,8 +4,6 @@
#
# Copyright 2011 Balint Reczey <balint@balintreczey.hu>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/idl2wrs b/tools/idl2wrs
index 9bd4bdc72b..b6c9aaab0b 100755
--- a/tools/idl2wrs
+++ b/tools/idl2wrs
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# File : idl2wrs
#
# Author : Frank Singleton (frank.singleton@ericsson.com)
diff --git a/tools/indexcap.py b/tools/indexcap.py
index d252e27b4a..6c0c039a90 100755
--- a/tools/indexcap.py
+++ b/tools/indexcap.py
@@ -6,8 +6,6 @@
#
# Copyright 2009, Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/install_rpms_for_devel.sh b/tools/install_rpms_for_devel.sh
index dea7d2b1ed..b5aa3f352b 100755
--- a/tools/install_rpms_for_devel.sh
+++ b/tools/install_rpms_for_devel.sh
@@ -10,8 +10,6 @@
#
# Copyright 2013 Jeff Morriss <jeff.morriss.ws [AT] gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/list_protos_in_cap.sh b/tools/list_protos_in_cap.sh
index 0996b53640..37348adedb 100755
--- a/tools/list_protos_in_cap.sh
+++ b/tools/list_protos_in_cap.sh
@@ -13,8 +13,6 @@
#
# Copyright 2012 Jeff Morriss <jeff.morriss.ws [AT] gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/make-dissector-reg b/tools/make-dissector-reg
index 6233561c4a..c534d0a9e1 100755
--- a/tools/make-dissector-reg
+++ b/tools/make-dissector-reg
@@ -1,10 +1,6 @@
#! /bin/sh
#
-# $Id$
-#
-
-#
# The first argument is the directory in which the source files live.
#
srcdir="$1"
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index 6850805082..8f0d4b2998 100755
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -8,8 +8,6 @@
# all the process-launching that goes on --- multiple greps and
# seds for each input file. I wrote this python version so that
# less processes would have to be started.
-#
-# $Id$
import os
import sys
diff --git a/tools/make-manuf b/tools/make-manuf
index 1765d315c9..93e028ec2f 100755
--- a/tools/make-manuf
+++ b/tools/make-manuf
@@ -1,7 +1,5 @@
#!/usr/bin/perl -w
#
-# $Id$
-#
# Make-manuf - Creates a file containing ethernet OUIs and their
# company IDs. It merges the databases at IEEE and
# http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt
@@ -27,12 +25,9 @@ if( $@ ) {
" module libwww. Bailing.\n";
}
-$revision = '$Revision$';
-if ($revision !~ /[0-9]/ ) { $revision = "unknown"; }
-
$agent = LWP::UserAgent->new;
$agent->env_proxy;
-$agent->agent("Wireshark make-manuf/$revision");
+$agent->agent("Wireshark make-manuf");
$template = "manuf.tmpl";
$wkatmpl = "wka.tmpl";
diff --git a/tools/make-services.pl b/tools/make-services.pl
index 91d5e26b8a..5e717bf654 100755
--- a/tools/make-services.pl
+++ b/tools/make-services.pl
@@ -2,8 +2,6 @@
# create the services file from
# http://www.iana.org/assignments/enterprise-numbers
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
@@ -38,9 +36,6 @@ my $iana_port_url = "http://www.iana.org/assignments/service-names-port-numbers/
# is XML. Perhaps we should parse that instead.
$in = $iana_port_url unless(defined $in);
-my $revision = '$Revision$';
-if ($revision !~ /[0-9]/ ) { $revision = "unknown"; }
-
my $body = "";
if($in =~ m/^http:/i) {
@@ -49,7 +44,7 @@ if($in =~ m/^http:/i) {
my $agent = LWP::UserAgent->new;
$agent->env_proxy;
- $agent->agent("Wireshark make-services.pl/$revision");
+ $agent->agent("Wireshark make-services.pl");
warn "starting to fetch $in ...\n";
@@ -118,8 +113,6 @@ open OUT, "> $svc_file";
print OUT <<"_HEADER";
# This is a local copy of the IANA port-numbers file.
#
-# \$Id\$
-#
# Wireshark uses it to resolve port numbers into human readable
# service names, e.g. TCP port 80 -> http.
#
diff --git a/tools/make-services.py b/tools/make-services.py
index 7ea2636fe3..e93e5eb9c0 100755
--- a/tools/make-services.py
+++ b/tools/make-services.py
@@ -149,8 +149,6 @@ def main(argv):
out.write('''\
# This is a local copy of the IANA port-numbers file.
#
-# $Id$
-#
# Wireshark uses it to resolve port numbers into human readable
# service names, e.g. TCP port 80 -> http.
#
diff --git a/tools/make-sminmpec.pl b/tools/make-sminmpec.pl
index 0b241b0138..3c2f6177da 100755
--- a/tools/make-sminmpec.pl
+++ b/tools/make-sminmpec.pl
@@ -2,8 +2,6 @@
# create the sminmpec.c file from
# http://www.iana.org/assignments/enterprise-numbers
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
@@ -29,16 +27,13 @@ $in = "http://www.iana.org/assignments/enterprise-numbers/enterprise-numbers" un
my @in_lines;
-my $revision = '$Revision$';
-if ($revision !~ /[0-9]/ ) { $revision = "unknown"; }
-
if($in =~ m/^http:/i) {
eval "require LWP::UserAgent;";
die "LWP isn't installed. It is part of the standard Perl module libwww." if $@;
my $agent = LWP::UserAgent->new;
$agent->env_proxy;
- $agent->agent("Wireshark make-sminmpec.pl/$revision");
+ $agent->agent("Wireshark make-sminmpec.pl");
warn "starting to fetch $in ...\n";
@@ -117,8 +112,6 @@ for(@in_lines) {
print OUT <<"_SMINMPEC";
/*
- * \$Id\$
- *
* THIS FILE IS AUTOGENERATED, DO NOT EDIT
* generated from http://www.iana.org/assignments/enterprise-numbers
* run "tools/make-sminmspec <infile> <outfile>" to regenerate
diff --git a/tools/make-tap-reg.py b/tools/make-tap-reg.py
index fa5ea743b1..f4435df4e0 100755
--- a/tools/make-tap-reg.py
+++ b/tools/make-tap-reg.py
@@ -11,8 +11,6 @@
#
# Copyright 2010 Anders Broman <anders.broman@ericsson.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/make-tapreg-dotc b/tools/make-tapreg-dotc
index 9bf8c38638..a121817099 100755
--- a/tools/make-tapreg-dotc
+++ b/tools/make-tapreg-dotc
@@ -1,10 +1,6 @@
#! /bin/sh
#
-# $Id$
-#
-
-#
# The first argument is the output filename.
#
diff --git a/tools/make-usb.py b/tools/make-usb.py
index ccfd745c70..f2401c4bd0 100755
--- a/tools/make-usb.py
+++ b/tools/make-usb.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
#
-# $Id$
-#
# make-usb - Creates a file containing vendor and product ids.
# It use the databases at
# http://www.linux-usb.org/usb.ids
@@ -95,8 +93,6 @@ header="""/* usb.c
* Copyright (C) 2007 Ted Bullock
* Copyright (C) 2012 Sony Mobile Communications AB
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
diff --git a/tools/make_charset_table.c b/tools/make_charset_table.c
index c1b716c4ca..d1bfa6403d 100644
--- a/tools/make_charset_table.c
+++ b/tools/make_charset_table.c
@@ -1,7 +1,6 @@
/* make_charset_table.c
* sample program to generate tables for charsets.c using iconv
*
- * $Id$
* public domain
*/
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index aa016d02af..ea981dcd8d 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -25,9 +25,6 @@ http://developer.novell.com/ndk/doc/ncp/
for a badly-formatted HTML version of the same PDF.
-$Id$
-
-
Portions Copyright (c) 2000-2002 by Gilbert Ramirez <gram@alumni.rice.edu>.
Portions Copyright (c) Novell, Inc. 2000-2003.
diff --git a/tools/netscreen2dump.py b/tools/netscreen2dump.py
index c24d5d6c93..1bf69f130d 100755
--- a/tools/netscreen2dump.py
+++ b/tools/netscreen2dump.py
@@ -2,8 +2,6 @@
"""
Converts netscreen snoop hex-dumps to a hex-dump that text2pcap can read.
-$Id$
-
Copyright (c) 2004 by Gilbert Ramirez <gram@alumni.rice.edu>
This program is free software; you can redistribute it and/or
diff --git a/tools/pkt-from-core.py b/tools/pkt-from-core.py
index 47619d5748..26fac29533 100755
--- a/tools/pkt-from-core.py
+++ b/tools/pkt-from-core.py
@@ -4,9 +4,6 @@ Retrieve a packet from a wireshark/tshark core file
and save it in a packet-capture file.
"""
-#
-# $Id$
-#
# Copyright (C) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
#
# This program is free software; you can redistribute it and/or
diff --git a/tools/pre-commit b/tools/pre-commit
index 166b76cb93..4fc5352d34 100755
--- a/tools/pre-commit
+++ b/tools/pre-commit
@@ -1,8 +1,6 @@
#!/bin/sh
# Copyright 2013, Alexis La Goutte (See AUTHORS file)
#
-# $Id$
-#
# For git user, copy pre-commit in .git/hook/ folder
# to don't launch the script when commit use --no-verify argument
#
diff --git a/tools/process-x11-fields.pl b/tools/process-x11-fields.pl
index ffad286f47..45b20f13fe 100755
--- a/tools/process-x11-fields.pl
+++ b/tools/process-x11-fields.pl
@@ -6,8 +6,6 @@
#
# Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index fa055bf478..8ebb67560b 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -6,8 +6,6 @@
#
# Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/randpkt-test.sh b/tools/randpkt-test.sh
index 0eceaa7e40..4d00c307a3 100755
--- a/tools/randpkt-test.sh
+++ b/tools/randpkt-test.sh
@@ -1,6 +1,4 @@
#!/bin/bash
-#
-# $Id$
# Randpkt testing script for TShark
#
diff --git a/tools/rdps.py b/tools/rdps.py
index 2de425a62e..ec5a51fbab 100755
--- a/tools/rdps.py
+++ b/tools/rdps.py
@@ -2,8 +2,6 @@
#
# rdps.py
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/runlex.sh b/tools/runlex.sh
index d73edd951b..7448ae531a 100755
--- a/tools/runlex.sh
+++ b/tools/runlex.sh
@@ -7,8 +7,6 @@
# means that neither Flex nor Lex was found, so we report an error and
# quit.
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2007 Gerald Combs
diff --git a/tools/setuid-root.pl.in b/tools/setuid-root.pl.in
index 066702533b..e9d06e0eba 100755
--- a/tools/setuid-root.pl.in
+++ b/tools/setuid-root.pl.in
@@ -2,8 +2,6 @@
#
# setuid-root - Enable/disable setuid for tshark and dumpcap.
#
-# $Id$
-#
# Copyright 2007, Luis Ontanon and Gerald Combs
#
# Wireshark - Network traffic analyzer
diff --git a/tools/svnadd b/tools/svnadd
index 6a477f79a4..605d3c7b52 100755
--- a/tools/svnadd
+++ b/tools/svnadd
@@ -6,8 +6,6 @@
#
# A little shell script to make it easy to set the appropriate SVN properties.
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/test-captures.sh b/tools/test-captures.sh
index ab4ee2e910..16df859e45 100755
--- a/tools/test-captures.sh
+++ b/tools/test-captures.sh
@@ -9,8 +9,6 @@
#
# Copyright 2012 Jeff Morriss <jeff.morriss.ws [AT] gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/test-common.sh b/tools/test-common.sh
index 3fad699169..bd96aa2c70 100644
--- a/tools/test-common.sh
+++ b/tools/test-common.sh
@@ -2,8 +2,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/textify.sh b/tools/textify.sh
index bf88a9497f..9797b09d2d 100755
--- a/tools/textify.sh
+++ b/tools/textify.sh
@@ -12,8 +12,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/usb-ptp-extract-models.pl b/tools/usb-ptp-extract-models.pl
index 4f304f3e56..957d8aec6c 100755
--- a/tools/usb-ptp-extract-models.pl
+++ b/tools/usb-ptp-extract-models.pl
@@ -2,8 +2,6 @@
#
# USAGE: $0 </path/to/libgphoto2/camlibs/ptp2>
#
-# $Id$
-#
# USB PTP Dissector
# Extracts USB devices from libgphoto2
# This is then parsed by make-usb.py to make epan/dissectors/usb.c
diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh
index c2696db70c..92014ccf7d 100755
--- a/tools/valgrind-wireshark.sh
+++ b/tools/valgrind-wireshark.sh
@@ -5,8 +5,6 @@
#
# Copyright 2012 Jeff Morriss <jeff.morriss.ws [AT] gmail.com>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/win-setup.sh b/tools/win-setup.sh
index d0c1f6df9c..b3389d3728 100755
--- a/tools/win-setup.sh
+++ b/tools/win-setup.sh
@@ -2,8 +2,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 382b19ff76..b4805c504e 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -2,8 +2,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index 4e8f8e149a..437839c89b 100755
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -2,8 +2,6 @@
#
# Copyright 2013 Gerald Combs <gerald@wireshark.org>
#
-# $Id$
-#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
diff --git a/tools/wireshark_be.py b/tools/wireshark_be.py
index 7e2e6177ed..44ffa63a62 100755
--- a/tools/wireshark_be.py
+++ b/tools/wireshark_be.py
@@ -1,7 +1,5 @@
# -*- python -*-
#
-# $Id$
-#
# File : wireshark_be.py
#
# Author : Frank Singleton (frank.singleton@ericsson.com)
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index 6250877e53..e7ba0d5468 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -1,7 +1,5 @@
# -*- python -*-
#
-# $Id$
-#
# wireshark_gen.py (part of idl2wrs)
#
# Author : Frank Singleton (frank.singleton@ericsson.com)
@@ -2365,8 +2363,6 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) {
template_Header = """\
/* packet-@dissector_name@.c
*
- * $Id$
- *
* Routines for IDL dissection
*
* Autogenerated from idl2wrs
diff --git a/tools/ws-coding-style.cfg b/tools/ws-coding-style.cfg
index c025f0a4b9..4444460940 100644
--- a/tools/ws-coding-style.cfg
+++ b/tools/ws-coding-style.cfg
@@ -1,5 +1,3 @@
-# $Id$
-#
# Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924
#
# FF: uncrustify config file for Wireshark (based on cheese-indent.cfg and