Module Name: src
Committed By: riastradh
Date: Wed Oct 11 12:34:42 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/include: config.h
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
heimdal: Disable sqlite3 credential cache (SCC).
SCC is not usable in Heimdal 7.8.0, and this brings a dependency on
libsqlite3 into libkrb5 and therefore libgssapi, which is problematic
downstream applications that have sqlite3 from pkgsrc or statically
built in.
SCC will undergo substantial revision in the next Heimdal version
(https://github.com/heimdal/heimdal/pull/1143). We can revisit later
how to deal with this -- perhaps by symbol-renaming a copy of sqlite3
in Heimdal as it looks like upstream intends to do.
PR lib/57406
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.8 Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/10/11 12:34:42 riastradh Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -22,8 +22,8 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok
DPLIBSL= sl ${HEIMBASE}/lib/libsl
DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
-KRB5LDADD= -lsqlite3 -lcrypto -lcrypt -lm
-KRB5DPADD= ${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
+KRB5LDADD= -lcrypto -lcrypt -lm
+KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.11 src/crypto/external/bsd/heimdal/include/config.h:1.12
--- src/crypto/external/bsd/heimdal/include/config.h:1.11 Mon Jun 19 21:41:45 2023
+++ src/crypto/external/bsd/heimdal/include/config.h Wed Oct 11 12:34:42 2023
@@ -754,7 +754,7 @@ static /**/const char *const rcsid[] = {
#define HAVE_SA_FAMILY_T 1
/* Define if you want support for cache in sqlite. */
-#define HAVE_SCC 1
+/* #undef HAVE_SCC */
/* Define to 1 if you have the <search.h> header file. */
#define HAVE_SEARCH_H 1
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5 Mon Jun 19 23:56:55 2023
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/11 12:34:42 riastradh Exp $
USE_FORT?= yes # network protocol library
@@ -18,7 +18,8 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
- heimbase ${HEIMBASE}/lib/libheimbase
+ heimbase ${HEIMBASE}/lib/libheimbase \
+ sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib
HEIMSRCS= hdb_err.et hdb.asn1
ASN1_OPTS.hdb.asn1+= --one-code-file --sequence=HDB-Ext-KeySet --sequence=Keys
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.16
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15 Tue Jun 20 17:23:02 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.16 2023/10/11 12:34:42 riastradh Exp $
USE_FORT?= yes # network protocol library
@@ -23,7 +23,6 @@ LIBDPLIBS+= \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase \
- sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib \
crypt ${NETBSDSRCDIR}/lib/libcrypt
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
