move private ssh library to /usr/lib/priv
authorJohn Marino <draco@marino.st>
Thu, 28 Jan 2016 12:14:18 +0000 (13:14 +0100)
committerJohn Marino <draco@marino.st>
Thu, 28 Jan 2016 12:16:18 +0000 (13:16 +0100)
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 89420da..0d06a5b 100644 (file)
@@ -2280,6 +2280,9 @@ TO_REMOVE+=/usr/lib/profile/libssh.a
 TO_REMOVE+=/lib/libedit.so.5
 TO_REMOVE+=/usr/lib/libprivate_ldns.*
 TO_REMOVE+=/usr/lib/profile/libprivate_ldns.a
+TO_REMOVE+=/usr/lib/libprivate_ssh.*
+TO_REMOVE+=/usr/lib/profile/libprivate_ssh.a
+TO_REMOVE+=/usr/share/man/man5/moduli.5.gz
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 4953563..94cc9db 100644 (file)
@@ -10,5 +10,6 @@ DPADD=        ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 WARNS?=        4
 SSHDIR=                ${.CURDIR}/../../../crypto/openssh
 CFLAGS+=       -I${SSHDIR} -include ssh_namespace.h
+LDFLAGS+=      -rpath /usr/lib/priv
 
 .include <bsd.lib.mk>
index 42938f3..fcac077 100644 (file)
@@ -5,6 +5,7 @@ CFLAGS+=        -I${.CURDIR}/../../lib/libssh -I${SSHDIR} -include ssh_namespace.h
 .if ${.CURDIR:T} != "libssh"
 DPADD+=        ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBPTHREAD}
 LDADD+=        -lprivate_ssh -lcrypto -lutil -lz -lpthread
+LDFLAGS+=      -rpath /usr/lib/priv
 .endif
 
 .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
index 9cef850..0f6093d 100644 (file)
@@ -25,9 +25,10 @@ SRCS+=       bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c \
        getrrsetbyname.c glob.c openssl-compat.c \
        port-tun.c timingsafe_bcmp.c
 
-MAN=   moduli.5
-
 WARNS?=        2
 
+SHLIBDIR?=     /usr/lib/priv
+PROFLIBDIR?=   ${SHLIBDIR}/profile
+
 .include "../../Makefile.ssh.common"
 .include <bsd.lib.mk>
index 4b15e0c..22ec345 100644 (file)
@@ -64,6 +64,7 @@ CRUNCH_ALIAS_ssh= scp
 CRUNCH_KEEP_ssh= roaming_write roaming_read add_recv_bytes
 
 CRUNCH_LIBS+= -lprivate_ssh -lcrypto -lz -lpthread
+CRUNCH_LDFLAGS+=       -rpath /usr/lib/priv
 
 .include <bsd.crunchgen.mk>
 .include <bsd.prog.mk>
index 62a4c33..c6a92a7 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}/libprivate_ssh.a
+LIBSSH?=       ${DESTDIR}${LIBDIR}/priv/libprivate_ssh.a
 LIBSSL?=       ${DESTDIR}${LIBDIR}/libssl.a    # XXX in secure dist, not base
 LIBSTAND?=     ${DESTDIR}${LIBDIR}/libstand.a
 LIBTACPLUS?=   ${DESTDIR}${LIBDIR}/libtacplus.a