privatize libssh (used by several secure applications)
authorJohn Marino <draco@marino.st>
Tue, 26 Jan 2016 22:35:47 +0000 (23:35 +0100)
committerJohn Marino <draco@marino.st>
Tue, 26 Jan 2016 22:40:17 +0000 (23:40 +0100)
Renames libssh.* to libprivate_ssh.*
The original libssh.* libraries are unavoidable removed by make upgrade.
While here, remove an obsolete libldns.a from the profiles directory as
this was forgotten in the previous commit.

Makefile_upgrade.inc
lib/pam_module/pam_ssh/Makefile
secure/Makefile.ssh.common
secure/lib/libssh/Makefile
share/initrd/bin/Makefile
share/mk/bsd.libnames.mk

index 5b8fc94..d0aa70d 100644 (file)
@@ -2272,6 +2272,9 @@ TO_REMOVE+=/usr/share/man/man6/piano.6.gz
 TO_REMOVE+=/usr/games/hide/hangman
 TO_REMOVE+=/usr/lib/kgzldr.o
 TO_REMOVE+=/usr/lib/libldns.*
+TO_REMOVE+=/usr/lib/libssh.*
+TO_REMOVE+=/usr/lib/profile/libldns.a
+TO_REMOVE+=/usr/lib/profile/libssh.a
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index e32f741..4953563 100644 (file)
@@ -4,7 +4,7 @@ LIB=    pam_ssh
 SRCS=  pam_ssh.c
 MAN=   pam_ssh.8
 
-LDADD= -lssh -lcrypto -lcrypt
+LDADD= -lprivate_ssh -lcrypto -lcrypt
 DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 
 WARNS?=        4
index 688a76c..42938f3 100644 (file)
@@ -4,7 +4,7 @@ CFLAGS+=        -I${.CURDIR}/../../lib/libssh -I${SSHDIR} -include ssh_namespace.h
 
 .if ${.CURDIR:T} != "libssh"
 DPADD+=        ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBPTHREAD}
-LDADD+=        -lssh -lcrypto -lutil -lz -lpthread
+LDADD+=        -lprivate_ssh -lcrypto -lutil -lz -lpthread
 .endif
 
 .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
index 6bd3188..9cef850 100644 (file)
@@ -1,4 +1,4 @@
-LIB=   ssh
+LIB=   private_ssh
 SHLIB_MAJOR= 4
 SRCS=  ssherr.c \
        sshbuf.c \
index 19f77d9..db79ef0 100644 (file)
@@ -63,7 +63,7 @@ CRUNCH_ALIAS_ssh= scp
 
 CRUNCH_KEEP_ssh= roaming_write roaming_read add_recv_bytes
 
-CRUNCH_LIBS+= -lssh -lcrypto -lz -lpthread
+CRUNCH_LIBS+= -lprivate_ssh -lcrypto -lz -lpthread
 
 .include <bsd.crunchgen.mk>
 .include <bsd.prog.mk>
index f74e10d..020253f 100644 (file)
@@ -83,7 +83,7 @@ LIBRT?=               ${DESTDIR}${LIBDIR}/librt.a
 LIBSBUF?=      ${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=       ${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=       ${DESTDIR}${LIBDIR}/libsmb.a
-LIBSSH?=       ${DESTDIR}${LIBDIR}/libssh.a    # XXX in secure dist, not base
+LIBSSH?=       ${DESTDIR}${LIBDIR}/libprivate_ssh.a
 LIBSSL?=       ${DESTDIR}${LIBDIR}/libssl.a    # XXX in secure dist, not base
 LIBSTAND?=     ${DESTDIR}${LIBDIR}/libstand.a
 LIBTACPLUS?=   ${DESTDIR}${LIBDIR}/libtacplus.a