From: John Marino <draco@marino.st>
Date: Thu, 28 Jan 2016 12:14:18 +0000 (+0100)
Subject: move private ssh library to /usr/lib/priv
X-Git-Tag: v4.6.0rc~922
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7d5cd361d1b424b6424edcb7cda2e8fb8c8a0eec

move private ssh library to /usr/lib/priv
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 89420da7fe..0d06a5be03 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -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
diff --git a/lib/pam_module/pam_ssh/Makefile b/lib/pam_module/pam_ssh/Makefile
index 495356307a..94cc9dba76 100644
--- a/lib/pam_module/pam_ssh/Makefile
+++ b/lib/pam_module/pam_ssh/Makefile
@@ -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>
diff --git a/secure/Makefile.ssh.common b/secure/Makefile.ssh.common
index 42938f3633..fcac077b68 100644
--- a/secure/Makefile.ssh.common
+++ b/secure/Makefile.ssh.common
@@ -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
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 9cef85007c..0f6093db62 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -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>
diff --git a/share/initrd/bin/Makefile b/share/initrd/bin/Makefile
index 4b15e0c662..22ec3450c1 100644
--- a/share/initrd/bin/Makefile
+++ b/share/initrd/bin/Makefile
@@ -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>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 62a4c33d1a..c6a92a7727 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -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