diff options
| author | christos <christos@NetBSD.org> | 2018-02-04 03:19:51 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2018-02-04 03:19:51 +0000 |
| commit | 14b24e3c86cc72427207ed5bb98b2f2f86189197 (patch) | |
| tree | 249cfd1e7090fec305903c20b9f12d188915f4c2 /lib | |
| parent | b1e732dbab1767e6dd2e7bc8d50e06ef7327b5f6 (diff) | |
switch everyone to openssl.old
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_afslog/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_krb5/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ksu/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 4 | ||||
| -rw-r--r-- | lib/libradius/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/lib/Makefile b/lib/Makefile index 985cae96c97..0ab68b5c3ad 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.253 2017/10/10 19:28:33 christos Exp $ +# $NetBSD: Makefile,v 1.254 2018/02/04 03:19:53 christos Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include <bsd.own.mk> @@ -133,7 +133,7 @@ SUBDIR+= librumpuser # depends on libpthread SUBDIR+= libnpf # depends on libprop .endif -SUBDIR+= ../crypto/external/bsd/openssl/lib # depends on libcrypt +SUBDIR+= ../crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib # depends on libcrypt SUBDIR+= ../external/bsd/file/lib # depends on libz .if (${MKISCSI} != "no") diff --git a/lib/libpam/modules/pam_afslog/Makefile b/lib/libpam/modules/pam_afslog/Makefile index 01a63f8c5e2..fa693821e40 100644 --- a/lib/libpam/modules/pam_afslog/Makefile +++ b/lib/libpam/modules/pam_afslog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/04/15 18:05:45 elric Exp $ +# $NetBSD: Makefile,v 1.7 2018/02/04 03:19:53 christos Exp $ LIB= pam_afslog SRCS= pam_afslog.c @@ -11,6 +11,6 @@ LIBDPLIBS+= \ roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \ com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \ crypt ${.CURDIR}/../../../libcrypt \ - crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto + crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto .include "${.CURDIR}/../mod.mk" diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index b933e0d72fd..1aace93cf11 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2011/05/26 12:56:30 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2018/02/04 03:19:53 christos Exp $ # Copyright 2001 FreeBSD, Inc. # All rights reserved. # @@ -35,7 +35,7 @@ LIBDPLIBS+= \ roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \ com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \ crypt ${.CURDIR}/../../../libcrypt \ - crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto + crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto CWARNFLAGS.clang= -Wno-format-security diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index 7e025267fc6..eacb4b5515f 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2011/05/26 12:56:30 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2018/02/04 03:19:53 christos Exp $ # Copyright 2002 FreeBSD, Inc. # All rights reserved. # @@ -35,7 +35,7 @@ LIBDPLIBS+= \ roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \ com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \ crypt ${.CURDIR}/../../../libcrypt \ - crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto + crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto CWARNFLAGS.clang= -Wno-format-security diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 1dc5814b445..9ca4eea7980 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/07/20 18:01:41 christos Exp $ +# $NetBSD: Makefile,v 1.11 2018/02/04 03:19:53 christos Exp $ # PAM module for SSH # $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $ @@ -18,6 +18,6 @@ CPPFLAGS+= -I${SSHSRC} LIBDPLIBS+= ssh ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib \ crypt ${.CURDIR}/../../../libcrypt \ - crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto + crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto .include "${.CURDIR}/../mod.mk" diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 9fb74b05428..75cf8140783 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/05/21 15:28:41 riastradh Exp $ +# $NetBSD: Makefile,v 1.13 2018/02/04 03:19:53 christos Exp $ USE_FORT?= yes # network protocol library @@ -12,7 +12,7 @@ LIB= radius CPPFLAGS+= -I. CPPFLAGS+= -DWITH_SSL -LIBDPLIBS+=crypto ${.CURDIR}/../../crypto/external/bsd/openssl/lib/libcrypto +LIBDPLIBS+=crypto ${.CURDIR}/../../crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto SRCS= radlib.c INCS= radlib.h radlib_vs.h |
