Jeremie Courreges-Anglas <[email protected]> writes:
> The net/uucp and news/leafnode ports have been tweaked to use accounts
> managed in the ports tree:
>
> https://www.openbsd.org/faq/current.html#r20161218
>
> The uucp port no longer puts its lock files in /var/spool/lock. This
> means that using uucp and pppd on a serial line could lead to conflicts.
> I have no idea if it is true in practice, nor if anyone is using such
> a setup.
Updated diff, which also removes uucp from hier(7) (thanks jmc@),
security(8) and install.sub.
> ok?
Index: share/man/man7/hier.7
===================================================================
RCS file: /d/cvs/src/share/man/man7/hier.7,v
retrieving revision 1.156
diff -u -p -r1.156 hier.7
--- share/man/man7/hier.7 3 Nov 2016 16:42:47 -0000 1.156
+++ share/man/man7/hier.7 26 Dec 2016 13:04:36 -0000
@@ -575,7 +575,7 @@ Database of current users (see
.It spool/
Miscellaneous printer and mail system spooling directories.
.Pp
-.Bl -tag -width "uucppublic/" -compact
+.Bl -tag -width "output/" -compact
.It ftp/
Commonly ~ftp; the anonymous ftp root directory.
.It lock/
@@ -586,10 +586,6 @@ Line printer spooling directories.
.It smtpd/
Mail spool for
.Xr smtpd 8 .
-.It uucp/
-uucp spool directory.
-.It uucppublic/
-Commonly ~uucp; public uucp temporary directory.
.El
.Pp
.It sysmerge/
Index: libexec/security/security
===================================================================
RCS file: /d/cvs/src/libexec/security/security,v
retrieving revision 1.37
diff -u -p -r1.37 security
--- libexec/security/security 22 Oct 2016 18:35:12 -0000 1.37
+++ libexec/security/security 26 Dec 2016 13:19:03 -0000
@@ -359,8 +359,7 @@ sub check_rhosts_owner {
my $filename = "$home/.$base";
next unless -s $filename;
nag ! -O $filename &&
- ($name eq 'ftp' || $name eq 'uucp' ||
- ($uid < 100 && $name ne 'root')),
+ ($name eq 'ftp' || ($uid < 100 && $name ne 'root')),
"$filename is not owned by root.";
}
}
Index: distrib/miniroot/install.sub
===================================================================
RCS file: /d/cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.936
diff -u -p -r1.936 install.sub
--- distrib/miniroot/install.sub 19 Dec 2016 19:59:38 -0000 1.936
+++ distrib/miniroot/install.sub 26 Dec 2016 13:01:55 -0000
@@ -1811,7 +1811,7 @@ user_setup() {
y|yes) _q="No really, what is the lower-case loginname, or
'no'?"
continue
;;
- root|daemon|operator|bin|sshd|uucp|www|nobody|ftp)
+ root|daemon|operator|bin|sshd|www|nobody|ftp)
;;
[a-z]*([a-z0-9_]))
((${#resp} <= 31)) && break
Index: etc//group
===================================================================
RCS file: /d/cvs/src/etc/group,v
retrieving revision 1.85
diff -u -p -r1.85 group
--- etc//group 15 Nov 2016 20:44:40 -0000 1.85
+++ etc//group 14 Dec 2016 11:49:27 -0000
@@ -5,7 +5,6 @@ sys:*:3:root
tty:*:4:root
operator:*:5:root
bin:*:7:
-news:*:8:
wsrc:*:9:
users:*:10:
auth:*:11:
Index: etc//master.passwd
===================================================================
RCS file: /d/cvs/src/etc/master.passwd,v
retrieving revision 1.94
diff -u -p -r1.94 master.passwd
--- etc//master.passwd 15 Nov 2016 20:44:40 -0000 1.94
+++ etc//master.passwd 14 Dec 2016 14:49:30 -0000
@@ -21,7 +21,6 @@ _pfetch:*:56:56::0:0:dpb fetch user:/non
_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
Index: etc//newsyslog.conf
===================================================================
RCS file: /d/cvs/src/etc/newsyslog.conf,v
retrieving revision 1.35
diff -u -p -r1.35 newsyslog.conf
--- etc//newsyslog.conf 1 Jun 2016 16:57:07 -0000 1.35
+++ etc//newsyslog.conf 14 Dec 2016 13:01:16 -0000
@@ -4,7 +4,6 @@
#
# 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
Index: etc//rc
===================================================================
RCS file: /d/cvs/src/etc/rc,v
retrieving revision 1.491
diff -u -p -r1.491 rc
--- etc//rc 4 Nov 2016 22:12:46 -0000 1.491
+++ etc//rc 26 Dec 2016 13:56:19 -0000
@@ -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 -- *)
Index: etc//mtree/4.4BSD.dist
===================================================================
RCS file: /d/cvs/src/etc/mtree/4.4BSD.dist,v
retrieving revision 1.292
diff -u -p -r1.292 4.4BSD.dist
--- etc//mtree/4.4BSD.dist 9 Nov 2016 17:04:34 -0000 1.292
+++ etc//mtree/4.4BSD.dist 14 Dec 2016 15:39:26 -0000
@@ -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
Index: etc//mtree/special
===================================================================
RCS file: /d/cvs/src/etc/mtree/special,v
retrieving revision 1.121
diff -u -p -r1.121 special
--- etc//mtree/special 26 Sep 2016 06:51:23 -0000 1.121
+++ etc//mtree/special 14 Dec 2016 07:41:07 -0000
@@ -114,8 +114,6 @@ ttys type=file mode=0644 uname=root gna
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
.. #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
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
