Module Name: src
Committed By: christos
Date: Mon May 8 22:17:37 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
handle OpenSSL-3 deprecations
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/heimdal/lib/libkrb5/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.5 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5 Tue Jul 10 09:17:36 2018
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/07/10 13:17:36 martin Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/08 22:17:36 christos Exp $
USE_FORT?= yes # network protocol library
@@ -276,5 +276,13 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
+COPTS.krb5__get_mic.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__wrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__unwrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__verify_mic.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__accept_sec_context.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__crypto.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__init_sec_context.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3 Fri Jul 6 04:31:43 2018
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/06 08:31:43 martin Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:36 christos Exp $
USE_FORT?= yes # cryptographic software
@@ -24,5 +24,7 @@ INCS= heimntlm.h heimntlm-protos.h ${CO
INCSDIR= /usr/include/krb5
+COPTS.ntlm.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7 Sun Jun 20 06:38:54 2021
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/06/20 10:38:54 christos Exp $
+# $NetBSD: Makefile,v 1.8 2023/05/08 22:17:36 christos Exp $
NOLINT= # defined
@@ -85,5 +85,10 @@ ASN1_FILES.ocsp.asn1 = \
asn1_id_pkix_ocsp_basic.x \
asn1_id_pkix_ocsp_nonce.x
+COPTS.cert.c += -Wno-error=deprecated-declarations
+COPTS.crypto-ec.c += -Wno-error=deprecated-declarations
+COPTS.crypto.c += -Wno-error=deprecated-declarations
+COPTS.ks_p11.c += -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3 Sat Jan 28 16:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkafs/Makefile Mon May 8 18:17:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:37 christos Exp $
USE_FORT?= yes # network protocol library
@@ -21,5 +21,7 @@ INCS= kafs.h
INCSDIR= /usr/include/krb5
MAN= kafs.3
+COPTS.rxkad_kdf.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4 Fri Jul 6 04:54:30 2018
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Mon May 8 18:17:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/06 08:54:30 martin Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/08 22:17:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -38,6 +38,10 @@ INCS= kdc-protos.h kdc.h
CPPFLAGS+= -I${HEIMDIST}/lib/krb5
+COPTS.kx509.c+= -Wno-error=deprecated-declarations
+COPTS.pkinit-ec.c+= -Wno-error=deprecated-declarations
+COPTS.pkinit.c+= -Wno-error=deprecated-declarations
+
# Prevent collision with old MIT Kerberos includes -- require manual
# intervention of the operator.
.BEGIN:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.12
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11 Sun Jan 29 10:42:58 2017
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Mon May 8 18:17:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/01/29 15:42:58 christos Exp $
+# $NetBSD: Makefile,v 1.12 2023/05/08 22:17:37 christos Exp $
USE_FORT?= yes # network protocol library
@@ -550,6 +550,14 @@ vars.texi: vars.tin
CLEANFILES+= vars.texi
+COPTS.crypto-des.c+= -Wno-error=deprecated-declarations
+COPTS.crypto-des3.c+= -Wno-error=deprecated-declarations
+COPTS.pkinit.c+= -Wno-error=deprecated-declarations
+COPTS.pkinit-ec.c+= -Wno-error=deprecated-declarations
+COPTS.salt-des.c+= -Wno-error=deprecated-declarations
+COPTS.salt-des3.c+= -Wno-error=deprecated-declarations
+COPTS.sp800-108-kdf.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
.include <bsd.info.mk>
