From b8c93cad1f702250124922ee6f78c2b217a956c3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 30 Apr 2017 20:32:24 +0200 Subject: [PATCH] Remove some old UUCP remains and adjust better to net/freebsd-uucp pkg. --- Makefile_upgrade.inc | 1 + etc/inetd.conf | 4 ++++ etc/mtree/BSD.root.dist | 2 -- etc/mtree/BSD.usr.dist | 2 -- etc/mtree/BSD.var.dist | 16 ---------------- share/man/man7/hier.7 | 14 -------------- usr.bin/chat/chat.8 | 9 ++++----- usr.bin/login/login.1 | 3 +-- usr.bin/uuencode/uuencode.1 | 3 +-- usr.bin/uuencode/uuencode.format.5 | 3 +-- 10 files changed, 12 insertions(+), 45 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 69333b1ff3..43be448a0a 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3209,6 +3209,7 @@ TO_REMOVE+=/usr/share/man/man4/ahc.4.gz TO_REMOVE+=/usr/share/man/man4/ahd.4.gz TO_REMOVE+=/usr/share/man/man4/aic.4.gz TO_REMOVE+=/usr/share/zoneinfo/Pacific/Johnston +TO_REMOVE+=/usr/libexec/uucp .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/etc/inetd.conf b/etc/inetd.conf index 2255a0bb30..b4e5882698 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -81,6 +81,10 @@ # #nntp stream tcp nowait news /usr/local/sbin/nntpd nntpd # +# example entry for the optional uucpd server +# +#uucpd stream tcp nowait root /usr/local/libexec/uucpd uucpd +# # Return error for all "ident" requests # #auth stream tcp nowait root internal diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 8483af23ef..c53761b0cc 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -64,8 +64,6 @@ .. upgrade .. - uucp uname=uucp gname=uucp mode=0770 - .. .. lib priv diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 5743819de5..1890d1c7fd 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -122,8 +122,6 @@ .. sm.bin .. - uucp - .. .. local .. diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index 459d5abb3a..df35891069 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -77,22 +77,6 @@ lpd .. .. -/set gname=wheel -/set uname=uucp gname=uucp mode=0775 - uucp - .Preserve - .. - .Sequence - .. - .Status - .. - .Temp - .. - .Xqtdir - .. - .. - uucppublic mode=0777 - .. /set uname=root gname=wheel mode=0755 .. tmp mode=01777 diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 83a799fa60..746cf2ad3d 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -126,10 +126,6 @@ see OpenSSL configuration files .It Pa upgrade/ Files relevant to system upgrades -.It Pa uucp/ -uucp configuration files; -see -.Xr uucp 1 .El .It Pa /home/ HOME directories of non-root users @@ -332,10 +328,6 @@ see restricted shell for sendmail; see .Xr smrsh 8 -.It Pa uucp/ -uucp utilities; -see -.Xr uucp 1 .El .Pp .It Pa local/ @@ -683,12 +675,6 @@ see .Xr sendmail 8 .It Pa output/ line printer spooling directories -.It Pa uucp/ -uucp spool directory -.It Pa uucppublic/ -commonly -.Pa ~uucp ; -public uucp temporary directory .El .Pp .It Pa tmp/ diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8 index 9e7112e8af..a6fe5d217a 100644 --- a/usr.bin/chat/chat.8 +++ b/usr.bin/chat/chat.8 @@ -1,7 +1,6 @@ .\" -*- nroff -*- .\" manual page [] for chat 1.8 .\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.15.2.3 2003/02/24 22:37:41 trhodes Exp $ -.\" $DragonFly: src/usr.bin/chat/chat.8,v 1.7 2008/05/09 20:31:04 swildner Exp $ .Dd September 27, 1996 .Dt CHAT 8 .Os @@ -618,10 +617,10 @@ was received from the modem as opposed to While the first event may be retried, the second will probably have little chance of succeeding during a retry. .Sh SEE ALSO -.Xr uucico 1 , -.Xr uucp 1 , +.Xr uucp 1 Pq Pa net/freebsd-uucp , .Xr syslog 3 , -.Xr syslogd 8 +.Xr syslogd 8 , +.Xr uucico 8 Pq Pa net/freebsd-uucp , .Pp Additional information about .Nm @@ -629,7 +628,7 @@ scripts may be found with UUCP documentation. The .Nm script was taken from the ideas proposed by the scripts used by the -.Xr uucico 1 +.Xr uucico 8 Pq Pa net/freebsd-uucp program. .Sh COPYRIGHT The diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1 index b524003d68..e2637e1a58 100644 --- a/usr.bin/login/login.1 +++ b/usr.bin/login/login.1 @@ -27,7 +27,6 @@ .\" .\" @(#)login.1 8.2 (Berkeley) 5/5/94 .\" $FreeBSD: src/usr.bin/login/login.1,v 1.33 2007/11/30 11:02:36 philip Exp $ -.\" $DragonFly: src/usr.bin/login/login.1,v 1.2 2003/06/17 04:29:28 dillon Exp $ .\" .Dd September 13, 2006 .Dt LOGIN 1 @@ -97,7 +96,7 @@ If the file .Pa .hushlogin exists in the user's home directory, all of these messages are suppressed. This is to simplify logins for non-human users, such as -.Xr uucp 1 . +.Xr uucp 1 Pq Pa net/freebsd-uucp . .Pp The .Nm diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1 index 3c1c281774..2652c2b1b7 100644 --- a/usr.bin/uuencode/uuencode.1 +++ b/usr.bin/uuencode/uuencode.1 @@ -27,7 +27,6 @@ .\" .\" @(#)uuencode.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.9.2.9 2003/04/07 20:11:46 fanf Exp $ -.\" $DragonFly: src/usr.bin/uuencode/uuencode.1,v 1.3 2006/02/17 19:39:14 swildner Exp $ .\" .Dd January 27, 2002 .Dt UUENCODE 1 @@ -204,7 +203,7 @@ uudecode -o /dev/stdout < $MAIL | zcat | tar xfv - .Xr basename 1 , .Xr compress 1 , .Xr mail 1 , -.Xr uucp 1 , +.Xr uucp 1 Pq Pa net/freebsd-uucp , .Xr uuencode 5 .Sh HISTORY The diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5 index fdf6613b69..a7a312dff1 100644 --- a/usr.bin/uuencode/uuencode.format.5 +++ b/usr.bin/uuencode/uuencode.format.5 @@ -27,7 +27,6 @@ .\" .\" @(#)uuencode.format.5 8.2 (Berkeley) 1/12/94 .\" $FreeBSD: src/usr.bin/uuencode/uuencode.format.5,v 1.8.2.4 2001/10/18 10:27:01 ru Exp $ -.\" $DragonFly: src/usr.bin/uuencode/uuencode.format.5,v 1.2 2003/06/17 04:29:33 dillon Exp $ .\" .Dd January 12, 1994 .Dt UUENCODE 5 @@ -92,7 +91,7 @@ The trailer line consists of on a line by itself. .Sh SEE ALSO .Xr mail 1 , -.Xr uucp 1 , +.Xr uucp 1 Pq Pa net/freebsd-uucp , .Xr uudecode 1 , .Xr uuencode 1 .Sh HISTORY -- 2.41.0