d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make libldns and libssh private.

Browse Source 
Approved by:	re (blanket)
This commit is contained in:
Dag-Erling Smørgrav 2013-09-08 10:04:26 +00:00
parent 773eec475a
commit 0b2766bd4e
16 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ObsoleteFiles.inc
View File

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

2
lib/libldns/Makefile
View File

@ -6,7 +6,7 @@ LDNSDIR = ${.CURDIR}/../../contrib/ldns
.PATH: ${LDNSDIR} ${LDNSDIR}/compat
LIB= ldns
INTERNALLIB= true
PRIVATELIB= true
CFLAGS+= -I${LDNSDIR}

1
lib/libpam/modules/pam_ssh/Makefile
View File

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

1
secure/lib/libssh/Makefile
View File

@ -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 \

1
secure/libexec/sftp-server/Makefile
View File

@ -10,6 +10,7 @@ SRCS+= roaming_dummy.c
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/libexec/ssh-keysign/Makefile
View File

@ -8,6 +8,7 @@ BINMODE=4555
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/libexec/ssh-pkcs11-helper/Makefile
View File

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

1
secure/usr.bin/scp/Makefile
View File

@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/usr.bin/sftp/Makefile
View File

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

1
secure/usr.bin/ssh-add/Makefile
View File

@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/usr.bin/ssh-agent/Makefile
View File

@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/usr.bin/ssh-keygen/Makefile
View File

@ -9,6 +9,7 @@ SRCS+= roaming_dummy.c
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
USEPRIVATELIB= ssh
.include <bsd.prog.mk>

1
secure/usr.bin/ssh-keyscan/Makefile
View File

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

1
secure/usr.bin/ssh/Makefile
View File

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

1
secure/usr.sbin/sshd/Makefile
View File

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

4
share/mk/bsd.libnames.mk
View File

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