From f3dba867733382699f946d80045e80e1f145d7b4 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 20 May 2015 18:56:29 +0000
Subject: [PATCH] Make kerberos use the same sqlite libraries as other sqlite
 consumer.

This reduces the number of copy of sqlite we have to just one and easier
tracking version of sqlite

Differential Revision:	https://reviews.freebsd.org/D2443
Reviewed by:	imp, stas, bjk
---
 Makefile.inc1                        |  8 ++++----
 ObsoleteFiles.inc                    |  9 +++++++++
 kerberos5/lib/Makefile               |  2 +-
 kerberos5/lib/libhdb/Makefile        |  4 ++--
 kerberos5/lib/libheimsqlite/Makefile | 10 ----------
 5 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 kerberos5/lib/libheimsqlite/Makefile

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4d43cce14e6..1bbe6a87e69 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1679,7 +1679,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
-		${_kerberos5_lib_libheimsqlite} \
+		${_libsqlite3} \
 		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
@@ -1803,7 +1803,7 @@ _secure_lib=	secure/lib
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
-    kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L 
+    kerberos5/lib/libwind__L lib/libsqlite3__L
 kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
@@ -1816,7 +1816,7 @@ kerberos5/lib/libroken__L: lib/libcrypt__L
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
-kerberos5/lib/libheimsqlite__L: lib/libthr__L
+lib/libsqlite3__L: lib/libthr__L
 .endif
 
 .if ${MK_GSSAPI} != "no"
@@ -1832,7 +1832,7 @@ _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
+_libsqlite3= lib/libsqlite3
 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
 _kerberos5_lib_libwind= kerberos5/lib/libwind
 _libcom_err= lib/libcom_err
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 192cdbc4cde..f55311db810 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,15 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150520
+OLD_FILES+=usr/lib/libheimsqlite.a
+OLD_FILES+=usr/lib/libheimsqlite.so
+OLD_LIBS+=usr/lib/libheimsqlite.so.11
+OLD_FILES+=usr/lib/libheimsqlite_p.a
+OLD_FILES+=usr/lib32/libheimsqlite.a
+OLD_FILES+=usr/lib32/libheimsqlite.so
+OLD_LIBS+=usr/lib32/libheimsqlite.so.11
+OLD_FILES+=usr/lib32/libheimsqlite_p.a
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index d88bb5b1bd7..dddb4d2dc1a 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -3,7 +3,7 @@
 
 SUBDIR=	libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
 	libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
-	libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs
+	libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs
 
 SUBDIR+= libkafs5  # requires krb_err.h from libkrb5
 
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 2b178b2445f..7781e630b78 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -3,7 +3,7 @@
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
-LIBADD=	asn1 com_err krb5 roken heimsqlite
+LIBADD=	asn1 com_err krb5 roken sqlite3
 DPADD=	${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3
@@ -56,7 +56,7 @@ SRCS=	common.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \
+	-I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \
 	-I${KRB5DIR}/lib/krb5 \
 	-I. ${LDAPCFLAGS}
 CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
diff --git a/kerberos5/lib/libheimsqlite/Makefile b/kerberos5/lib/libheimsqlite/Makefile
deleted file mode 100644
index 8cad7e7202a..00000000000
--- a/kerberos5/lib/libheimsqlite/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-LIB=	heimsqlite
-SRCS=	sqlite3.c
-LIBADD=	pthread
-CFLAGS+=-I${KRB5DIR}/lib/sqlite
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/sqlite