Date: Fri, 8 Sep 2017 21:47:05 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323334 - in projects/krb5: . etc/mtree kerberos5 kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb ker... Message-ID: <201709082147.v88Ll5U5047153@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Sep 8 21:47:05 2017 New Revision: 323334 URL: https://svnweb.freebsd.org/changeset/base/323334 Log: Change Heimdal libraries and includes to private. This is the first step to selectable Heimdal/MIT in base. One of the things this commit will allow us to test is how well making heimdal in base private affects ports, especially ports that depend on the heimdal or krb5 ports. This will need to be tested through an exp run at some point. Modified: projects/krb5/ObsoleteFiles.inc projects/krb5/etc/mtree/BSD.usr.dist projects/krb5/kerberos5/Makefile.inc projects/krb5/kerberos5/lib/libasn1/Makefile projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile projects/krb5/kerberos5/lib/libhdb/Makefile projects/krb5/kerberos5/lib/libheimbase/Makefile projects/krb5/kerberos5/lib/libheimipcc/Makefile projects/krb5/kerberos5/lib/libheimipcs/Makefile projects/krb5/kerberos5/lib/libheimntlm/Makefile projects/krb5/kerberos5/lib/libhx509/Makefile projects/krb5/kerberos5/lib/libkadm5clnt/Makefile projects/krb5/kerberos5/lib/libkadm5srv/Makefile projects/krb5/kerberos5/lib/libkafs5/Makefile projects/krb5/kerberos5/lib/libkdc/Makefile projects/krb5/kerberos5/lib/libkrb5/Makefile projects/krb5/kerberos5/lib/libroken/Makefile projects/krb5/kerberos5/lib/libsl/Makefile projects/krb5/kerberos5/lib/libwind/Makefile projects/krb5/kerberos5/libexec/digest-service/Makefile projects/krb5/kerberos5/libexec/hprop/Makefile projects/krb5/kerberos5/libexec/hpropd/Makefile projects/krb5/kerberos5/libexec/ipropd-master/Makefile projects/krb5/kerberos5/libexec/ipropd-slave/Makefile projects/krb5/kerberos5/libexec/kadmind/Makefile projects/krb5/kerberos5/libexec/kcm/Makefile projects/krb5/kerberos5/libexec/kdc/Makefile projects/krb5/kerberos5/libexec/kdigest/Makefile projects/krb5/kerberos5/libexec/kfd/Makefile projects/krb5/kerberos5/libexec/kimpersonate/Makefile projects/krb5/kerberos5/libexec/kpasswdd/Makefile projects/krb5/kerberos5/tools/asn1_compile/Makefile projects/krb5/kerberos5/tools/slc/Makefile projects/krb5/kerberos5/usr.bin/hxtool/Makefile projects/krb5/kerberos5/usr.bin/kadmin/Makefile projects/krb5/kerberos5/usr.bin/kcc/Makefile projects/krb5/kerberos5/usr.bin/kdestroy/Makefile projects/krb5/kerberos5/usr.bin/kf/Makefile projects/krb5/kerberos5/usr.bin/kgetcred/Makefile projects/krb5/kerberos5/usr.bin/kinit/Makefile projects/krb5/kerberos5/usr.bin/kpasswd/Makefile projects/krb5/kerberos5/usr.bin/ksu/Makefile projects/krb5/kerberos5/usr.bin/string2key/Makefile projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile projects/krb5/kerberos5/usr.sbin/kstash/Makefile projects/krb5/kerberos5/usr.sbin/ktutil/Makefile projects/krb5/lib/libpam/modules/pam_krb5/Makefile projects/krb5/lib/libpam/modules/pam_ksu/Makefile projects/krb5/lib/libtelnet/Makefile projects/krb5/secure/usr.bin/ssh/Makefile projects/krb5/secure/usr.sbin/sshd/Makefile projects/krb5/share/mk/src.libnames.mk projects/krb5/usr.bin/compile_et/Makefile projects/krb5/usr.sbin/gssd/Makefile Modified: projects/krb5/ObsoleteFiles.inc ============================================================================== --- projects/krb5/ObsoleteFiles.inc Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/ObsoleteFiles.inc Fri Sep 8 21:47:05 2017 (r323334) @@ -38,6 +38,123 @@ # xargs -n1 | sort | uniq -d; # done +# 20170831: hemdal becomes private +OLD_FILES+=usr/include/asn1-common.h +OLD_FILES+=usr/include/asn1_err.h +OLD_FILES+=usr/include/base64.h +OLD_FILES+=usr/include/cms_asn1.h +OLD_FILES+=usr/include/crmf_asn1.h +OLD_FILES+=usr/include/der-private.h +OLD_FILES+=usr/include/der-protos.h +OLD_FILES+=usr/include/der.h +OLD_FILES+=usr/include/digest_asn1.h +OLD_FILES+=usr/include/getarg.h +OLD_FILES+=usr/include/hdb-protos.h +OLD_FILES+=usr/include/hdb.h +OLD_FILES+=usr/include/hdb_asn1.h +OLD_FILES+=usr/include/hdb_err.h +OLD_FILES+=usr/include/heim_asn1.h +OLD_FILES+=usr/include/heim_err.h +OLD_FILES+=usr/include/heim_threads.h +OLD_FILES+=usr/include/heimbase.h +OLD_FILES+=usr/include/heimntlm-protos.h +OLD_FILES+=usr/include/heimntlm.h +OLD_FILES+=usr/include/hex.h +OLD_FILES+=usr/include/hx509-private.h +OLD_FILES+=usr/include/hx509-protos.h +OLD_FILES+=usr/include/hx509.h +OLD_FILES+=usr/include/hx509_err.h +OLD_FILES+=usr/include/k524_err.h +OLD_FILES+=usr/include/kafs.h +OLD_FILES+=usr/include/kdc-protos.h +OLD_FILES+=usr/include/kdc.h +OLD_FILES+=usr/include/krb5-private.h +OLD_FILES+=usr/include/krb5-protos.h +OLD_FILES+=usr/include/krb5-types.h +OLD_FILES+=usr/include/krb5.h +OLD_FILES+=usr/include/krb5_asn1.h +OLD_FILES+=usr/include/krb5_ccapi.h +OLD_FILES+=usr/include/krb5_err.h +OLD_FILES+=usr/include/kx509_asn1.h +OLD_FILES+=usr/include/ntlm_err.h +OLD_FILES+=usr/include/ocsp_asn1.h +OLD_FILES+=usr/include/parse_bytes.h +OLD_FILES+=usr/include/parse_time.h +OLD_FILES+=usr/include/parse_units.h +OLD_FILES+=usr/include/pkcs10_asn1.h +OLD_FILES+=usr/include/pkcs12_asn1.h +OLD_FILES+=usr/include/pkcs8_asn1.h +OLD_FILES+=usr/include/pkcs9_asn1.h +OLD_FILES+=usr/include/pkinit_asn1.h +OLD_FILES+=usr/include/resolve.h +OLD_FILES+=usr/include/rfc2459_asn1.h +OLD_FILES+=usr/include/roken-common.h +OLD_FILES+=usr/include/roken.h +OLD_FILES+=usr/include/rtbl.h +OLD_FILES+=usr/include/wind.h +OLD_FILES+=usr/include/wind_err.h +OLD_FILES+=usr/include/xdbm.h +OLD_LIBS+=usr/lib/libasn1.a +OLD_LIBS+=usr/lib/libasn1.so +OLD_LIBS+=usr/lib/libasn1.so.11 +OLD_LIBS+=usr/lib/libasn1_p.a +OLD_LIBS+=usr/lib/libgssapi_krb5.a +OLD_LIBS+=usr/lib/libgssapi_krb5.so +OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 +OLD_LIBS+=usr/lib/libgssapi_krb5_p.a +OLD_LIBS+=usr/lib/libgssapi_ntlm.a +OLD_LIBS+=usr/lib/libgssapi_ntlm.so +OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10 +OLD_LIBS+=usr/lib/libgssapi_ntlm_p.a +OLD_LIBS+=usr/lib/libgssapi_spnego.a +OLD_LIBS+=usr/lib/libgssapi_spnego.so +OLD_LIBS+=usr/lib/libgssapi_spnego.so.10 +OLD_LIBS+=usr/lib/libgssapi_spnego_p.a +OLD_LIBS+=usr/lib/libhdb.a +OLD_LIBS+=usr/lib/libhdb.so +OLD_LIBS+=usr/lib/libhdb.so.11 +OLD_LIBS+=usr/lib/libhdb_p.a +OLD_LIBS+=usr/lib/libheimbase.a +OLD_LIBS+=usr/lib/libheimbase.so +OLD_LIBS+=usr/lib/libheimbase.so.11 +OLD_LIBS+=usr/lib/libheimbase_p.a +OLD_LIBS+=usr/lib/libheimntlm.a +OLD_LIBS+=usr/lib/libheimntlm.so +OLD_LIBS+=usr/lib/libheimntlm.so.11 +OLD_LIBS+=usr/lib/libheimntlm_p.a +OLD_LIBS+=usr/lib/libhx509.a +OLD_LIBS+=usr/lib/libhx509.so +OLD_LIBS+=usr/lib/libhx509.so.11 +OLD_LIBS+=usr/lib/libhx509_p.a +OLD_LIBS+=usr/lib/libkadm5clnt.a +OLD_LIBS+=usr/lib/libkadm5clnt.so +OLD_LIBS+=usr/lib/libkadm5clnt.so.11 +OLD_LIBS+=usr/lib/libkadm5clnt_p.a +OLD_LIBS+=usr/lib/libkadm5srv.a +OLD_LIBS+=usr/lib/libkadm5srv.so +OLD_LIBS+=usr/lib/libkadm5srv.so.11 +OLD_LIBS+=usr/lib/libkadm5srv_p.a +OLD_LIBS+=usr/lib/libkafs5.a +OLD_LIBS+=usr/lib/libkafs5.so +OLD_LIBS+=usr/lib/libkafs5.so.11 +OLD_LIBS+=usr/lib/libkafs5_p.a +OLD_LIBS+=usr/lib/libkdc.a +OLD_LIBS+=usr/lib/libkdc.so +OLD_LIBS+=usr/lib/libkdc.so.11 +OLD_LIBS+=usr/lib/libkdc_p.a +OLD_LIBS+=usr/lib/libkrb5.a +OLD_LIBS+=usr/lib/libkrb5.so +OLD_LIBS+=usr/lib/libkrb5.so.11 +OLD_LIBS+=usr/lib/libkrb5_p.a +OLD_LIBS+=usr/lib/libroken.a +OLD_LIBS+=usr/lib/libroken.so +OLD_LIBS+=usr/lib/libroken.so.11 +OLD_LIBS+=usr/lib/libroken_p.a +OLD_LIBS+=usr/lib/libwind.a +OLD_LIBS+=usr/lib/libwind.so +OLD_LIBS+=usr/lib/libwind.so.11 +OLD_LIBS+=usr/lib/libwind_p.a + # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h Modified: projects/krb5/etc/mtree/BSD.usr.dist ============================================================================== --- projects/krb5/etc/mtree/BSD.usr.dist Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/etc/mtree/BSD.usr.dist Fri Sep 8 21:47:05 2017 (r323334) @@ -9,13 +9,33 @@ .. include private + asn1 + .. bsdstat .. event .. + hdb + .. + heimbase + .. + heimntlm + .. + hx509 + .. + kafs5 + .. + kdc + .. + krb5 + .. + roken + .. sqlite3 .. ucl + .. + wind .. zstd .. Modified: projects/krb5/kerberos5/Makefile.inc ============================================================================== --- projects/krb5/kerberos5/Makefile.inc Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/Makefile.inc Fri Sep 8 21:47:05 2017 (r323334) @@ -6,7 +6,7 @@ NO_LINT= KRB5DIR= ${SRCTOP}/crypto/heimdal -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include -I${KRB5DIR}/include .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local Modified: projects/krb5/kerberos5/lib/libasn1/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libasn1/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libasn1/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= asn1 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h LIBADD= com_err roken @@ -21,7 +22,8 @@ SRCS= asn1_err.c \ timegm.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken -I. GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx Modified: projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_krb5 +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 @@ -77,8 +78,16 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/krb5 +CFLAGS+=-I${.OBJDIR:H}/libkrb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/lib/wind +CFLAGS+=-I${.OBJDIR:H}/libwind +CFLAGS+=-I${KRB5DIR}/lib/hx509 +CFLAGS+=-I${.OBJDIR:H}/libhx509 +CFLAGS+=-I${KRB5DIR}/base -I. .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_ntlm +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 @@ -41,7 +42,14 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm CFLAGS+=-I${KRB5DIR}/lib/krb5 +CFLAGS+=-I${.OBJDIR:H}/libkrb5 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/lib/asn1 +CFLAGS+=-I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${.OBJDIR:H}/libheimntlm .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_spnego +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 @@ -31,8 +32,11 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/asn1 +CFLAGS+=-I${.OBJDIR:H}/libasn1 CFLAGS+=-I${SRCTOP}/lib/libgssapi -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/base -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c Modified: projects/krb5/kerberos5/lib/libhdb/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libhdb/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libhdb/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= hdb +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 @@ -56,9 +59,13 @@ SRCS= common.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ - -I${KRB5DIR}/lib/krb5 \ +CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${SRCTOP}/contrib/sqlite3/ \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ + -I${KRB5DIR}/base \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: projects/krb5/kerberos5/lib/libheimbase/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimbase/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimbase/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= heimbase +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map Modified: projects/krb5/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimipcc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimipcc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -9,6 +9,8 @@ SRCS= \ common.c CFLAGS+= -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/include Modified: projects/krb5/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimipcs/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimipcs/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,7 +8,8 @@ SRCS= \ server.c \ common.c -CFLAGS+= -I${KRB5DIR}/lib/roken \ +CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc -I. Modified: projects/krb5/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimntlm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimntlm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,11 +1,17 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= heimntlm +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h -CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map MAN= ntlm_buf.3 \ Modified: projects/krb5/kerberos5/lib/libhx509/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libhx509/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libhx509/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= hx509 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map LIBADD= asn1 com_err crypto roken wind @@ -209,9 +210,9 @@ SRCS+= ${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \ CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref -CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/wind -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken -I. GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ Modified: projects/krb5/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= kadm5clnt +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= com_err krb5 roken @@ -34,7 +37,10 @@ SRCS= ad.c \ rename_c.c \ send_recv.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb -I. .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkadm5srv/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkadm5srv/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= kadm5srv +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= com_err hdb krb5 roken VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map @@ -35,7 +38,10 @@ SRCS= acl.c \ set_keys.c \ set_modifier.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb -I. .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libkafs5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkafs5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkafs5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= kafs5 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= asn1 krb5 roken INCS= kafs.h @@ -27,7 +28,10 @@ SRCS= afssys.c afskrb5.c common.c CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ -I${.OBJDIR:H}/libkrb5 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H}/libasn1 CLEANFILES= kafs5.3 Modified: projects/krb5/kerberos5/lib/libkdc/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkdc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkdc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= kdc +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/kdc/version-script.map LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto @@ -25,10 +26,15 @@ SRCS= \ process.c \ windc.c -CFLAGS+= -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/kdc +CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \ + -I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libkrb5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkrb5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkrb5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= krb5 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc @@ -618,8 +621,10 @@ SRCS+= heim_err.c \ krb_err.h CFLAGS+= -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/base -I. Modified: projects/krb5/kerberos5/lib/libroken/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libroken/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libroken/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= roken +PRIVATELIB= true LIBADD= crypt VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map INCS= roken.h \ Modified: projects/krb5/kerberos5/lib/libsl/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libsl/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libsl/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,7 @@ LIB= sl INTERNALLIB= SRCS= sl.c -CFLAGS+=-I${KRB5DIR}/lib/sl +CFLAGS+=-I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/lib/libwind/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libwind/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libwind/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= wind +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map LIBADD= com_err roken @@ -27,7 +28,7 @@ SRCS= bidi.c \ SRCS+= wind_err.c \ wind_err.h -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken -I. .include <bsd.lib.mk> Modified: projects/krb5/kerberos5/libexec/digest-service/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/digest-service/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/digest-service/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,12 +2,23 @@ PROG= digest-service MAN= -CFLAGS+= -I${KRB5DIR}/kdc \ +CFLAGS+= -I${KRB5DIR}/base \ + -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ - -I${KRB5DIR}/lib/roken + -I${.OBJDIR:H:H}/lib/libwind \ + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${KRB5DIR}/lib/hx509 \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libheimntlm LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/libexec/hprop/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/hprop/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/hprop/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,8 +8,18 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${KRB5DIR}/lib/wind +CFLAGS+=-I${KRB5DIR}/lib/hdb +CFLAGS+=-I${KRB5DIR}/base CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libroken +CFLAGS+=-I${.OBJDIR:H:H}/lib/libasn1 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libhx509 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimntlm +CFLAGS+=-I${.OBJDIR:H:H}/lib/libwind +CFLAGS+=-I${.OBJDIR:H:H}/lib/libhdb +CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimbase LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/hpropd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/hpropd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/hpropd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,20 @@ PROG= hpropd MAN= hpropd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/ipropd-master/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/ipropd-master/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/ipropd-master/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,7 +4,13 @@ PROG= ipropd-master MAN= iprop.8 SRCS= ipropd_common.c ipropd_master.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ -I. ${LDAPCFLAGS} + LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/ipropd-slave/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/ipropd-slave/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/ipropd-slave/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,6 +4,11 @@ PROG= ipropd-slave MAN= SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libroken \ -I. ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} Modified: projects/krb5/kerberos5/libexec/kadmind/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kadmind/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kadmind/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,6 +8,16 @@ SRCS= rpc.c \ kadm_conn.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ ${LDAPCFLAGS} LIBADD= kadm5srv gssapi hdb krb5 roken vers DPADD= ${LDAPDPADD} Modified: projects/krb5/kerberos5/libexec/kcm/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kcm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kcm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -18,7 +18,13 @@ SRCS= acl.c \ renew.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} + -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= krb5 roken heimntlm heimipcs crypto DPADD= ${LDAPDPADD} LDADD= ${LIBVERS} ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/kdc/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kdc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kdc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -9,7 +9,20 @@ SRCS= config.c \ main.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/libexec/kdigest/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kdigest/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kdigest/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,7 +4,15 @@ PROG= kdigest MAN= kdigest.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + -I. LIBADD= krb5 heimntlm roken crypto edit sl vers SRCS= kdigest.c \ kdigest-commands.c \ Modified: projects/krb5/kerberos5/libexec/kfd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kfd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kfd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,11 @@ PROG= kfd MAN= kfd.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/libexec/kimpersonate/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kimpersonate/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kimpersonate/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -5,7 +5,13 @@ MAN= kimpersonate.8 CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I. LIBADD= krb5 roken asn1 vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/libexec/kpasswdd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kpasswdd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kpasswdd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,15 @@ PROG= kpasswdd MAN= kpasswdd.8 -CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS} +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers asn1 DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- projects/krb5/kerberos5/tools/asn1_compile/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/tools/asn1_compile/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,7 @@ PROG= asn1_compile MAN= -LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} Modified: projects/krb5/kerberos5/tools/slc/Makefile ============================================================================== --- projects/krb5/kerberos5/tools/slc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/tools/slc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= slc -LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} Modified: projects/krb5/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/hxtool/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/hxtool/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -5,6 +5,9 @@ MAN= CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ -I${KRB5DIR}/lib/sl -I. LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h Modified: projects/krb5/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kadmin/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kadmin/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -25,7 +25,19 @@ SRCS= add_enctype.c \ util.c CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I. \ + ${LDAPCFLAGS} LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kcc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kcc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,7 +7,13 @@ LINKS= ${BINDIR}/kcc ${BINDIR}/klist \ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I. LIBADD= krb5 roken asn1 kafs5 edit sl vers SRCS= kcc.c \ kcc-commands.c \ Modified: projects/krb5/kerberos5/usr.bin/kdestroy/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kdestroy/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kdestroy/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,12 @@ # $FreeBSD$ PROG= kdestroy -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 roken vers MAN= kdestroy.1 Modified: projects/krb5/kerberos5/usr.bin/kf/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kf/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kf/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,11 @@ PROG= kf MAN= kf.1 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.bin/kgetcred/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kgetcred/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kgetcred/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,12 @@ PROG= kgetcred CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken asn1 vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.bin/kinit/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kinit/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kinit/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,14 @@ # $FreeBSD$ PROG= kinit -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 heimntlm roken crypto vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.bin/kpasswd/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kpasswd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kpasswd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,11 @@ # $FreeBSD$ PROG= kpasswd -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= hdb krb5 roken vers crypto LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/usr.bin/ksu/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/ksu/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/ksu/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,7 +7,12 @@ PRECIOUSPROG= .endif MAN= SRCS= su.c -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 roken vers crypto crypt .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/string2key/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/string2key/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -6,7 +6,18 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/windc + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm LIBADD= krb5 roken crypto vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,15 @@ PROG= verify_krb5_conf MAN= verify_krb5_conf.8 -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhx509 LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,6 +7,12 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libasn1 \ -I. LIBADD= kadm5srv hdb krb5 roken edit sl vers LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/usr.sbin/kstash/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.sbin/kstash/Makefile Fri Sep 8 21:16:23 2017 (r323333) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709082147.v88Ll5U5047153>