Move ssh into a dedicated package

Flag config files as "to be merged on upgrade"

etc/Makefile

@@ -276,7 +276,7 @@ distribution:
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if ${MK_OPENSSH} != "no"
-	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
+	cd ${.CURDIR}; ${INSTALL} -T package=ssh,config -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSH} ${DESTDIR}/etc/ssh
 .endif
 .if ${MK_OPENSSL} != "no"

etc/rc.d/Makefile

@@ -111,7 +111,6 @@ FILES=	DAEMON \
 	securelevel \
 	serial \
 	sppp \
-	${_sshd} \
 	statd \
 	static_arp \
 	static_ndp \
@@ -246,7 +245,8 @@ FILES+=		keyserv
 .endif
 
 .if ${MK_OPENSSH} != "no"
-_sshd=		sshd
+FILESGROUPS+=	SSH
+SSH=		sshd
 .endif
 
 .if ${MK_PF} != "no"
@@ -298,4 +298,8 @@ ACPIDIR=	/etc/rc.d
 ACPIMODE=	${BINMODE}
 ACPIPACKAGE=	acpi
 
+SSHDIR=		/etc/rc.d
+SSHMODE=	${BINMODE}
+SSHPACKAGE=	ssh
+
 .include <bsd.prog.mk>

lib/libpam/modules/pam_ssh/Makefile

@@ -6,6 +6,7 @@ SSHDIR=	${.CURDIR}/../../../../crypto/openssh
 LIB=	pam_ssh
 MAN=	pam_ssh.8
 SRCS=	pam_ssh.c
+PACKAGE=	ssh
 
 # required when linking with a dynamic libssh
 SRCS+=	roaming_dummy.c

secure/lib/libssh/Makefile

@@ -19,6 +19,7 @@ SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \
 	ssh-ed25519.c digest-openssl.c hmac.c \
 	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
+PACKAGE=	ssh
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.

secure/libexec/Makefile.inc

@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/libexec
+PACKAGE=	ssh
 
 .include "../Makefile.inc"

secure/usr.bin/scp/Makefile

@@ -5,6 +5,7 @@
 PROG=	scp
 SRCS=	scp.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 .if !defined(NO_SHARED)
 # required when linking with a dynamic libssh

secure/usr.bin/sftp/Makefile

@@ -5,6 +5,7 @@
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 .if !defined(NO_SHARED)
 # required when linking with a dynamic libssh

secure/usr.bin/ssh-add/Makefile

@@ -5,6 +5,7 @@
 PROG=	ssh-add
 SRCS+=	ssh-add.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 .if !defined(NO_SHARED)
 # required when linking with a dynamic libssh

secure/usr.bin/ssh-agent/Makefile

@@ -5,6 +5,7 @@
 PROG=	ssh-agent
 SRCS=	ssh-agent.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 .if !defined(NO_SHARED)
 # required when linking with a dynamic libssh

secure/usr.bin/ssh-keygen/Makefile

@@ -5,6 +5,7 @@
 PROG=	ssh-keygen
 SRCS=	ssh-keygen.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 .if !defined(NO_SHARED)
 # required when linking with a dynamic libssh

secure/usr.bin/ssh-keyscan/Makefile

@@ -5,6 +5,7 @@
 PROG=	ssh-keyscan
 SRCS=	ssh-keyscan.c roaming_dummy.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+PACKAGE=	ssh
 
 LIBADD=	ssh
 

secure/usr.bin/ssh/Makefile

@@ -7,6 +7,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MAN=	ssh.1 ssh_config.5
 MLINKS=	ssh.1 slogin.1
+PACKAGE=	ssh
 
 SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c mux.c \

secure/usr.sbin/sshd/Makefile

@@ -18,6 +18,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	roaming_common.c roaming_serv.c \
 	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \
 	sandbox-seccomp-filter.c sandbox-capsicum.c
+PACKAGE=	ssh
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c

usr.bin/ssh-copy-id/Makefile

@@ -2,5 +2,6 @@
 
 SCRIPTS= ssh-copy-id.sh
 MAN=	ssh-copy-id.1
+PACKAGE=	ssh
 
 .include <bsd.prog.mk>