Module Name:    src
Committed By:   sborrill
Date:           Mon Jul 16 13:32:27 UTC 2018

Modified Files:
        src/crypto/external/bsd/heimdal/lib/libgssapi [netbsd-8]: Makefile
        src/crypto/external/bsd/heimdal/lib/libheimntlm [netbsd-8]: Makefile
        src/crypto/external/bsd/heimdal/lib/libkadm5srv [netbsd-8]: Makefile
        src/crypto/external/bsd/heimdal/lib/libkdc [netbsd-8]: Makefile

Log Message:
Pull up the following revisions(s) (requested by martin in ticket #924):
        crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:   revision 1.3
        crypto/external/bsd/heimdal/lib/libkdc/Makefile:        revision 1.4
        crypto/external/bsd/heimdal/lib/libgssapi/Makefile:     revision 1.5
        crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:   revision 1.5

Improve MKREPRO builds for architectures with compat (like amd64).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 \
    src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.2 -r1.2.18.1 \
    src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.4 -r1.4.4.1 \
    src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.3 -r1.3.4.1 \
    src/crypto/external/bsd/heimdal/lib/libkdc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4.16.1
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4	Thu Apr 24 13:50:53 2014
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile	Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.4.16.1 2018/07/16 13:32:27 sborrill Exp $
 
 USE_FORT?= yes        # network protocol library
 
@@ -17,6 +17,7 @@ LIBDPLIBS+=	krb5		${HEIMBASE}/lib/libkrb
 		asn1		${HEIMBASE}/lib/libasn1		\
 		com_err		${HEIMBASE}/lib/libcom_err	\
 		roken		${HEIMBASE}/lib/libroken	\
+		heimbase	${HEIMBASE}/lib/libheimbase	\
 		heimntlm	${HEIMBASE}/lib/libheimntlm	\
 		crypto		${SSLBASE}/lib/libcrypto
 

Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2.18.1
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2	Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile	Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.2.18.1 2018/07/16 13:32:27 sborrill Exp $
 
 USE_FORT?= yes	# cryptographic software
 
@@ -15,7 +15,8 @@ LIBDPLIBS+=	asn1	${.CURDIR}/../libasn1 \
 		com_err	${.CURDIR}/../libcom_err \
 		crypto	${SSLBASE}/lib/libcrypto \
 		krb5	${.CURDIR}/../libkrb5 \
-		roken	${.CURDIR}/../libroken
+		roken	${.CURDIR}/../libroken \
+		wind	${.CURDIR}/../libwind
 
 HEIMSRCS= ntlm_err.et ntlm.c
 

Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4.4.1
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4	Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile	Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2018/07/16 13:32:27 sborrill Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -15,7 +15,8 @@ CPPFLAGS+=	-I${HEIMDIST}/lib/krb5
 LIBDPLIBS+=	krb5	${.CURDIR}/../libkrb5 \
 		com_err	${.CURDIR}/../libcom_err \
 		hdb	${.CURDIR}/../libhdb \
-		roken	${.CURDIR}/../libroken
+		roken	${.CURDIR}/../libroken	\
+		heimbase	${.CURDIR}/../libheimbase
 
 HEIMSRCS= kadm5_err.et
 

Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3.4.1
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3	Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile	Mon Jul 16 13:32:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2018/07/16 13:32:27 sborrill Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -15,6 +15,7 @@ LIBDPLIBS+=	krb5		${.CURDIR}/../libkrb5	
 		hdb		${.CURDIR}/../libhdb		\
 		hx509		${.CURDIR}/../libhx509		\
 		asn1		${.CURDIR}/../libasn1		\
+		heimbase	${.CURDIR}/../libheimbase	\
 		heimntlm	${.CURDIR}/../libheimntlm	\
 		roken		${.CURDIR}/../libroken
 

Reply via email to