From e133ef536f95904f5e84885b48afbcfe0efea09a Mon Sep 17 00:00:00 2001 From: trasz Date: Tue, 6 Apr 2010 10:58:40 +0000 Subject: [PATCH] MFC r201213: Remove examples for pppd and SLIP-related stuff. PR: conf/144950 --- ObsoleteFiles.inc | 23 +++++++++++++++++ etc/mtree/BSD.usr.dist | 8 ------ share/examples/Makefile | 22 ----------------- share/examples/pppd/auth-down.sample | 7 ------ share/examples/pppd/auth-up.sample | 7 ------ share/examples/pppd/chap-secrets.sample | 17 ------------- share/examples/pppd/chat.sh.sample | 33 ------------------------- share/examples/pppd/ip-down.sample | 7 ------ share/examples/pppd/ip-up.sample | 8 ------ share/examples/pppd/options.sample | 16 ------------ share/examples/pppd/pap-secrets.sample | 17 ------------- share/examples/pppd/ppp.deny.sample | 27 -------------------- share/examples/pppd/ppp.shells.sample | 14 ----------- share/examples/slattach/unit-command.sh | 18 -------------- share/examples/sliplogin/slip.hosts | 16 ------------ share/examples/sliplogin/slip.login | 18 -------------- share/examples/sliplogin/slip.logout | 14 ----------- share/examples/sliplogin/slip.slparms | 12 --------- share/examples/startslip/sldown.sh | 3 --- share/examples/startslip/slip.sh | 5 ---- share/examples/startslip/slup.sh | 16 ------------ 21 files changed, 23 insertions(+), 285 deletions(-) delete mode 100644 share/examples/pppd/auth-down.sample delete mode 100644 share/examples/pppd/auth-up.sample delete mode 100644 share/examples/pppd/chap-secrets.sample delete mode 100644 share/examples/pppd/chat.sh.sample delete mode 100644 share/examples/pppd/ip-down.sample delete mode 100644 share/examples/pppd/ip-up.sample delete mode 100644 share/examples/pppd/options.sample delete mode 100644 share/examples/pppd/pap-secrets.sample delete mode 100644 share/examples/pppd/ppp.deny.sample delete mode 100644 share/examples/pppd/ppp.shells.sample delete mode 100755 share/examples/slattach/unit-command.sh delete mode 100644 share/examples/sliplogin/slip.hosts delete mode 100644 share/examples/sliplogin/slip.login delete mode 100644 share/examples/sliplogin/slip.logout delete mode 100644 share/examples/sliplogin/slip.slparms delete mode 100755 share/examples/startslip/sldown.sh delete mode 100755 share/examples/startslip/slip.sh delete mode 100755 share/examples/startslip/slup.sh diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index faeee6bcc10..4e6d408ca60 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -27,6 +27,29 @@ OLD_FILES+=usr/share/man/man1/gcpio.1.gz # 20100301: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz +# 20091229: remove no longer relevant examples +OLD_FILES+=usr/share/examples/pppd/auth-down.sample +OLD_FILES+=usr/share/examples/pppd/auth-up.sample +OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample +OLD_FILES+=usr/share/examples/pppd/chat.sh.sample +OLD_FILES+=usr/share/examples/pppd/ip-down.sample +OLD_FILES+=usr/share/examples/pppd/ip-up.sample +OLD_FILES+=usr/share/examples/pppd/options.sample +OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample +OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample +OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample +OLD_DIRS+=usr/share/examples/pppd +OLD_FILES+=usr/share/examples/slattach/unit-command.sh +OLD_DIRS+=usr/share/examples/slattach +OLD_FILES+=usr/share/examples/sliplogin/slip.hosts +OLD_FILES+=usr/share/examples/sliplogin/slip.login +OLD_FILES+=usr/share/examples/sliplogin/slip.logout +OLD_FILES+=usr/share/examples/sliplogin/slip.slparms +OLD_DIRS+=usr/share/examples/sliplogin +OLD_FILES+=usr/share/examples/startslip/sldown.sh +OLD_FILES+=usr/share/examples/startslip/slip.sh +OLD_FILES+=usr/share/examples/startslip/slup.sh +OLD_DIRS+=usr/share/examples/startslip # 20091218: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 44a9aad5ab6..e2032b1e17b 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -265,8 +265,6 @@ .. ppp .. - pppd - .. printing .. scsi_target @@ -283,16 +281,10 @@ srcs .. .. - slattach - .. - sliplogin - .. smbfs print .. .. - startslip - .. sunrpc dir .. diff --git a/share/examples/Makefile b/share/examples/Makefile index 3d28511ff2f..315eb913519 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -24,13 +24,9 @@ LDIRS= BSD_daemon \ portal \ ppi \ ppp \ - pppd \ printing \ ses \ scsi_target \ - slattach \ - sliplogin \ - startslip \ sunrpc XFILES= BSD_daemon/FreeBSD.pfa \ @@ -135,16 +131,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ ppp/ppp.secret.sample \ ppp/ppp.secret.span-isp \ ppp/ppp.secret.span-isp.working \ - pppd/auth-down.sample \ - pppd/auth-up.sample \ - pppd/chap-secrets.sample \ - pppd/chat.sh.sample \ - pppd/ip-down.sample \ - pppd/ip-up.sample \ - pppd/options.sample \ - pppd/pap-secrets.sample \ - pppd/ppp.deny.sample \ - pppd/ppp.shells.sample \ printing/README \ printing/diablo-if-net \ printing/hpdf \ @@ -187,14 +173,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ scsi_target/scsi_target.h \ scsi_target/scsi_target.8 \ scsi_target/scsi_cmds.c \ - slattach/unit-command.sh \ - sliplogin/slip.hosts \ - sliplogin/slip.login \ - sliplogin/slip.logout \ - sliplogin/slip.slparms \ - startslip/sldown.sh \ - startslip/slip.sh \ - startslip/slup.sh \ sunrpc/Makefile \ sunrpc/dir/Makefile \ sunrpc/dir/dir.x \ diff --git a/share/examples/pppd/auth-down.sample b/share/examples/pppd/auth-down.sample deleted file mode 100644 index b2da150dc04..00000000000 --- a/share/examples/pppd/auth-down.sample +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Example for /etc/ppp/auth-down file. - -/usr/bin/logger -p daemon.notice -t pppd "User $2 is logged off" diff --git a/share/examples/pppd/auth-up.sample b/share/examples/pppd/auth-up.sample deleted file mode 100644 index 3d9c07e8034..00000000000 --- a/share/examples/pppd/auth-up.sample +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Example for /etc/ppp/auth-up file. - -/usr/bin/logger -p daemon.notice -t pppd "User $2 is logged in" diff --git a/share/examples/pppd/chap-secrets.sample b/share/examples/pppd/chap-secrets.sample deleted file mode 100644 index 40d5dfdc86e..00000000000 --- a/share/examples/pppd/chap-secrets.sample +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ -# -# Example for /etc/ppp/chap-secrets file. -# -# This file should be owned by root and not readable or -# writable by any other user. -# -# Dialin format: -# -joe server password 192.168.0.0/24 192.168.2.2 -lisa server l1z4 * !192.168.0.1 -mike server secret * -luser server nopass - -# -# Dialout format: -# -jane isp password diff --git a/share/examples/pppd/chat.sh.sample b/share/examples/pppd/chat.sh.sample deleted file mode 100644 index 6418ebfdf6a..00000000000 --- a/share/examples/pppd/chat.sh.sample +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Example for chat.sh file. - -INIT='at&f' - -dial(){ - /usr/bin/chat -v \ - ABORT "ERROR" \ - ABORT "NO DIALTONE" \ - TIMEOUT 5 \ - "" "AT" \ - "OK" "${INIT}" \ - "OK"-"+++"-"" "ATH" \ - ABORT "BUSY" \ - ABORT "NO ANSWER" \ - ABORT "NO CARRIER" \ - "OK" "ATDP$1" \ - TIMEOUT 70 \ - "ogin:" "username" \ - "word:" "pasword" \ - TIMEOUT 50 \ - "PPP" "\c" - - [ $? -eq 0 ] && exit 0 - - echo "$1 failed" 1>&2 - exit 1 -} - -dial 1234567 diff --git a/share/examples/pppd/ip-down.sample b/share/examples/pppd/ip-down.sample deleted file mode 100644 index 45b8eb45675..00000000000 --- a/share/examples/pppd/ip-down.sample +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Example for /etc/ppp/ip-down file. - -/usr/bin/logger -p daemon.notice -t pppd "$1 is down" diff --git a/share/examples/pppd/ip-up.sample b/share/examples/pppd/ip-up.sample deleted file mode 100644 index a0fc1b02aaa..00000000000 --- a/share/examples/pppd/ip-up.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Example for /etc/ppp/ip-up file. - -/usr/bin/logger -p daemon.notice -t pppd "$1 is up" -/usr/sbin/ntpdate ntpserver diff --git a/share/examples/pppd/options.sample b/share/examples/pppd/options.sample deleted file mode 100644 index fd0a927c57c..00000000000 --- a/share/examples/pppd/options.sample +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ -# -# Example for /etc/ppp/options file. -# -/dev/cuad4 -115200 -modem -crtscts -asyncmap 0 -connect '/etc/ppp/chat.sh' -defaultroute -noipdefault -persist -holdoff 5 -mtu 250 -mru 250 diff --git a/share/examples/pppd/pap-secrets.sample b/share/examples/pppd/pap-secrets.sample deleted file mode 100644 index 8896bdd7a65..00000000000 --- a/share/examples/pppd/pap-secrets.sample +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ -# -# Example for /etc/ppp/pap-secrets file. -# -# This file should be owned by root and not readable or -# writable by any other user. -# -# Dialin format: -# -joe server password 192.168.0.1/24 192.168.2.2 -lisa server l1z4 * !192.168.0.1 -mike server secret * -luser server nopass - -# -# Dialout format: -# -jane isp password diff --git a/share/examples/pppd/ppp.deny.sample b/share/examples/pppd/ppp.deny.sample deleted file mode 100644 index 948e11527cd..00000000000 --- a/share/examples/pppd/ppp.deny.sample +++ /dev/null @@ -1,27 +0,0 @@ -# $FreeBSD$ -# -# list of users disallowed any pppd access via 'system -# password login'. -# read by pppd(8). -root -toor -daemon -operator -bin -tty -kmem -games -news -man -sshd -smmsp -mailnull -bind -proxy -_pflogd -_dhcp -ftp -uucp -pop -www -nobody diff --git a/share/examples/pppd/ppp.shells.sample b/share/examples/pppd/ppp.shells.sample deleted file mode 100644 index 93b68406c21..00000000000 --- a/share/examples/pppd/ppp.shells.sample +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ -# -# List of acceptable shells for pppd(8). -# Pppd will not accept a system password login -# by a user whose shell is not listed below. - -/bin/sh -/bin/csh -/bin/tcsh -/usr/local/bin/ksh -/usr/local/bin/zsh -/usr/local/bin/bash -/usr/local/bin/tcsh -/usr/local/bin/ppplogin.sh diff --git a/share/examples/slattach/unit-command.sh b/share/examples/slattach/unit-command.sh deleted file mode 100755 index 9e97ffdcd69..00000000000 --- a/share/examples/slattach/unit-command.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -old_unit=$1 -new_unit=$2 - -if [ $old_unit != -1 ]; then - ifconfig sl$old_unit delete down - if [ $new_unit == -1 ]; then - route delete default - fi -fi - -if [ $new_unit != -1 ]; then - ifconfig sl$new_unit - if [ $old_unit == -1 ]; then - route add default - fi -fi diff --git a/share/examples/sliplogin/slip.hosts b/share/examples/sliplogin/slip.hosts deleted file mode 100644 index b20d7c8b416..00000000000 --- a/share/examples/sliplogin/slip.hosts +++ /dev/null @@ -1,16 +0,0 @@ -# @(#)slip.hosts 8.1 (Berkeley) 6/6/93 -# -# option(s) consist of the following: (see the sliplogin man page) -# normal - no header compression -# compress - compress headers -# autocomp - compress headers if remote end allows it -# noicmp - disable ICMP packets (such as 'ping' or 'traceroute' packets) -# -#login local-address remote-address netmask option(s) -#------ ---------- ----------- ------- --------- -Schez vangogh chez 0xffffff00 compress -Sjun vangogh 128.32.130.36 0xffffff00 normal -Sleconte vangogh leconte 0xffffff00 compress -Sleeb vangogh leeb 0xffffff00 compress -Smjk vangogh pissaro-sl 0xffffff00 noicmp -Soxford vangogh oxford 0xffffff00 autocomp diff --git a/share/examples/sliplogin/slip.login b/share/examples/sliplogin/slip.login deleted file mode 100644 index 81102280acb..00000000000 --- a/share/examples/sliplogin/slip.login +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# -# @(#)slip.login 8.1 (Berkeley) 6/6/93 - -# -# generic login file for a slip line. sliplogin invokes this with -# the parameters: -# 1 2 3 4 5 6 7-n -# slipunit ttyspeed loginname local-addr remote-addr mask opt-args -# -# Delete any arp table entries for this site, just in case -/usr/sbin/arp -d $5 -# Bringup the line -/sbin/ifconfig sl$1 inet $4 $5 netmask $6 -# Answer ARP request for the SLIP client with our Ethernet addr -# XXX - Must be filled in with the ethernet address of the local machine -# /usr/sbin/arp -s $5 00:00:c0:50:b9:0a pub -exit diff --git a/share/examples/sliplogin/slip.logout b/share/examples/sliplogin/slip.logout deleted file mode 100644 index b27fe09d099..00000000000 --- a/share/examples/sliplogin/slip.logout +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# -# slip.logout - -# -# logout file for a slip line. sliplogin invokes this with -# the parameters: -# 1 2 3 4 5 6 7-n -# slipunit ttyspeed loginname local-addr remote-addr mask opt-args -# -/sbin/ifconfig sl$1 delete -# Remove the ARP table entry for the host -/usr/sbin/arp -d $5 -exit diff --git a/share/examples/sliplogin/slip.slparms b/share/examples/sliplogin/slip.slparms deleted file mode 100644 index a87c7c3cc7b..00000000000 --- a/share/examples/sliplogin/slip.slparms +++ /dev/null @@ -1,12 +0,0 @@ -# -# Additional SLIP configuration (for all login names). -# Use slip.slparms. for particular login. -# -# Format: -# keepalive [outfill [slunit]] -# (seconds) (seconds) (number) -# -# Default values: -# 0 0 -# -600 300 diff --git a/share/examples/startslip/sldown.sh b/share/examples/startslip/sldown.sh deleted file mode 100755 index 1f342a47b0c..00000000000 --- a/share/examples/startslip/sldown.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -/sbin/ifconfig $1 $2 -/sbin/route delete default diff --git a/share/examples/startslip/slip.sh b/share/examples/startslip/slip.sh deleted file mode 100755 index 2b4254e88f6..00000000000 --- a/share/examples/startslip/slip.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -startslip -b 57600 -U ./slup.sh -D ./sldown.sh \ - -s atd -s atd -s atd \ - -h -t 60 -w 2 -W 20 /dev/cuad1 diff --git a/share/examples/startslip/slup.sh b/share/examples/startslip/slup.sh deleted file mode 100755 index 79cded33955..00000000000 --- a/share/examples/startslip/slup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -myname= -gateway= -netmask=255.255.255.248 -tune1="link0 -link2" # force headers compression -tune2="mtu 296" # for FreeBSD 1.x host - -case $LINE in - 0) tune=$tune1;; # 1st phone connected - 1) tune=$tune2;; # 2nd phone connected - *) tune=;; # others -esac - -/sbin/ifconfig $1 $2 $tune -/sbin/ifconfig $1 inet $myname $gateway netmask $netmask -/sbin/route add default $gateway -- 2.45.2