From 2971191a945ad6c271dbe6d865bd36b66a339be9 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 Jan 2016 17:33:31 +0000
Subject: [PATCH] Create a rcmds package.

Sponsored by:	The FreeBSD Foundation
---
 bin/rcp/Makefile                 |  2 ++
 etc/pam.d/Makefile               |  9 ++++++++-
 libexec/rlogind/Makefile         |  1 +
 libexec/rshd/Makefile            |  2 ++
 release/packages/rcmds-debug.ucl | 13 +++++++++++++
 release/packages/rcmds.ucl       | 13 +++++++++++++
 usr.bin/rlogin/Makefile          |  2 ++
 usr.bin/rsh/Makefile             |  2 ++
 usr.bin/ruptime/Makefile         |  2 ++
 usr.bin/rwho/Makefile            |  2 ++
 usr.sbin/rwhod/Makefile          |  2 ++
 11 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 release/packages/rcmds-debug.ucl
 create mode 100644 release/packages/rcmds.ucl

diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 886ec01ca0d..e3c1071480f 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -5,6 +5,8 @@ PROG=	rcp
 SRCS=	rcp.c util.c
 CFLAGS+=-DBINDIR=${BINDIR}
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 7e29dbe6a01..a9aea19fee5 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -13,7 +13,6 @@ FILES=	README \
 	login \
 	other \
 	passwd pop3 \
-	rsh \
 	sshd su system \
 	telnetd \
 	xdm
@@ -26,6 +25,14 @@ ATDIR=	/etc/pam.d
 ATMODE=	644
 .endif
 
+.if ${MK_RCMDS} != "no"
+FILESGROUPS+=	RCMDS
+RCMDS+=		rsh
+RCMDSPACKAGE+=	rcmds
+RCMDSDIR=	/etc/pam.d
+RCMDSMODE=	644
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 282ec638961..1094a89a07e 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -5,6 +5,7 @@
 
 PROG=	rlogind
 MAN=	rlogind.8
+PACKAGE=rcmds
 LIBADD=	util
 WARNS?=	2
 
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index c856995c524..4869d1eced4 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -4,6 +4,8 @@
 PROG=	rshd
 MAN=	rshd.8
 
+PACKAGE=rcmds
+
 WARNS?=	3
 WFORMAT=0
 
diff --git a/release/packages/rcmds-debug.ucl b/release/packages/rcmds-debug.ucl
new file mode 100644
index 00000000000..74d1f562621
--- /dev/null
+++ b/release/packages/rcmds-debug.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Remote Command Tools (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/rcmds.ucl b/release/packages/rcmds.ucl
new file mode 100644
index 00000000000..c4bbccd430d
--- /dev/null
+++ b/release/packages/rcmds.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Remote Command Tools"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index e41417dab31..74ab15bd297 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -3,6 +3,8 @@
 
 PROG=	rlogin
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 2005f2317f2..66638ccf04a 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -4,6 +4,8 @@
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
diff --git a/usr.bin/ruptime/Makefile b/usr.bin/ruptime/Makefile
index f7fba3adde5..d181c9c3d98 100644
--- a/usr.bin/ruptime/Makefile
+++ b/usr.bin/ruptime/Makefile
@@ -3,4 +3,6 @@
 
 PROG=	ruptime
 
+PACKAGE=rcmds
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/rwho/Makefile b/usr.bin/rwho/Makefile
index 3fdc05d3b8f..701817b287d 100644
--- a/usr.bin/rwho/Makefile
+++ b/usr.bin/rwho/Makefile
@@ -3,4 +3,6 @@
 
 PROG=	rwho
 
+PACKAGE=rcmds
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index f1b5d997597..554f6bec1c3 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -4,6 +4,8 @@
 PROG=	rwhod
 MAN=	rwhod.8
 
+PACKAGE=rcmds
+
 WARNS?=	3
 
 .include <bsd.prog.mk>