svn commit: r279674 - in projects/release-pkg: etc etc/rc.d lib/libpam/modules/pam_ssh secure/lib/libssh secure/libexec secure/usr.bin/scp secure/usr.bin/sftp secure/usr.bin/ssh secure/usr.bin/ssh-...
Baptiste Daroussin
bapt at FreeBSD.org
Thu Mar 5 20:25:14 UTC 2015
Author: bapt
Date: Thu Mar 5 20:25:09 2015
New Revision: 279674
URL: https://svnweb.freebsd.org/changeset/base/279674
Log:
Move ssh into a dedicated package
Flag config files as "to be merged on upgrade"
Modified:
projects/release-pkg/etc/Makefile
projects/release-pkg/etc/rc.d/Makefile
projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile
projects/release-pkg/secure/lib/libssh/Makefile
projects/release-pkg/secure/libexec/Makefile.inc
projects/release-pkg/secure/usr.bin/scp/Makefile
projects/release-pkg/secure/usr.bin/sftp/Makefile
projects/release-pkg/secure/usr.bin/ssh-add/Makefile
projects/release-pkg/secure/usr.bin/ssh-agent/Makefile
projects/release-pkg/secure/usr.bin/ssh-keygen/Makefile
projects/release-pkg/secure/usr.bin/ssh-keyscan/Makefile
projects/release-pkg/secure/usr.bin/ssh/Makefile
projects/release-pkg/secure/usr.sbin/sshd/Makefile
projects/release-pkg/usr.bin/ssh-copy-id/Makefile
Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/etc/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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"
Modified: projects/release-pkg/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/etc/rc.d/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/etc/rc.d/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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>
Modified: projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -6,6 +6,7 @@ SSHDIR= ${.CURDIR}/../../../../crypto/op
LIB= pam_ssh
MAN= pam_ssh.8
SRCS= pam_ssh.c
+PACKAGE= ssh
# required when linking with a dynamic libssh
SRCS+= roaming_dummy.c
Modified: projects/release-pkg/secure/lib/libssh/Makefile
==============================================================================
--- projects/release-pkg/secure/lib/libssh/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/lib/libssh/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -19,6 +19,7 @@ SRCS= authfd.c authfile.c bufaux.c bufbn
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.
Modified: projects/release-pkg/secure/libexec/Makefile.inc
==============================================================================
--- projects/release-pkg/secure/libexec/Makefile.inc Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/libexec/Makefile.inc Thu Mar 5 20:25:09 2015 (r279674)
@@ -1,5 +1,6 @@
# $FreeBSD$
BINDIR?= /usr/libexec
+PACKAGE= ssh
.include "../Makefile.inc"
Modified: projects/release-pkg/secure/usr.bin/scp/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/scp/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/scp/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/sftp/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/sftp/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/sftp/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/ssh-add/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/ssh-add/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/ssh-add/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/ssh-agent/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/ssh-agent/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/ssh-agent/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/ssh-keygen/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/ssh-keygen/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/ssh-keygen/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/ssh-keyscan/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/ssh-keyscan/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/ssh-keyscan/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -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
Modified: projects/release-pkg/secure/usr.bin/ssh/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.bin/ssh/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.bin/ssh/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -7,6 +7,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa
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 \
Modified: projects/release-pkg/secure/usr.sbin/sshd/Makefile
==============================================================================
--- projects/release-pkg/secure/usr.sbin/sshd/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/secure/usr.sbin/sshd/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -18,6 +18,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.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
Modified: projects/release-pkg/usr.bin/ssh-copy-id/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/ssh-copy-id/Makefile Thu Mar 5 20:24:34 2015 (r279673)
+++ projects/release-pkg/usr.bin/ssh-copy-id/Makefile Thu Mar 5 20:25:09 2015 (r279674)
@@ -2,5 +2,6 @@
SCRIPTS= ssh-copy-id.sh
MAN= ssh-copy-id.1
+PACKAGE= ssh
.include <bsd.prog.mk>
More information about the svn-src-projects
mailing list