summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile4
-rw-r--r--etc/etc.socppc/MAKEDEV453
-rw-r--r--etc/etc.socppc/MAKEDEV.md103
-rw-r--r--etc/etc.socppc/Makefile5
-rw-r--r--etc/etc.socppc/Makefile.inc7
-rw-r--r--etc/etc.socppc/disktab11
-rw-r--r--etc/etc.socppc/fbtab1
-rw-r--r--etc/etc.socppc/login.conf109
-rw-r--r--etc/etc.socppc/sysctl.conf0
-rw-r--r--etc/etc.socppc/ttys14
-rw-r--r--etc/mtree/4.4BSD.dist6
11 files changed, 3 insertions, 710 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 5ee586b6448..b85d28d3026 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.468 2019/02/05 16:23:58 florian Exp $
+# $OpenBSD: Makefile,v 1.469 2019/05/11 07:18:15 deraadt Exp $
.include <bsd.own.mk>
@@ -298,7 +298,7 @@ distrib:
SUBDIR+= etc.alpha etc.amd64 etc.arm64 etc.armv7
SUBDIR+= etc.hppa etc.i386 etc.landisk etc.loongson etc.luna88k
SUBDIR+= etc.macppc etc.octeon
-SUBDIR+= etc.sgi etc.socppc etc.sparc64
+SUBDIR+= etc.sgi etc.sparc64
.include <bsd.subdir.mk>
.include <bsd.prog.mk>
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
deleted file mode 100644
index 8d22163d18c..00000000000
--- a/etc/etc.socppc/MAKEDEV
+++ /dev/null
@@ -1,453 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
-# generated from:
-#
-# OpenBSD: etc.socppc/MAKEDEV.md,v 1.31 2016/09/04 15:38:59 naddy Exp
-# OpenBSD: MAKEDEV.common,v 1.101 2018/08/31 02:32:29 jcs Exp
-# OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp
-# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Device "make" file. Valid arguments:
-# all makes all known devices, including local devices.
-# Tries to make the ``standard'' number of each type.
-# ramdisk Ramdisk kernel devices
-# std Standard devices
-# local Configuration specific devices
-# Disks:
-# cd* ATAPI and SCSI CD-ROM drives
-# rd* "rd" pseudo-disks
-# sd* SCSI disks, including flopticals
-# vnd* "file" pseudo-disk devices
-# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# Tapes:
-# ch* SCSI media changers
-# st* SCSI tape drives
-# Terminal ports:
-# tty[0-7][0-9a-f] NS16x50 serial ports
-# Pseudo terminals:
-# ptm pty master device
-# pty* Set of 62 master pseudo terminals
-# tty* Set of 62 slave pseudo terminals
-# Console ports:
-# ttyC-J* wscons display devices
-# wscons Minimal wscons devices
-# wskbd* wscons keyboards
-# wsmux wscons keyboard/mouse mux devices
-# Pointing devices:
-# wsmouse* wscons mice
-# USB devices:
-# uall All USB devices
-# ttyU* USB serial ports
-# ugen* Generic USB devices
-# uhid* Generic HID devices
-# ulpt* Printer devices
-# usb* Bus control devices used by usbd for attach/detach
-# Special purpose devices:
-# bpf Berkeley Packet Filter
-# diskmap Disk mapper
-# fd fd/* nodes
-# fuse Userland Filesystem
-# hotplug devices hot plugging
-# pci* PCI bus devices
-# pf* Packet Filter
-# pppx* PPP Multiplexer
-# *random In-kernel random data source
-# tun* Network tunnel driver
-# tap* Ethernet tunnel driver
-# video* Video V4L2 devices
-# vscsi* Virtual SCSI controller
-# switch* Switch driver
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
- case $1 in
- [0-9]) echo -n $1;;
- 10) echo -n a;;
- 11) echo -n b;;
- 12) echo -n c;;
- 13) echo -n d;;
- 14) echo -n e;;
- 15) echo -n f;;
- esac
-}
-
-alph2d()
-{
- local t="$1"
- local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- local sub=${p%${t}*}
- echo ${#sub}
-}
-
-h2d()
-{
- local s="$1"
- local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
- echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
- case $1 in
- [0-9]) echo -n $1;;
- a) echo -n 10;;
- b) echo -n 11;;
- c) echo -n 12;;
- d) echo -n 13;;
- e) echo -n 14;;
- f) echo -n 15;;
- esac
-}
-
-unt()
-{
- # XXX pdksh can't seem to deal with locally scoped variables
- # in ${foo#$bar} expansions
- arg="$1"
- tmp="${arg#[a-zA-Z]*}"
- tmp="${tmp%*[a-zA-Z]}"
- while [ "$tmp" != "$arg" ]
- do
- arg=$tmp
- tmp="${arg#[a-zA-Z]*}"
- tmp="${tmp%*[a-zA-Z]}"
- done
- echo $arg
-}
-
-dodisk()
-{
- [ "$DEBUG" ] && set -x
- n=$(($((${5}*${7:-16}))+${6})) count=0
- [ 0$7 -ne 8 ] && l="i j k l m n o p"
- for d in a b c d e f g h $l
- do
- M $1$2$d b $3 $(($n+$count)) 640 operator
- M r$1$2$d c $4 $(($n+$count)) 640 operator
- let count=count+1
- done
-}
-
-dodisk2()
-{
- n=$(($(($5*${7:-16}))+$6))
- M $1$2a b $3 $n 640 operator
- M r$1$2a c $4 $n 640 operator
- n=$(($n+2))
- M $1$2c b $3 $n 640 operator
- M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
- : ${mklist[0]:=";mknod"}
- mklist[${#mklist[*]}]=" -m $1 $2 $3 $4 $5"
-}
-
-M() {
- RMlist[${#RMlist[*]}]=$1
- mkl ${5-666} $1 $2 $3 $4
- G=${6:-wheel}
- [ "$7" ] && {
- MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
- } || {
- case $G in
- wheel)
- [ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
- whlist[${#whlist[*]}]="$1"
- ;;
- operator)
- [ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
- oplist[${#oplist[*]}]="$1"
- ;;
- *)
- MKlist[${#MKlist[*]}]="&& chgrp $G $1";
- esac
- }
- return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-std)
- M console c 0 0 600
- M tty c 1 0
- M mem c 2 0 640 kmem
- M kmem c 2 1 640 kmem
- M null c 2 2
- M zero c 2 12
- M stdin c 21 0
- M stdout c 21 1
- M stderr c 21 2
- M ksyms c 43 0 640 kmem
- M klog c 6 0 600
- ;;
-
-
-switch*)
- M switch$U c 87 $U 600
- ;;
-
-vscsi*)
- M vscsi$U c 78 $U 600
- ;;
-
-video*)
- M video$U c 44 $U 600
- MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
- ;;
-
-tap*)
- M tap$U c 86 $U 600
- ;;
-
-tun*)
- M tun$U c 23 $U 600
- ;;
-
-*random)
- M urandom c 40 0 644
- RMlist[${#RMlist[*]}]=random
- MKlist[${#MKlist[*]}]=";ln -s urandom random"
- ;;
-
-pppx*)
- M pppx$U c 83 $U 600
- ;;
-
-pf*)
- M pf c 39 0 600
- ;;
-
-pci*)
- M pci$U c 71 $U 600
- MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
- ;;
-
-hotplug)
- M hotplug c 84 $U 400
- ;;
-
-fuse)
- M fuse$U c 85 $U 600
- ;;
-
-fd)
- RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
- while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
- MKlist[${#MKlist[*]}]=";chmod 555 fd"
- ;;
-
-diskmap)
- M diskmap c 82 0 640 operator
- ;;
-
-bpf)
- M bpf c 22 0 600
- M bpf0 c 22 0 600
- ;;
-
-usb*)
- [ "$i" = "usb" ] && u= || u=$U
- M usb$u c 61 $U 660
- ;;
-
-ulpt*)
- M ulpt$U c 64 $U 660
- ;;
-
-uhid*)
- M uhid$U c 62 $U 660
- ;;
-
-ugen*)
- n=$(($U*16))
- for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
- do
- M ugen$U.$j c 63 $(($n+10#$j)) 660
- done
- ;;
-
-ttyU[0-9a-zA-Z])
- U=${i#ttyU*}
- o=$(alph2d $U)
- M ttyU$U c 66 $o 660 dialer root
- M cuaU$U c 66 $(($o+128)) 660 dialer root
- ;;
-
-uall)
- R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
- R ugen6 ugen7 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3 uhid4 uhid5
- R uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
- ;;
-
-wsmouse[0-9]*)
- M wsmouse$U c 69 $U 600
- ;;
-
-wsmux|wsmouse|wskbd)
- M wsmouse c 70 0 600
- M wskbd c 70 1 600
- ;;
-
-wskbd[0-9]*)
- M wskbd$U c 68 $U 600
- ;;
-
-wscons)
- R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
- R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
- R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
- ;;
-
-tty[C-J]*)
- U=${i##tty[C-J]}
- case $i in
- ttyC*) n=C m=0;;
- ttyD*) n=D m=256;;
- ttyE*) n=E m=512;;
- ttyF*) n=F m=768;;
- ttyG*) n=G m=1024;;
- ttyH*) n=H m=1280;;
- ttyI*) n=I m=1536;;
- ttyJ*) n=J m=1792;;
- esac
- case $U in
- [0-9a-f]) M tty$n$U c 67 $((16#$U+$m)) 600;;
- cfg) M tty${n}cfg c 67 $((255+$m)) 600;;
- *) echo bad unit $U for $i; exit 1;;
- esac
- ;;
-
-pty*)
- if [ $U -gt 15 ]; then
- echo bad unit for pty in: $i
- continue
- fi
- set -A letters p q r s t u v w x y z P Q R S T
- set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
- r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
- Y Z
-
- name=${letters[$U]}
- n=0
- while [ $n -lt 62 ]
- do
- nam=$name${suffixes[$n]}
- off=$(($U*62))
- M tty$nam c 4 $(($off+$n))
- M pty$nam c 5 $(($off+$n))
- n=$(($n+1))
- done
- ;;
-
-ptm)
- M ptm c 77 0 666
- ;;
-
-tty[0-7][0-9a-f])
- U=${i#tty*}
- o=$(h2d $U)
- M tty$U c 26 $o 660 dialer root
- M cua$U c 26 $(($o+128)) 660 dialer root
- ;;
-
-st*)
- n=$(($U*16))
- for pre in " " n e en
- do
- M ${pre}rst$U c 20 $n 660 operator
- n=$(($n+1))
- done
- ;;
-
-ch*)
- M ch$U c 10 $U 660 operator
- ;;
-
-vnd*)
- dodisk vnd $U 14 19 $U 0
- ;;
-
-rd*)
- dodisk2 rd $U 17 17 $U 0
- ;;
-
-cd*)
- dodisk2 cd $U 3 9 $U 0
- ;;
-
-local)
- test -s $T.local && sh $T.local
- ;;
-
-ramdisk)
- R diskmap rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2
- R sd3 sd4 tty00 tty01 bpf std
- ;;
-
-all)
- R switch0 switch1 switch2 switch3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
- R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2
- R tap3 tun0 tun1 tun2 tun3 pty0 diskmap vscsi0 ch0 bpf fuse
- R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
- R video0 video1 random tty00 tty01 tty02 tty03 tty04 tty05
- R tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std
- R st0 st1 fd
- ;;
-
-wd*|sd*)
- case $i in
- wd*) dodisk wd $U 0 11 $U 0;;
- sd*) dodisk sd $U 2 8 $U 0;;
- esac
- ;;
-
-*)
- echo $i: unknown device
- ;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
- cat
-else
- sh
-fi
diff --git a/etc/etc.socppc/MAKEDEV.md b/etc/etc.socppc/MAKEDEV.md
deleted file mode 100644
index 0cf31a0d319..00000000000
--- a/etc/etc.socppc/MAKEDEV.md
+++ /dev/null
@@ -1,103 +0,0 @@
-define(MACHINE,socppc)dnl
-vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.31 2016/09/04 15:38:59 naddy Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl
-dnl __devitem(apm, apm, Power management device)dnl
-_TITLE(make)
-_DEV(all)
-_DEV(ramd)
-_DEV(std)
-_DEV(local)
-_TITLE(dis)
-_DEV(cd, 9, 3)
-_DEV(rd, 17, 17)
-_DEV(sd, 8, 2)
-_DEV(vnd, 19, 14)
-_DEV(wd, 11, 0)
-_TITLE(tap)
-_DEV(ch, 10)
-_DEV(st, 20)
-_TITLE(term)
-_DEV(com, 26)
-_TITLE(pty)
-_DEV(ptm, 77)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(cons)
-_DEV(wsdisp, 67)
-_DEV(wscons)
-_DEV(wskbd, 68)
-_DEV(wsmux, 70)
-_TITLE(point)
-_DEV(wsmouse, 69)
-_TITLE(usb)
-_DEV(uall)
-_DEV(ttyU, 66)
-_DEV(ugen, 63)
-_DEV(uhid, 62)
-_DEV(ulpt, 64)
-_DEV(usb, 61)
-_TITLE(spec)
-dnl _DEV(apm, 25)
-dnl _DEV(au, 44)
-dnl _DEV(bio, 80)
-dnl dnl _DEV(bktr, 75)
-_DEV(bpf, 22)
-_DEV(diskmap, 82)
-_DEV(fdesc, 21)
-_DEV(fuse, 85)
-dnl _DEV(gpio, 79)
-_DEV(hotplug, 84)
-_DEV(pci, 71)
-_DEV(pf, 39)
-_DEV(pppx, 83)
-dnl _DEV(radio, 76)
-_DEV(rnd, 40)
-_DEV(tun, 23)
-_DEV(tap, 86)
-dnl _DEV(tuner, 75)
-dnl _DEV(uk, 41)
-_DEV(vi, 44)
-_DEV(vscsi, 78)
-_DEV(switch, 87)
-dnl
-divert(__mddivert)dnl
-dnl
-_std(1, 2, 43, 6)
- ;;
-
-dnl
-dnl *** socppc specific targets
-dnl
-twrget(all, au, audio, 0, 1, 2)dnl
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-target(all, pty, 0)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, tap, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, switch, 0, 1, 2, 3)dnl
-dnl target(all, gpio, 0, 1, 2)dnl
-dnl target(all, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
diff --git a/etc/etc.socppc/Makefile b/etc/etc.socppc/Makefile
deleted file mode 100644
index 324bc9769a7..00000000000
--- a/etc/etc.socppc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/etc/etc.socppc/Makefile.inc b/etc/etc.socppc/Makefile.inc
deleted file mode 100644
index 34f7ae80aa1..00000000000
--- a/etc/etc.socppc/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.8 2017/04/04 00:03:12 deraadt Exp $
-
-bootblocks:
- cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot
- cp -p ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf
-
-MDEXT= bsd.bin bsd.rd boot boot.elf miniroot${OSrev}.fs
diff --git a/etc/etc.socppc/disktab b/etc/etc.socppc/disktab
deleted file mode 100644
index 461c3dcf2f7..00000000000
--- a/etc/etc.socppc/disktab
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: disktab,v 1.6 2015/08/14 23:45:56 krw Exp $
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
- :dt=rdroot:se#512:nc#16:nt#2:ns#256:\
- :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
- :ob#0:pb#0:oc#0:pc#8192:
-
-miniroot|Installation root FS image:\
- :dt=rdroot:se#512:nc#8:nt#16:ns#63:\
- :ta=4.2BSD:oa#1024:pa#7040:fa#512:ba#4096:\
- :ob#0:pb#0:oc#0:pc#8064:ti=boot:oi#63:pi#512:
diff --git a/etc/etc.socppc/fbtab b/etc/etc.socppc/fbtab
deleted file mode 100644
index 9216d258e64..00000000000
--- a/etc/etc.socppc/fbtab
+++ /dev/null
@@ -1 +0,0 @@
-/dev/tty00 0600 /dev/console
diff --git a/etc/etc.socppc/login.conf b/etc/etc.socppc/login.conf
deleted file mode 100644
index 58c8b6295e2..00000000000
--- a/etc/etc.socppc/login.conf
+++ /dev/null
@@ -1,109 +0,0 @@
-# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
-
-#
-# Sample login.conf file. See login.conf(5) for details.
-#
-
-#
-# Standard authentication styles:
-#
-# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
-# the YP password if the user has one, else change the
-# local password)
-# lchpass Do not login; change user's local password instead
-# radius Use radius authentication
-# reject Use rejected authentication
-# skey Use S/Key authentication
-# activ ActivCard X9.9 token authentication
-# crypto CRYPTOCard X9.9 token authentication
-# snk Digital Pathways SecureNet Key authentication
-# tis TIS Firewall Toolkit authentication
-# token Generic X9.9 token authentication
-# yubikey YubiKey authentication
-#
-
-# Default allowed authentication styles
-auth-defaults:auth=passwd,skey:
-
-# Default allowed authentication styles for authentication type ftp
-auth-ftp-defaults:auth-ftp=passwd:
-
-#
-# The default values
-# To alter the default authentication types change the line:
-# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
-# :auth=passwd,myauth,activ:\
-# Any value changed in the daemon class should be reset in default
-# class.
-#
-default:\
- :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
- :umask=022:\
- :datasize-max=512M:\
- :datasize-cur=512M:\
- :maxproc-max=256:\
- :maxproc-cur=128:\
- :openfiles-max=1024:\
- :openfiles-cur=512:\
- :stacksize-cur=4M:\
- :localcipher=blowfish,8:\
- :tc=auth-defaults:\
- :tc=auth-ftp-defaults:
-
-#
-# Settings used by /etc/rc and root
-# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
-#
-daemon:\
- :ignorenologin:\
- :datasize=infinity:\
- :maxproc=infinity:\
- :openfiles-max=1024:\
- :openfiles-cur=128:\
- :stacksize-cur=8M:\
- :localcipher=blowfish,9:\
- :tc=default:
-
-#
-# Staff have fewer restrictions and can login even when nologins are set.
-#
-staff:\
- :datasize-cur=512M:\
- :datasize-max=infinity:\
- :maxproc-max=512:\
- :maxproc-cur=128:\
- :ignorenologin:\
- :requirehome@:\
- :tc=default:
-
-#
-# Authpf accounts get a special motd and shell
-#
-authpf:\
- :welcome=/etc/motd.authpf:\
- :shell=/usr/sbin/authpf:\
- :tc=default:
-
-#
-# Building ports with DPB uses raised limits
-#
-pbuild:\
- :datasize-max=infinity:\
- :datasize-cur=1024M:\
- :maxproc-max=1024:\
- :maxproc-cur=256:\
- :tc=default:
-
-#
-# Override resource limits for certain daemons started by rc.d(8)
-#
-bgpd:\
- :openfiles=512:\
- :tc=daemon:
-
-unbound:\
- :openfiles=512:\
- :tc=daemon:
diff --git a/etc/etc.socppc/sysctl.conf b/etc/etc.socppc/sysctl.conf
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/etc/etc.socppc/sysctl.conf
+++ /dev/null
diff --git a/etc/etc.socppc/ttys b/etc/etc.socppc/ttys
deleted file mode 100644
index 83535b7abdc..00000000000
--- a/etc/etc.socppc/ttys
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $OpenBSD: ttys,v 1.1 2008/05/13 19:39:58 kettenis Exp $
-#
-# name getty type status comments
-#
-console "/usr/libexec/getty std.115200" vt220 on secure
-tty00 "/usr/libexec/getty std.115200" unknown off secure
-tty01 "/usr/libexec/getty std.9600" unknown off secure
-tty02 "/usr/libexec/getty std.9600" unknown off
-tty03 "/usr/libexec/getty std.9600" unknown off
-tty04 "/usr/libexec/getty std.9600" unknown off
-tty05 "/usr/libexec/getty std.9600" unknown off
-tty06 "/usr/libexec/getty std.9600" unknown off
-tty07 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index fb70defe1ec..c4e25833588 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.309 2019/04/05 09:02:27 bentley Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.310 2019/05/11 07:18:15 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -508,8 +508,6 @@ usr
..
sgi
..
- socppc
- ..
sparc64
..
..
@@ -548,8 +546,6 @@ usr
..
sgi
..
- socppc
- ..
sparc64
..
..