- rel 5; switch fully to debian patch

[packages/arpwatch.git] / arpwatch-debian_21arp2ethers.patch

diff --git a/arpwatch-debian_21arp2ethers.patch b/arpwatch-debian_21arp2ethers.patch
deleted file mode 100644 (file)
index bb1c5a3..0000000
--- a/arpwatch-debian_21arp2ethers.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Index: arpwatch/arp2ethers
-diff -u arpwatch/arp2ethers:1.1.1.2 arpwatch/arp2ethers:1.1.1.1.14.4
---- arpwatch/arp2ethers:1.1.1.2        Tue Aug 10 10:53:34 2004
-+++ arpwatch/arp2ethers        Fri Aug 13 00:34:55 2004
-@@ -12,12 +12,84 @@
- #     - append "-old", "-old1", etc. as necessary
- #     - sort
- #
-+# 1999-04-12  KELEMEN Peter <fuji@debian.org>
-+#     Use sh(1) instead of csh(1).
-+#
-+# 2000-03-21  Erik Warmelink <erik@selwerd.nl>
-+#     Use next instead of continue in included p.awk.
-+#
-+# 2004-06-26  Javier Fernandez-Sanguino <jfs@debian.org>
-+#     Use a default file or the one provided in the command line
- 
--sort +2rn arp.dat | \
-+FILE=/var/lib/arpwatch/arp.dat
-+[ -n "$1" ] && FILE=$1
-+[ -r "$FILE" ] || {
-+      echo "Cannot read file $FILE"
-+      exit 1
-+}
-+
-+sort +2rn $FILE | \
-     awk 'NF == 4 { print }' | \
--    awk -f p.awk | \
-+# 1999-04-12  KELEMEN Peter <fuji@debian.org>
-+#    awk -f p.awk | \
-+    awk '
-+# Only print the first ethernet address seen
-+
-+{
-+      e = $1
-+      if (seen[e])
-+              next
-+      seen[e] = 1
-+      print $0
-+}
-+    ' | \
-     egrep -v '\.[0-9][0-9]*$' | \
-     sed -e 's/        .*      /       /' | \
--    awk -f d.awk | \
--    awk -f e.awk | \
-+# 1999-04-12  KELEMEN Peter <fuji@debian.org>
-+#    awk -f d.awk | \
-+    awk '
-+# DECnet hacking
-+
-+BEGIN {
-+      n = 0
-+      sdecnet = "aa:0:4:"
-+      ldecnet = length(sdecnet)
-+}
-+
-+{
-+      ++n
-+      e[n] = $1
-+      h[n] = $2
-+      if (sdecnet == substr($1, 1, ldecnet))
-+              decnet[$2] = 1
-+}
-+
-+END {
-+      for (i = 1; i <= n; ++i) {
-+              if (decnet[h[i]] && sdecnet != substr(e[i], 1, ldecnet))
-+                      h[i] = h[i] "-ip"
-+              print e[i] "\t" h[i]
-+      }
-+}
-+    ' | \
-+# 1999-04-12  KELEMEN Peter <fuji@debian.org>
-+#    awk -f e.awk | \
-+    awk '
-+# Add -old suffix to ethers file, as required. Assumed sorted input
-+
-+{
-+      if (!seen[$2]) {
-+              seen[$2] = 1
-+              print
-+              next
-+      }
-+      h = $2 "-old"
-+      s = h
-+      for (n = 1; seen[h]; ++n)
-+              h = s n
-+      seen[h] = 1
-+      print $1 "\t" h
-+      next
-+}
-+    ' | \
-     sort