Date: Sun, 08 Sep 2013 15:11:40 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: src-committers@freebsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r255386 - in head: . lib/libldns lib/libpam/modules/pam_ssh secure/lib/libssh secure/libexec/sftp-server secure/libexec/ssh-keysign secure/libexec/ssh-pkcs11-helper secure/usr.bin/scp s... Message-ID: <86mwnnxxtf.fsf@nine.des.no> In-Reply-To: <201309081004.r88A4RWs061462@svn.freebsd.org> (Dag-Erling SmXXrgrav's message of "Sun, 8 Sep 2013 10:04:27 %2B0000 (UTC)") References: <201309081004.r88A4RWs061462@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Dag-Erling SmXXrgrav <des@FreeBSD.org> writes:
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc Sun Sep 8 09:46:22 2013 (r255385)
> +++ head/ObsoleteFiles.inc Sun Sep 8 10:04:26 2013 (r255386)
> @@ -38,6 +38,9 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20130908: libssh becomes private
> +OLD_LIBS+=usr/lib/libssh.so.5
> +OLD_LIBS+=usr/lib32/libssh.so.5
> # 20130903: gnupatch is no more
> OLD_FILES+=usr/bin/gnupatch
> OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
>
I'm not sure I fully understand the standard procedure for obsoleting
libraries. I now believe that this was insufficient, and that I should
commit the following, which also adds a number of missing entries for
the WITHOUT_OPENSSH case:
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc (revision 255386)
+++ tools/build/mk/OptionalObsoleteFiles.inc (working copy)
@@ -3375,6 +3375,19 @@
OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
.endif
+.if ${MK_LDNS} == no
+OLD_FILES+=usr/lib/private/libldns.a
+OLD_FILES+=usr/lib/private/libldns.so
+OLD_LIBS+=usr/lib/private/libldns.so.5
+OLD_FILES+=usr/lib/private/libldns_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/private/libldns.a
+OLD_FILES+=usr/lib32/private/libldns.so
+OLD_LIBS+=usr/lib32/private/libldns.so.5
+OLD_FILES+=usr/lib32/private/libldns_p.a
+.endif
+.endif
+
#.if ${MK_LIB32} == no
# to be filled in
#.endif
@@ -3701,8 +3714,28 @@
#.endif
.if ${MK_OPENSSH} == no
-OLD_FILES+=usr.bin/ssh-copy-id
+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
@@ -3958,7 +3991,6 @@
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
@@ -3981,6 +4013,8 @@
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
Does anyone care to comment?
DES
--
Dag-Erling Smørgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86mwnnxxtf.fsf>