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...

Dag-Erling Smørgrav des at FreeBSD.org
Sun Sep 8 10:04:30 UTC 2013


Author: des
Date: Sun Sep  8 10:04:26 2013
New Revision: 255386
URL: http://svnweb.freebsd.org/changeset/base/255386

Log:
  Make libldns and libssh private.
  
  Approved by:	re (blanket)

Modified:
  head/ObsoleteFiles.inc
  head/lib/libldns/Makefile
  head/lib/libpam/modules/pam_ssh/Makefile
  head/secure/lib/libssh/Makefile
  head/secure/libexec/sftp-server/Makefile
  head/secure/libexec/ssh-keysign/Makefile
  head/secure/libexec/ssh-pkcs11-helper/Makefile
  head/secure/usr.bin/scp/Makefile
  head/secure/usr.bin/sftp/Makefile
  head/secure/usr.bin/ssh-add/Makefile
  head/secure/usr.bin/ssh-agent/Makefile
  head/secure/usr.bin/ssh-keygen/Makefile
  head/secure/usr.bin/ssh-keyscan/Makefile
  head/secure/usr.bin/ssh/Makefile
  head/secure/usr.sbin/sshd/Makefile
  head/share/mk/bsd.libnames.mk

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

Modified: head/lib/libldns/Makefile
==============================================================================
--- head/lib/libldns/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/lib/libldns/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -6,7 +6,7 @@ LDNSDIR = ${.CURDIR}/../../contrib/ldns
 .PATH: ${LDNSDIR} ${LDNSDIR}/compat
 
 LIB=	ldns
-INTERNALLIB= true
+PRIVATELIB= true
 
 CFLAGS+= -I${LDNSDIR}
 

Modified: head/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_ssh/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/lib/libpam/modules/pam_ssh/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -15,6 +15,7 @@ CFLAGS+= -I${SSHDIR} -include ssh_namesp
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 LDADD=	-lssh -lcrypto -lcrypt
+USEPRIVATELIB= ssh
 
 .include <bsd.lib.mk>
 

Modified: head/secure/lib/libssh/Makefile
==============================================================================
--- head/secure/lib/libssh/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/lib/libssh/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -3,6 +3,7 @@
 .include <bsd.own.mk>
 
 LIB=	ssh
+PRIVATELIB=	true
 SHLIB_MAJOR=	5
 SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	canohost.c channels.c cipher.c cipher-aes.c \

Modified: head/secure/libexec/sftp-server/Makefile
==============================================================================
--- head/secure/libexec/sftp-server/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/libexec/sftp-server/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -10,6 +10,7 @@ SRCS+=	roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=  -lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/libexec/ssh-keysign/Makefile
==============================================================================
--- head/secure/libexec/ssh-keysign/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/libexec/ssh-keysign/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -8,6 +8,7 @@ BINMODE=4555
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/libexec/ssh-pkcs11-helper/Makefile
==============================================================================
--- head/secure/libexec/ssh-pkcs11-helper/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/libexec/ssh-pkcs11-helper/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -8,6 +8,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/scp/Makefile
==============================================================================
--- head/secure/usr.bin/scp/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/scp/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -9,6 +9,7 @@ SRCS+=	roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/sftp/Makefile
==============================================================================
--- head/secure/usr.bin/sftp/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/sftp/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -9,6 +9,7 @@ SRCS+=	roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} ${LIBNCURSES}
 LDADD=	-lssh -lcrypt -lcrypto -lz -ledit -lncurses
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/ssh-add/Makefile
==============================================================================
--- head/secure/usr.bin/ssh-add/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/ssh-add/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -9,6 +9,7 @@ SRCS+=	roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/ssh-agent/Makefile
==============================================================================
--- head/secure/usr.bin/ssh-agent/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/ssh-agent/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -9,6 +9,7 @@ SRCS+=	roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/ssh-keygen/Makefile
==============================================================================
--- head/secure/usr.bin/ssh-keygen/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/ssh-keygen/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -9,6 +9,7 @@ SRCS+=  roaming_dummy.c
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/ssh-keyscan/Makefile
==============================================================================
--- head/secure/usr.bin/ssh-keyscan/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/ssh-keyscan/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -6,6 +6,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz
+USEPRIVATELIB= ssh
 
 .include <bsd.prog.mk>
 

Modified: head/secure/usr.bin/ssh/Makefile
==============================================================================
--- head/secure/usr.bin/ssh/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.bin/ssh/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -18,6 +18,7 @@ SRCS+=	gss-genr.c
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
 LDADD=	-lssh -lutil -lz
+USEPRIVATELIB= ssh
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL

Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/secure/usr.sbin/sshd/Makefile	Sun Sep  8 10:04:26 2013	(r255386)
@@ -27,6 +27,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
 LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
+USEPRIVATELIB= ssh
 
 .if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Sun Sep  8 09:46:22 2013	(r255385)
+++ head/share/mk/bsd.libnames.mk	Sun Sep  8 10:04:26 2013	(r255386)
@@ -88,7 +88,7 @@ LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 .if ${MK_LDNS} != "no"
-LIBLDNS?=	${DESTDIR}${LIBDIR}/libldns.a
+LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
 .endif
 LIBLN?=		"don't use LIBLN, use LIBL"
 .if ${MK_BIND} != "no"
@@ -151,7 +151,7 @@ LIBRTLD_DB?=	${DESTDIR}${LIBDIR}/librtld
 LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
-LIBSSH?=	${DESTDIR}${LIBDIR}/libssh.a
+LIBSSH?=	${DESTDIR}${LIBPRIVATEDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a


More information about the svn-src-all mailing list