Date: Thu, 20 Mar 2014 11:09:20 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263422 - in stable/9: . tools/build/mk Message-ID: <201403201109.s2KB9KQ1080303@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Thu Mar 20 11:09:20 2014 New Revision: 263422 URL: http://svnweb.freebsd.org/changeset/base/263422 Log: MFH (r255590): list OpenSSH in OptionalObsoleteFiles.inc Also fix the libssh-went-private bit in ObsoleteFiles.inc, which was incomplete. Modified: stable/9/ObsoleteFiles.inc stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/ObsoleteFiles.inc ============================================================================== --- stable/9/ObsoleteFiles.inc Thu Mar 20 10:56:05 2014 (r263421) +++ stable/9/ObsoleteFiles.inc Thu Mar 20 11:09:20 2014 (r263422) @@ -39,8 +39,14 @@ # done # 20140314: libssh becomes private +OLD_FILES+=usr/lib/libssh.a +OLD_FILES+=usr/lib/libssh.so OLD_LIBS+=usr/lib/libssh.so.5 +OLD_FILES+=usr/lib/libssh_p.a +OLD_FILES+=usr/lib32/libssh.a +OLD_FILES+=usr/lib32/libssh.so OLD_LIBS+=usr/lib32/libssh.so.5 +OLD_FILES+=usr/lib32/libssh_p.a # 20131109: extattr(2) mlinks fixed OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Mar 20 10:56:05 2014 (r263421) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Mar 20 11:09:20 2014 (r263422) @@ -3119,9 +3119,29 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. # to be filled in #.endif -#.if ${MK_OPENSSH} == no -# to be filled in -#.endif +.if ${MK_OPENSSH} == no +OLD_FILES+=usr/bin/sftp +OLD_FILES+=usr/bin/ssh +OLD_FILES+=usr/bin/ssh-add +OLD_FILES+=usr/bin/ssh-agent +OLD_FILES+=usr/bin/ssh-copy-id +OLD_FILES+=usr/bin/ssh-keygen +OLD_FILES+=usr/bin/ssh-keyscan +OLD_FILES+=usr/lib/private/libssh.a +OLD_FILES+=usr/lib/private/libssh.so +OLD_LIBS+=usr/lib/private/libssh.so.5 +OLD_FILES+=usr/lib/private/libssh_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libssh.a +OLD_FILES+=usr/lib32/private/libssh.so +OLD_LIBS+=usr/lib32/private/libssh.so.5 +OLD_FILES+=usr/lib32/private/libssh_p.a +.endif +OLD_FILES+=usr/libexec/sftp-server +OLD_FILES+=usr/libexec/ssh-keysign +OLD_FILES+=usr/libexec/ssh-pkcs11-helper +OLD_FILES+=usr/sbin/sshd +.endif #.if ${MK_OPENSSL} == no # to be filled in @@ -3384,7 +3404,6 @@ OLD_FILES+=usr/lib/librt_p.a OLD_FILES+=usr/lib/libsbuf_p.a OLD_FILES+=usr/lib/libsdp_p.a OLD_FILES+=usr/lib/libsmb_p.a -OLD_FILES+=usr/lib/libssh_p.a OLD_FILES+=usr/lib/libssl_p.a OLD_FILES+=usr/lib/libstdc++_p.a OLD_FILES+=usr/lib/libsupc++_p.a @@ -3406,6 +3425,8 @@ OLD_FILES+=usr/lib/libwrap_p.a OLD_FILES+=usr/lib/liby_p.a OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/lib/libz_p.a +OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/private/libssh_p.a .endif .if ${MK_RCMDS} == no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403201109.s2KB9KQ1080303>