svn commit: r336423 - in projects/krb5: . etc/mtree kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libhdb kerberos5/lib/libheimntlm kerberos5/lib/libhx509 kerberos5/lib/libkadm5cl...
Cy Schubert
cy at FreeBSD.org
Tue Jul 17 19:46:59 UTC 2018
Author: cy
Date: Tue Jul 17 19:46:52 2018
New Revision: 336423
URL: https://svnweb.freebsd.org/changeset/base/336423
Log:
Though the FreeBSD com_err is not from the current Heimdal distribution,
it is Kerberos and can conflict with security/krb5 and security/heimdal
from ports. Making com_err in base private addresses any potential
conflicts.
Modified:
projects/krb5/ObsoleteFiles.inc
projects/krb5/etc/mtree/BSD.usr.dist
projects/krb5/kerberos5/lib/libasn1/Makefile
projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile
projects/krb5/kerberos5/lib/libhdb/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/libkdc/Makefile
projects/krb5/kerberos5/lib/libkrb5/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/kadmind/Makefile
projects/krb5/kerberos5/libexec/kdc/Makefile
projects/krb5/kerberos5/libexec/kimpersonate/Makefile
projects/krb5/kerberos5/usr.bin/hxtool/Makefile
projects/krb5/kerberos5/usr.bin/kadmin/Makefile
projects/krb5/kerberos5/usr.bin/kf/Makefile
projects/krb5/kerberos5/usr.bin/string2key/Makefile
projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile
projects/krb5/kerberos5/usr.sbin/kstash/Makefile
projects/krb5/lib/libcom_err/Makefile
projects/krb5/lib/libpam/modules/pam_krb5/Makefile
projects/krb5/share/mk/src.libnames.mk
Modified: projects/krb5/ObsoleteFiles.inc
==============================================================================
--- projects/krb5/ObsoleteFiles.inc Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/ObsoleteFiles.inc Tue Jul 17 19:46:52 2018 (r336423)
@@ -38,6 +38,15 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180708: libcom_err is private
+OLD_FILES+=usr/include/com_err.h
+OLD_LIBS+=usr/lib/libcom_err.a
+OLD_LIBS+=usr/lib/libcom_err.so
+OLD_LIBS+=usr/lib/libcom_err.so.5
+OLD_LIBS+=usr/lib/libcom_err_p.a
+OLD_LIBS+=/usr/lib32/libcom_err.a
+OLD_LIBS+=/usr/lib32/libcom_err.so
+OLD_LIBS+=/usr/lib32/libcom_err.so.5
# 20180630: new clang import which bumps version from 6.0.0 to 6.0.1.
OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
Modified: projects/krb5/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/krb5/etc/mtree/BSD.usr.dist Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/etc/mtree/BSD.usr.dist Tue Jul 17 19:46:52 2018 (r336423)
@@ -13,6 +13,8 @@
..
bsdstat
..
+ com_err
+ ..
event
..
hdb
Modified: projects/krb5/kerberos5/lib/libasn1/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libasn1/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libasn1/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -23,7 +23,7 @@ SRCS= asn1_err.c \
${GEN:S/.x$/.c/:S/.hx$/.h/}
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I${.OBJDIR:H}/libroken -I.
+ -I${.OBJDIR:H}/libroken -I${SRCTOP}/contrib/com_err -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 Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -87,6 +87,7 @@ CFLAGS+=-I${KRB5DIR}/lib/wind
CFLAGS+=-I${.OBJDIR:H}/libwind
CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${.OBJDIR:H}/libhx509
+CFLAGS+=-I${SRCTOP}/contrib/com_err
CFLAGS+=-I${KRB5DIR}/base -I.
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/lib/libhdb/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libhdb/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libhdb/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -64,6 +64,7 @@ CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 -I$
-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
-I${KRB5DIR}/base \
+ -I${SRCTOP}/contrib/com_err \
-I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
Modified: projects/krb5/kerberos5/lib/libheimntlm/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libheimntlm/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libheimntlm/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -9,7 +9,8 @@ INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
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
+ -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
+ -I${SRCTOP}/contrib/com_err
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 Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libhx509/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -212,7 +212,8 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
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.
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken
+CFLAGS+=-I${SRCTOP}/contrib/com_err -I.
GEN_OCSP= \
asn1_OCSPBasicOCSPResponse.x \
Modified: projects/krb5/kerberos5/lib/libkadm5clnt/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -38,7 +38,8 @@ SRCS= ad.c \
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.
+ -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
+ -I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/lib/libkadm5srv/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkadm5srv/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libkadm5srv/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -39,7 +39,8 @@ SRCS= acl.c \
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.
+ -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
+ -I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/lib/libkdc/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkdc/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libkdc/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -34,6 +34,7 @@ CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroke
-I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \
-I${KRB5DIR}/kdc \
+ -I${SRCTOP}/contrib/com_err \
-I${KRB5DIR}/base
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/lib/libkrb5/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkrb5/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libkrb5/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -624,6 +624,7 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
-I${KRB5DIR}/lib/ipc \
+ -I${SRCTOP}/contrib/com_err \
-I${KRB5DIR}/base -I.
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/lib/libwind/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libwind/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/lib/libwind/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -28,7 +28,8 @@ SRCS= bidi.c \
SRCS+= wind_err.c \
wind_err.h
-CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
+ -I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk>
Modified: projects/krb5/kerberos5/libexec/digest-service/Makefile
==============================================================================
--- projects/krb5/kerberos5/libexec/digest-service/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/digest-service/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -18,7 +18,8 @@ CFLAGS+= -I${KRB5DIR}/base \
-I${KRB5DIR}/lib/hdb \
-I${.OBJDIR:H:H}/lib/libhdb \
-I${KRB5DIR}/lib/ntlm \
- -I${.OBJDIR:H:H}/lib/libheimntlm
+ -I${.OBJDIR:H:H}/lib/libheimntlm \
+ -I${SRCTOP}/contrib/com_err
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 Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/hprop/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -20,6 +20,7 @@ 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
+CFLAGS+=-I${SRCTOP}/contrib/com_err
LIBADD= hdb krb5 roken vers
DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD}
Modified: projects/krb5/kerberos5/libexec/hpropd/Makefile
==============================================================================
--- projects/krb5/kerberos5/libexec/hpropd/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/hpropd/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -16,6 +16,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
-I${.OBJDIR:H:H}/lib/libheimntlm \
+ -I${SRCTOP}/contrib/com_err \
${LDAPCFLAGS}
LIBADD= hdb krb5 roken vers
DPADD= ${LDAPDPADD}
Modified: projects/krb5/kerberos5/libexec/kadmind/Makefile
==============================================================================
--- projects/krb5/kerberos5/libexec/kadmind/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/kadmind/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -18,6 +18,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I
-I${.OBJDIR:H:H}/lib/libwind \
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
+ -I${SRCTOP}/contrib/com_err \
${LDAPCFLAGS}
LIBADD= kadm5srv gssapi hdb krb5 roken vers
DPADD= ${LDAPDPADD}
Modified: projects/krb5/kerberos5/libexec/kdc/Makefile
==============================================================================
--- projects/krb5/kerberos5/libexec/kdc/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/kdc/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -22,6 +22,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
-I${.OBJDIR:H:H}/lib/libheimntlm \
+ -I${SRCTOP}/contrib/com_err \
${LDAPCFLAGS}
LIBADD= kdc hdb krb5 roken crypt vers
LDFLAGS=${LDAPLDFLAGS}
Modified: projects/krb5/kerberos5/libexec/kimpersonate/Makefile
==============================================================================
--- projects/krb5/kerberos5/libexec/kimpersonate/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/libexec/kimpersonate/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -11,6 +11,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \
-I${.OBJDIR:H:H}/lib/libroken \
-I${.OBJDIR:H:H}/lib/libasn1 \
-I${.OBJDIR:H:H}/lib/libkrb5 \
+ -I${SRCTOP}/contrib/com_err \
-I.
LIBADD= krb5 roken asn1 vers
Modified: projects/krb5/kerberos5/usr.bin/hxtool/Makefile
==============================================================================
--- projects/krb5/kerberos5/usr.bin/hxtool/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.bin/hxtool/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -8,7 +8,8 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libasn1 \
-I${.OBJDIR:H:H}/lib/libroken \
- -I${KRB5DIR}/lib/sl -I.
+ -I${KRB5DIR}/lib/sl \
+ -I${SRCTOP}/contrib/com_err -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 Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.bin/kadmin/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -36,6 +36,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I
-I${.OBJDIR:H:H}/lib/libwind \
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
+ -I${SRCTOP}/contrib/com_err \
-I. \
${LDAPCFLAGS}
LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
Modified: projects/krb5/kerberos5/usr.bin/kf/Makefile
==============================================================================
--- projects/krb5/kerberos5/usr.bin/kf/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.bin/kf/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -7,7 +7,8 @@ CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
-I${.OBJDIR:H:H}/lib/libasn1 \
-I${.OBJDIR:H:H}/lib/libroken \
- -I${.OBJDIR:H:H}/lib/libkrb5
+ -I${.OBJDIR:H:H}/lib/libkrb5 \
+ -I${SRCTOP}/contrib/com_err
LIBADD= krb5 roken vers
.include <bsd.prog.mk>
Modified: projects/krb5/kerberos5/usr.bin/string2key/Makefile
==============================================================================
--- projects/krb5/kerberos5/usr.bin/string2key/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.bin/string2key/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -17,7 +17,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \
-I${.OBJDIR:H:H}/lib/libwind \
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
- -I${.OBJDIR:H:H}/lib/libheimntlm
+ -I${.OBJDIR:H:H}/lib/libheimntlm \
+ -I${SRCTOP}/contrib/com_err
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 Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -10,7 +10,8 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I
-I${.OBJDIR:H:H}/lib/libroken \
-I${.OBJDIR:H:H}/lib/libwind \
-I${.OBJDIR:H:H}/lib/libasn1 \
- -I${.OBJDIR:H:H}/lib/libhx509
+ -I${.OBJDIR:H:H}/lib/libhx509 \
+ -I${SRCTOP}/contrib/com_err
LIBADD= krb5 roken vers
.include <bsd.prog.mk>
Modified: projects/krb5/kerberos5/usr.sbin/kstash/Makefile
==============================================================================
--- projects/krb5/kerberos5/usr.sbin/kstash/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/kerberos5/usr.sbin/kstash/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -16,6 +16,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I
-I${.OBJDIR:H:H}/lib/libhx509 \
-I${.OBJDIR:H:H}/lib/libhdb \
-I${.OBJDIR:H:H}/lib/libheimntlm \
+ -I${SRCTOP}/contrib/com_err \
${LDAPCFLAGS}
LIBADD= hdb krb5 crypto vers
DPADD= ${LDAPDPADD}
Modified: projects/krb5/lib/libcom_err/Makefile
==============================================================================
--- projects/krb5/lib/libcom_err/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/lib/libcom_err/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -2,8 +2,9 @@
PACKAGE=lib${LIB}
LIB= com_err
+PRIVATELIB= true
SRCS= com_err.c error.c
-INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
+INCS= com_err.h com_right.h
MAN= com_err.3
COM_ERRDIR= ${SRCTOP}/contrib/com_err
CFLAGS+= -I${COM_ERRDIR}
Modified: projects/krb5/lib/libpam/modules/pam_krb5/Makefile
==============================================================================
--- projects/krb5/lib/libpam/modules/pam_krb5/Makefile Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/lib/libpam/modules/pam_krb5/Makefile Tue Jul 17 19:46:52 2018 (r336423)
@@ -43,6 +43,7 @@ CFLAGS+= -I${SRCTOP}/kerberos5/include \
-I${KRB5DIR}/lib/krb5 \
-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libkrb5 \
-I${KRB5DIR}/lib/asn1 \
- -I${.OBJDIR:H:H:H:H}/kerberos5/lib/libasn1
+ -I${.OBJDIR:H:H:H:H}/kerberos5/lib/libasn1 \
+ -I${SRCTOP}/contrib/com_err
.include <bsd.lib.mk>
Modified: projects/krb5/share/mk/src.libnames.mk
==============================================================================
--- projects/krb5/share/mk/src.libnames.mk Tue Jul 17 19:26:17 2018 (r336422)
+++ projects/krb5/share/mk/src.libnames.mk Tue Jul 17 19:46:52 2018 (r336423)
@@ -17,6 +17,7 @@ _PRIVATELIBS= \
atf_c \
atf_cxx \
bsdstat \
+ com_err \
devdctl \
event \
gssapi \
@@ -94,7 +95,6 @@ _LIBRARIES= \
cap_random \
cap_sysctl \
cap_syslog \
- com_err \
compiler_rt \
crypt \
crypto \
More information about the svn-src-projects
mailing list