From owner-svn-src-head@FreeBSD.ORG Sun Sep 8 13:11:39 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C001C48B; Sun, 8 Sep 2013 13:11:39 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 47B6A2D1D; Sun, 8 Sep 2013 13:11:38 +0000 (UTC) Received: from nine.des.no (smtp.des.no [194.63.250.102]) by smtp-int.des.no (Postfix) with ESMTP id 02CA7479E; Sun, 8 Sep 2013 13:11:38 +0000 (UTC) Received: by nine.des.no (Postfix, from userid 1001) id 3FC07AD; Sun, 8 Sep 2013 15:11:41 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: src-committers@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... References: <201309081004.r88A4RWs061462@svn.freebsd.org> Date: Sun, 08 Sep 2013 15:11:40 +0200 In-Reply-To: <201309081004.r88A4RWs061462@svn.freebsd.org> (Dag-Erling SmXXrgrav's message of "Sun, 8 Sep 2013 10:04:27 +0000 (UTC)") Message-ID: <86mwnnxxtf.fsf@nine.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 13:11:39 -0000 Dag-Erling SmXXrgrav writes: > Modified: head/ObsoleteFiles.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=20=20 > +# 20130908: libssh becomes private > +OLD_LIBS+=3Dusr/lib/libssh.so.5 > +OLD_LIBS+=3Dusr/lib32/libssh.so.5 > # 20130903: gnupatch is no more > OLD_FILES+=3Dusr/bin/gnupatch > OLD_FILES+=3Dusr/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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- tools/build/mk/OptionalObsoleteFiles.inc (revision 255386) +++ tools/build/mk/OptionalObsoleteFiles.inc (working copy) @@ -3375,6 +3375,19 @@ OLD_FILES+=3Dusr/share/man/man8/verify_krb5_conf.8.gz .endif =20 +.if ${MK_LDNS} =3D=3D no +OLD_FILES+=3Dusr/lib/private/libldns.a +OLD_FILES+=3Dusr/lib/private/libldns.so +OLD_LIBS+=3Dusr/lib/private/libldns.so.5 +OLD_FILES+=3Dusr/lib/private/libldns_p.a +.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" +OLD_FILES+=3Dusr/lib32/private/libldns.a +OLD_FILES+=3Dusr/lib32/private/libldns.so +OLD_LIBS+=3Dusr/lib32/private/libldns.so.5 +OLD_FILES+=3Dusr/lib32/private/libldns_p.a +.endif +.endif + #.if ${MK_LIB32} =3D=3D no # to be filled in #.endif @@ -3701,8 +3714,28 @@ #.endif =20 .if ${MK_OPENSSH} =3D=3D no -OLD_FILES+=3Dusr.bin/ssh-copy-id +OLD_FILES+=3Dusr/bin/sftp +OLD_FILES+=3Dusr/bin/ssh +OLD_FILES+=3Dusr/bin/ssh-add +OLD_FILES+=3Dusr/bin/ssh-agent +OLD_FILES+=3Dusr/bin/ssh-copy-id +OLD_FILES+=3Dusr/bin/ssh-keygen +OLD_FILES+=3Dusr/bin/ssh-keyscan +OLD_FILES+=3Dusr/lib/private/libssh.a +OLD_FILES+=3Dusr/lib/private/libssh.so +OLD_LIBS+=3Dusr/lib/private/libssh.so.5 +OLD_FILES+=3Dusr/lib/private/libssh_p.a +.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" +OLD_FILES+=3Dusr/lib32/private/libssh.a +OLD_FILES+=3Dusr/lib32/private/libssh.so +OLD_LIBS+=3Dusr/lib32/private/libssh.so.5 +OLD_FILES+=3Dusr/lib32/private/libssh_p.a .endif +OLD_FILES+=3Dusr/libexec/sftp-server +OLD_FILES+=3Dusr/libexec/ssh-keysign +OLD_FILES+=3Dusr/libexec/ssh-pkcs11-helper +OLD_FILES+=3Dusr/sbin/sshd +.endif =20 #.if ${MK_OPENSSL} =3D=3D no # to be filled in @@ -3958,7 +3991,6 @@ OLD_FILES+=3Dusr/lib/libsbuf_p.a OLD_FILES+=3Dusr/lib/libsdp_p.a OLD_FILES+=3Dusr/lib/libsmb_p.a -OLD_FILES+=3Dusr/lib/libssh_p.a OLD_FILES+=3Dusr/lib/libssl_p.a OLD_FILES+=3Dusr/lib/libstdc++_p.a OLD_FILES+=3Dusr/lib/libsupc++_p.a @@ -3981,6 +4013,8 @@ OLD_FILES+=3Dusr/lib/liby_p.a OLD_FILES+=3Dusr/lib/libypclnt_p.a OLD_FILES+=3Dusr/lib/libz_p.a +OLD_FILES+=3Dusr/lib/private/libldns_p.a +OLD_FILES+=3Dusr/lib/private/libssh_p.a .endif =20 .if ${MK_RCMDS} =3D=3D no Does anyone care to comment? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no