From e1e6cc6a479353a93a3672e2c620b649457b518c Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 27 Oct 2016 23:13:53 -0700
Subject: [PATCH] build - Fix pam issues, fix 'su', fix libopie.

* libopie needs to link against our private libcrypto.  Not doing so
  broke the pam opie module, 'su', and numerous related programs.
---
 Makefile.inc1        | 11 +++++++++--
 lib/libopie/Makefile |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index bd215b5ecd..647c3c5e87 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1034,7 +1034,7 @@ _prebuild_libs+=	lib/libpcap
 _generic_libs=	gnu/lib
 
 _prebuild_libs+= lib/libcrypt lib/libmd \
-		lib/libncurses/libncurses lib/libopie
+		lib/libncurses/libncurses
 
 lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L
 
@@ -1048,9 +1048,12 @@ _prebuild_libs+=	lib/libcrypto lib/libssl
 _prebuild_libs+=	lib/librecrypto lib/libressl
 _prebuild_libs+=	lib/libssh
 lib/libssh__L: lib/librecrypto__L lib/libz__L
+lib/libopie__L: lib/librecrypto__L
 .endif
 .endif
 
+_prebuild_libs+= lib/libopie
+
 _prebuild_libs+= lib/libradius lib/libsbuf lib/libtacplus lib/libm \
 		lib/libpam lib/libypclnt lib/lib${THREAD_LIB} \
 		lib/libpthread lib/liblzma lib/libprop lib/libdevattr
@@ -1063,9 +1066,13 @@ ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	${ECHODIR} "===> ${_lib}"; \
 		cd ${.CURDIR}/${_lib}; \
+		echo "STEP DEP ${_lib}"; \
 		make DIRPRFX=${_lib}/ depend; \
+		echo "STEP ALL ${_lib}"; \
 		make DIRPRFX=${_lib}/ all; \
-		make DIRPRFX=${_lib}/ install
+		echo "STEP INSTALL ${_lib}"; \
+		make DIRPRFX=${_lib}/ install; \
+		echo "STEP DONE ${_lib}";
 .endif
 .endfor
 
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 4a4bbc36f0..dc02f06e35 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -29,9 +29,9 @@ CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \
 ACCESSFILE?=	\"/etc/opieaccess\"
 CFLAGS+=	-DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE}
 
-LDADD+=	-lmd
-DPADD+=	${LIBMD}
-#LDFLAGS+=  -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv
+LDADD+=	-lmd -lprivate_crypto
+DPADD+=	${LIBMD} ${LIBRECRYPTO}
+LDFLAGS+=  -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv
 
 MAN=	${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5
 
-- 
2.41.0