diff options
author | des <des@FreeBSD.org> | 2013-09-08 10:04:26 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2013-09-08 10:04:26 +0000 |
commit | aba57138f98f1a98e4b7c7c61511daefb0542524 (patch) | |
tree | f2835476e45d4ca44151693a34601050c9a00415 | |
parent | 89699e113faea33b4d774b5e403372f58d276c5b (diff) | |
download | FreeBSD-src-aba57138f98f1a98e4b7c7c61511daefb0542524.zip FreeBSD-src-aba57138f98f1a98e4b7c7c61511daefb0542524.tar.gz |
Make libldns and libssh private.
Approved by: re (blanket)
-rw-r--r-- | ObsoleteFiles.inc | 3 | ||||
-rw-r--r-- | lib/libldns/Makefile | 2 | ||||
-rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 1 | ||||
-rw-r--r-- | secure/lib/libssh/Makefile | 1 | ||||
-rw-r--r-- | secure/libexec/sftp-server/Makefile | 1 | ||||
-rw-r--r-- | secure/libexec/ssh-keysign/Makefile | 1 | ||||
-rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/scp/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/sftp/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 1 | ||||
-rw-r--r-- | share/mk/bsd.libnames.mk | 4 |
16 files changed, 19 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 30ec49b..e53fa87 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 diff --git a/lib/libldns/Makefile b/lib/libldns/Makefile index a46c3ab..0fb570b 100644 --- a/lib/libldns/Makefile +++ b/lib/libldns/Makefile @@ -6,7 +6,7 @@ LDNSDIR = ${.CURDIR}/../../contrib/ldns .PATH: ${LDNSDIR} ${LDNSDIR}/compat LIB= ldns -INTERNALLIB= true +PRIVATELIB= true CFLAGS+= -I${LDNSDIR} diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index d00652a..886610a 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -15,6 +15,7 @@ CFLAGS+= -I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} LDADD= -lssh -lcrypto -lcrypt +USEPRIVATELIB= ssh .include <bsd.lib.mk> diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 1daf972..3d30a18 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -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 \ diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 7069cff..3755c98 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -10,6 +10,7 @@ SRCS+= roaming_dummy.c DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index c5fc688..66528e3 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -8,6 +8,7 @@ BINMODE=4555 DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index f575a08..ec57a61 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -8,6 +8,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 8a558c7..fe248ab 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index dce0104..8164dac 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -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> diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 0cbcbcb..cb14ce6 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index a93a1c6..29620d1 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 0c25033..48e486e 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 8d3f6c6..cc82d07 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -6,6 +6,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz +USEPRIVATELIB= ssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 0bee10c..a5e5808 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -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 diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 3fb0708..bb37ae4 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -27,6 +27,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h 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 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index accda1c..3de4333 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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_db.a 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 |