From 6566bc1464a1022f253e0a0907910ad2ebc4aa52 Mon Sep 17 00:00:00 2001
From: nicm <>
Date: Tue, 29 Jun 2010 17:17:53 +0000
Subject: [PATCH] No more phones(5), /etc/phones, or dial up bits in remote.

---
 src/etc/Makefile   |  4 ++--
 src/etc/changelist |  3 +--
 src/etc/phones     |  7 -------
 src/etc/remote     | 20 ++------------------
 4 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 src/etc/phones

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 89e9f7d0..97222629 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.289 2010/06/07 10:09:05 reyk Exp $
+#	$OpenBSD: Makefile,v 1.290 2010/06/29 17:17:53 nicm Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -16,7 +16,7 @@ BINGRP= wheel
 BIN1=	changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \
 	ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \
-	netstart networks newsyslog.conf phones printcap protocols \
+	netstart networks newsyslog.conf printcap protocols \
 	rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
 	remote rpc security services shells syslog.conf weekly \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
diff --git a/src/etc/changelist b/src/etc/changelist
index 03ac02ab..74b2d5b3 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.67 2010/06/07 10:09:05 reyk Exp $
+#	$OpenBSD: changelist,v 1.68 2010/06/29 17:17:53 nicm Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -97,7 +97,6 @@
 /etc/passwd
 /etc/pf.conf
 /etc/pf.os
-/etc/phones
 /etc/portal.conf
 /etc/printcap
 /etc/profile
diff --git a/src/etc/phones b/src/etc/phones
deleted file mode 100644
index 94d4ba8c..00000000
--- a/src/etc/phones
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: phones,v 1.3 1996/09/20 21:00:35 deraadt Exp $
-#
-# phones -- remote host phone number data base
-# see tip(1), phones(5)
-# examples:
-#system1	9=2225551212
-#system2	  9995551212
diff --git a/src/etc/remote b/src/etc/remote
index 34f6f796..f7a5b5cc 100644
--- a/src/etc/remote
+++ b/src/etc/remote
@@ -1,21 +1,18 @@
-#	$OpenBSD: remote,v 1.11 2005/02/07 06:08:10 david Exp $
+#	$OpenBSD: remote,v 1.12 2010/06/29 17:17:53 nicm Exp $
 #	from: @(#)remote	8.1 (Berkeley) 6/10/93
 #
 # remote -- remote host description database
-# see tip(1), cgetcap(3), phones(5), remote(5)
+# see tip(1), cgetcap(3), remote(5)
 #
 # Capabilities used in examples:
 #
-#   at	ACU type
 #   br	baud rate (defaults to 300)
 #   dc	direct connect
-#   du	make a call flag (dial up)
 #   dv	device to use for the tty
 #   el	EOL marks (default is NULL)
 #   ie	input EOF marks (default is NULL)
 #   oe	output EOF string (default is NULL)
 #   pa	parity
-#   pn	phone #, '\@' means use the phones(5) file
 #   tc	include the named system description
 #
 # Most OpenBSD architectures use /dev/tty00, /dev/cua00, etc.
@@ -50,27 +47,14 @@
 direct:\
 	:dc:
 
-dialup:\
-	:du:at=hayes:pn=\@:
-
 doshost:\
 	:oe=^Z:tc=unixhost:
 
 unixhost:\
 	:pa=none:br#9600:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:
 
-# Sample directly connected lines. Directly connected lines are
-# most commonly used for serial consoles.
-#
 tty00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
 	:dv=/dev/tty00:tc=direct:tc=unixhost:
 
 ttya|For sparc,mvme68k:\
 	:dv=/dev/ttya:tc=direct:tc=unixhost:
-
-# Sample dial out lines.
-#
-cua00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
-	:dv=/dev/cua00:tc=dialup:tc=unixhost:
-cuaa|For sparc,mvme68k:\
-	:dv=/dev/cuaa:tc=dialup:tc=unixhost: