Module Name: src
Committed By: christos
Date: Sun Feb 4 03:19:53 UTC 2018
Modified Files:
src/crypto: Makefile.openssl
src/crypto/external/bsd: Makefile
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/libsaslc/lib: Makefile
src/crypto/external/bsd/netpgp/lib/netpgp: Makefile
src/crypto/external/bsd/netpgp/libpaa: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/crypto/external/cpl/trousers/lib/libtspi: Makefile
src/external/bsd/bind: Makefile.inc
src/external/bsd/fetch/lib: Makefile
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/libevent/lib/libevent_openssl: Makefile
src/external/bsd/nsd: Makefile.inc
src/external/bsd/openldap/lib/libldap: Makefile.libldap
src/external/bsd/unbound: Makefile.inc
src/lib: Makefile
src/lib/libpam/modules/pam_afslog: Makefile
src/lib/libpam/modules/pam_krb5: Makefile
src/lib/libpam/modules/pam_ksu: Makefile
src/lib/libpam/modules/pam_ssh: Makefile
src/lib/libradius: Makefile
src/share/mk: bsd.own.mk
Log Message:
switch everyone to openssl.old
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/Makefile.openssl
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/libsaslc/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/libpaa/Makefile
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/cpl/trousers/lib/libtspi/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/fetch/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libevent/lib/libevent_openssl/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/unbound/Makefile.inc
cvs rdiff -u -r1.253 -r1.254 src/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libpam/modules/pam_afslog/Makefile
cvs rdiff -u -r1.11 -r1.12 src/lib/libpam/modules/pam_krb5/Makefile
cvs rdiff -u -r1.11 -r1.12 src/lib/libpam/modules/pam_ksu/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libpam/modules/pam_ssh/Makefile
cvs rdiff -u -r1.12 -r1.13 src/lib/libradius/Makefile
cvs rdiff -u -r1.1030 -r1.1031 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/Makefile.openssl
diff -u src/crypto/Makefile.openssl:1.10 src/crypto/Makefile.openssl:1.11
--- src/crypto/Makefile.openssl:1.10 Wed Sep 23 00:02:28 2009
+++ src/crypto/Makefile.openssl Sat Feb 3 22:19:51 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.openssl,v 1.10 2009/09/23 04:02:28 tls Exp $
+# $NetBSD: Makefile.openssl,v 1.11 2018/02/04 03:19:51 christos Exp $
.ifndef _MAKEFILE_OPENSSL_INCLUDED
_MAKEFILE_OPENSSL_INCLUDED=1
.include <bsd.own.mk>
-OPENSSLSRC= ${CRYPTODIST}/external/bsd/openssl/dist
+OPENSSLSRC= ${CRYPTODIST}/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/dist
CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\"
CPPFLAGS+= -DENGINESDIR=\"/usr/lib/openssl\"
CPPFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H
Index: src/crypto/external/bsd/Makefile
diff -u src/crypto/external/bsd/Makefile:1.12 src/crypto/external/bsd/Makefile:1.13
--- src/crypto/external/bsd/Makefile:1.12 Tue Feb 12 15:31:14 2013
+++ src/crypto/external/bsd/Makefile Sat Feb 3 22:19:51 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/02/12 20:31:14 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/02/04 03:19:51 christos Exp $
.include <bsd.own.mk>
-SUBDIR+= openssl .WAIT heimdal netpgp .WAIT openssh libsaslc
+SUBDIR+= ${EXTERNAL_OPENSSL_SUBDDIR} .WAIT heimdal netpgp .WAIT openssh libsaslc
.include <bsd.subdir.mk>
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.3 src/crypto/external/bsd/heimdal/Makefile.inc:1.4
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.3 Tue Mar 4 16:08:08 2014
+++ src/crypto/external/bsd/heimdal/Makefile.inc Sat Feb 3 22:19:51 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/03/04 21:08:08 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/02/04 03:19:51 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
-SSLBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/openssl
+SSLBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
LIBVERSDIR!= cd ${HEIMBASE}/lib/libvers && ${PRINTOBJDIR}
LIBVERS= ${LIBVERSDIR}/libvers.a
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.5 Sat Jan 28 16:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Sat Feb 3 22:19:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/04 03:19:51 christos Exp $
NOLINT= # defined
@@ -9,7 +9,7 @@ NOLINT= # defined
LIB= hx509
-SSLBASE= ${NETBSDSRCDIR}/crypto/external/bsd/openssl
+SSLBASE= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
LIBDPLIBS+= asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.8 src/crypto/external/bsd/libsaslc/lib/Makefile:1.9
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.8 Wed Sep 11 19:04:09 2013
+++ src/crypto/external/bsd/libsaslc/lib/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -54,8 +54,8 @@ EXTDIST=${.CURDIR}/../dist
INCS+= saslc.h
INCSDIR=/usr/include
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
.if (${MKKERBEROS} != "no")
LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
.endif
Index: src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.2 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.3
--- src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.2 Thu Dec 4 23:52:02 2014
+++ src/crypto/external/bsd/netpgp/lib/netpgp/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/12/05 04:52:02 agc Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -20,7 +20,7 @@ EXTDIST=${.CURDIR}/../../dist
INCS+= netpgp.h
INCSDIR=/usr/include
-OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl
+OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
LIBDPLIBS+= mj ${.CURDIR}/../../libmj
LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
Index: src/crypto/external/bsd/netpgp/libpaa/Makefile
diff -u src/crypto/external/bsd/netpgp/libpaa/Makefile:1.2 src/crypto/external/bsd/netpgp/libpaa/Makefile:1.3
--- src/crypto/external/bsd/netpgp/libpaa/Makefile:1.2 Tue Jul 10 15:38:17 2012
+++ src/crypto/external/bsd/netpgp/libpaa/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@ CPPFLAGS+= -I${.CURDIR}/../dist/include
LIBDPLIBS+= mj ${.CURDIR}/../libmj
LIBDPLIBS+= netpgp ${.CURDIR}/../lib
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.23 src/crypto/external/bsd/openssh/lib/Makefile:1.24
--- src/crypto/external/bsd/openssh/lib/Makefile:1.23 Sat Oct 7 17:14:59 2017
+++ src/crypto/external/bsd/openssh/lib/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/10/07 21:14:59 christos Exp $
+# $NetBSD: Makefile,v 1.24 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -101,7 +101,7 @@ CPPFLAGS+= -DHAVE_BLF_H
CPPFLAGS+= -I${SSHDIST}
.PATH: ${SSHDIST}
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
crypt ${NETBSDSRCDIR}/lib/libcrypt \
z ${NETBSDSRCDIR}/lib/libz
Index: src/crypto/external/cpl/trousers/lib/libtspi/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.1 src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.2
--- src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.1 Fri Jan 27 21:15:26 2012
+++ src/crypto/external/cpl/trousers/lib/libtspi/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/04 03:19:52 christos Exp $
.include "../Makefile.inc"
CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
@@ -18,12 +18,12 @@ CPPFLAGS+=-DTSS_BUILD_NV -DTSS_BUILD_DEL
TSPI=${DIST}/src/tspi
TRSPI=${DIST}/src/trspi
-.PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/openssl
+.PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/${EXTERNAL_OPENSSL_SUBDIR}
SHLIB_MAJOR=3
SHLIB_MINOR=0
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
LIB=tspi
SRCS=\
hosttable.c \
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.27 src/external/bsd/bind/Makefile.inc:1.28
--- src/external/bsd/bind/Makefile.inc:1.27 Mon Sep 4 15:57:53 2017
+++ src/external/bsd/bind/Makefile.inc Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2017/09/04 19:57:53 snj Exp $
+# $NetBSD: Makefile.inc,v 1.28 2018/02/04 03:19:52 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -107,11 +107,7 @@ LIBDPLIBS+= $L ${NETBSDSRCDIR}/crypto/ex
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.else
-.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-.else
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
-.endif
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
.endif
.endif
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.10 src/external/bsd/fetch/lib/Makefile:1.11
--- src/external/bsd/fetch/lib/Makefile:1.10 Sun May 21 11:28:39 2017
+++ src/external/bsd/fetch/lib/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2018/02/04 03:19:52 christos Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -17,8 +17,8 @@ CPPFLAGS+= -DINET6
CPPFLAGS+= -DWITH_SSL
-LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl \
- crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl \
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
CLEANFILES+= ftperr.h httperr.h
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.7 src/external/bsd/libarchive/lib/libarchive/Makefile:1.8
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.7 Sun May 21 18:32:56 2017
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/05/21 22:32:56 kamil Exp $
+# $NetBSD: Makefile,v 1.8 2018/02/04 03:19:52 christos Exp $
.include <bsd.init.mk>
@@ -8,7 +8,7 @@ LIB= archive
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
- crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
z ${NETBSDSRCDIR}/lib/libz
Index: src/external/bsd/libevent/lib/libevent_openssl/Makefile
diff -u src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.2 src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.3
--- src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.2 Wed Sep 11 19:04:10 2013
+++ src/external/bsd/libevent/lib/libevent_openssl/Makefile Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ bufferevent_openssl.c
LIBDPLIBS+= \
event ${.CURDIR}/../libevent \
- crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
- ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
+ ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
.include <bsd.lib.mk>
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.2 src/external/bsd/nsd/Makefile.inc:1.3
--- src/external/bsd/nsd/Makefile.inc:1.2 Wed Jul 12 08:55:41 2017
+++ src/external/bsd/nsd/Makefile.inc Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2017/07/12 12:55:41 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/02/04 03:19:52 christos Exp $
.include <bsd.own.mk>
@@ -15,8 +15,8 @@ CPPFLAGS+= -DINET6
.endif
DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
-DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
-DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
+DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.8 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.9
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.8 Sun May 21 11:28:39 2017
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap Sat Feb 3 22:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libldap,v 1.8 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile.libldap,v 1.9 2018/02/04 03:19:52 christos Exp $
.include "../../openldap.mk"
@@ -23,5 +23,5 @@ CPPFLAGS+= -DLDAP_LIBRARY
LIBDPLIBS+= lber ${.CURDIR}/../liblber
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
Index: src/external/bsd/unbound/Makefile.inc
diff -u src/external/bsd/unbound/Makefile.inc:1.3 src/external/bsd/unbound/Makefile.inc:1.4
--- src/external/bsd/unbound/Makefile.inc:1.3 Tue Mar 14 17:11:12 2017
+++ src/external/bsd/unbound/Makefile.inc Sat Feb 3 22:19:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/03/14 21:11:12 roy Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/02/04 03:19:53 christos Exp $
USE_FORT?= yes # network client/server
UNBOUND:=${.PARSEDIR}/dist
@@ -7,8 +7,8 @@ UNBOUND:=${.PARSEDIR}/dist
CPPFLAGS += -D_OPENBSD_SOURCE
-DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
-DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
+DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.253 src/lib/Makefile:1.254
--- src/lib/Makefile:1.253 Tue Oct 10 15:28:33 2017
+++ src/lib/Makefile Sat Feb 3 22:19:53 2018
@@ -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 libpth
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")
Index: src/lib/libpam/modules/pam_afslog/Makefile
diff -u src/lib/libpam/modules/pam_afslog/Makefile:1.6 src/lib/libpam/modules/pam_afslog/Makefile:1.7
--- src/lib/libpam/modules/pam_afslog/Makefile:1.6 Fri Apr 15 14:05:45 2011
+++ src/lib/libpam/modules/pam_afslog/Makefile Sat Feb 3 22:19:53 2018
@@ -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"
Index: src/lib/libpam/modules/pam_krb5/Makefile
diff -u src/lib/libpam/modules/pam_krb5/Makefile:1.11 src/lib/libpam/modules/pam_krb5/Makefile:1.12
--- src/lib/libpam/modules/pam_krb5/Makefile:1.11 Thu May 26 08:56:30 2011
+++ src/lib/libpam/modules/pam_krb5/Makefile Sat Feb 3 22:19:53 2018
@@ -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
Index: src/lib/libpam/modules/pam_ksu/Makefile
diff -u src/lib/libpam/modules/pam_ksu/Makefile:1.11 src/lib/libpam/modules/pam_ksu/Makefile:1.12
--- src/lib/libpam/modules/pam_ksu/Makefile:1.11 Thu May 26 08:56:30 2011
+++ src/lib/libpam/modules/pam_ksu/Makefile Sat Feb 3 22:19:53 2018
@@ -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
Index: src/lib/libpam/modules/pam_ssh/Makefile
diff -u src/lib/libpam/modules/pam_ssh/Makefile:1.10 src/lib/libpam/modules/pam_ssh/Makefile:1.11
--- src/lib/libpam/modules/pam_ssh/Makefile:1.10 Mon Jul 20 14:01:41 2009
+++ src/lib/libpam/modules/pam_ssh/Makefile Sat Feb 3 22:19:53 2018
@@ -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"
Index: src/lib/libradius/Makefile
diff -u src/lib/libradius/Makefile:1.12 src/lib/libradius/Makefile:1.13
--- src/lib/libradius/Makefile:1.12 Sun May 21 11:28:41 2017
+++ src/lib/libradius/Makefile Sat Feb 3 22:19:53 2018
@@ -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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1030 src/share/mk/bsd.own.mk:1.1031
--- src/share/mk/bsd.own.mk:1.1030 Thu Feb 1 20:02:41 2018
+++ src/share/mk/bsd.own.mk Sat Feb 3 22:19:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1030 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1031 2018/02/04 03:19:53 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -91,6 +91,23 @@ EXTERNAL_GCC_SUBDIR=? /does/not/exist
MKGCCCMDS?= no
.endif
+#
+# What OpenSSL is used?
+#
+.if ${MACHINE} == "amd64"
+HAVE_OPENSSL?= 10
+.else
+HAVE_OPENSSL?= 10
+.endif
+
+.if ${HAVE_OPENSSL} == 11
+EXTERNAL_OPENSSL_SUBDIR=openssl
+.elif ${HAVE_OPENSSL} == 10
+EXTERNAL_OPENSSL_SUBDIR=openssl.old
+.else
+EXTERNAL_OPENSSL_SUBDIR=/does/not/exist
+.endif
+
.if !empty(MACHINE_ARCH:Mearm*)
_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
.endif
