From 22411cb2547c5f026aedf5cc1e159ef9c890c73e Mon Sep 17 00:00:00 2001
From: jca <>
Date: Tue, 27 Dec 2016 09:17:52 +0000
Subject: [PATCH] Remove user uucp and group news from base.

---
 src/etc/group             | 1 -
 src/etc/master.passwd     | 1 -
 src/etc/mtree/4.4BSD.dist | 9 ++-------
 src/etc/mtree/special     | 8 +-------
 src/etc/newsyslog.conf    | 3 +--
 src/etc/rc                | 4 ++--
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/etc/group b/src/etc/group
index 4ff471de..69c24083 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -5,7 +5,6 @@ sys:*:3:root
 tty:*:4:root
 operator:*:5:root
 bin:*:7:
-news:*:8:
 wsrc:*:9:
 users:*:10:
 auth:*:11:
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index c3fb1ce3..cec7b630 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -21,7 +21,6 @@ _pfetch:*:56:56::0:0:dpb fetch user:/nonexistent:/sbin/nologin
 _pkgfetch:*:57:57::0:0:pkg fetch user:/nonexistent:/sbin/nologin
 _pkguntar:*:58:58::0:0:pkg untar user:/nonexistent:/sbin/nologin
 _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
-uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin
 www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
 _isakmpd:*:68:68::0:0:isakmpd privsep:/var/empty:/sbin/nologin
 _syslogd:*:73:73::0:0:Syslog Daemon:/var/empty:/sbin/nologin
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 79b39619..c5626857 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.292 2016/11/09 17:04:34 millert Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.293 2016/12/27 09:17:52 jca Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -689,7 +689,7 @@ var
         ..
 
         # ./var/spool/lock
-        lock			uname=uucp gname=dialer mode=1775
+        lock			uname=root gname=dialer mode=1775
         ..
         output
             lpd			gname=daemon mode=0775
@@ -712,11 +712,6 @@ var
             ..
         ..
 
-        # ./var/spool/uucp
-        uucp			uname=uucp gname=daemon
-        ..
-        uucppublic		uname=uucp gname=daemon mode=0755
-        ..
     ..
 
     # ./var/unbound
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index f507e04c..5ecc5863 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.121 2016/09/26 06:51:23 ajacoutot Exp $
+#	$OpenBSD: special,v 1.122 2016/12/27 09:17:52 jca Exp $
 #
 # Hand-crafted mtree specification for the dangerous files.
 #
@@ -114,8 +114,6 @@ ttys		type=file mode=0644 uname=root gname=wheel
 weekly		type=file mode=0644 uname=root gname=wheel
 weekly.local	type=file mode=0644 uname=root gname=wheel optional
 ypldap.conf	type=file mode=0600 uname=root gname=wheel optional
-uucp		type=dir mode=0755 uname=root gname=wheel optional ignore
-..	#uucp
 ..	#etc
 
 root		type=dir mode=0700 uname=root gname=wheel
@@ -209,8 +207,4 @@ pub		type=dir mode=0555 uname=root gname=wheel optional ignore
 ..	#var/spool/ftp
 output		type=dir mode=0755 uname=root gname=wheel ignore
 ..	#var/spool/output
-uucp		type=dir mode=0755 uname=uucp gname=daemon ignore
-..	#var/spool/uucp
-uucppublic	type=dir mode=0755 uname=uucp gname=daemon ignore
-..	#var/spool/uucppublic
 ..	#var/spool
diff --git a/src/etc/newsyslog.conf b/src/etc/newsyslog.conf
index 0603211b..8e59a5ce 100644
--- a/src/etc/newsyslog.conf
+++ b/src/etc/newsyslog.conf
@@ -1,10 +1,9 @@
-#	$OpenBSD: newsyslog.conf,v 1.35 2016/06/01 16:57:07 tedu Exp $
+#	$OpenBSD: newsyslog.conf,v 1.36 2016/12/27 09:17:52 jca Exp $
 #
 # configuration file for newsyslog
 #
 # logfile_name		owner:group     mode count size when  flags
 /var/cron/log		root:wheel	600  3     10   *     Z
-/var/log/aculog		uucp:dialer	660  7     *    24    Z
 /var/log/authlog	root:wheel	640  7     *    168   Z
 /var/log/daemon				640  5     300  *     Z
 /var/log/lpd-errs			640  7     10   *     Z
diff --git a/src/etc/rc b/src/etc/rc
index f770d8e4..f82168a3 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.491 2016/11/04 22:12:46 rpe Exp $
+#	$OpenBSD: rc,v 1.492 2016/12/27 09:17:52 jca Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -414,7 +414,7 @@ random_seed
 reorder_libs
 
 # Clean up left-over files.
-rm -f /etc/nologin /var/spool/lock/LCK.* /var/spool/uucp/STST/*
+rm -f /etc/nologin /var/spool/lock/LCK.*
 (cd /var/run && { rm -rf -- *; install -c -m 664 -g utmp /dev/null utmp; })
 (cd /var/authpf && rm -rf -- *)