From owner-svn-src-all@freebsd.org Sat Feb 16 03:18:14 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 158AA14CE29A; Sat, 16 Feb 2019 03:18:14 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC8E06ECA2; Sat, 16 Feb 2019 03:18:13 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 868577DD; Sat, 16 Feb 2019 03:18:13 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1G3IDl7055923; Sat, 16 Feb 2019 03:18:13 GMT (envelope-from nyan@FreeBSD.org) Received: (from nyan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1G3I9gj055903; Sat, 16 Feb 2019 03:18:09 GMT (envelope-from nyan@FreeBSD.org) Message-Id: <201902160318.x1G3I9gj055903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nyan set sender to nyan@FreeBSD.org using -f From: Takahashi Yoshihiro Date: Sat, 16 Feb 2019 03:18:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r344199 - in stable/12/kerberos5: lib/libasn1 lib/libgssapi_krb5 lib/libhdb lib/libheimntlm lib/libhx509 lib/libkadm5clnt lib/libkadm5srv lib/libkdc lib/libkrb5 lib/libwind libexec/dige... X-SVN-Group: stable-12 X-SVN-Commit-Author: nyan X-SVN-Commit-Paths: in stable/12/kerberos5: lib/libasn1 lib/libgssapi_krb5 lib/libhdb lib/libheimntlm lib/libhx509 lib/libkadm5clnt lib/libkadm5srv lib/libkdc lib/libkrb5 lib/libwind libexec/digest-service libexec/hprop ... X-SVN-Commit-Revision: 344199 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AC8E06ECA2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Feb 2019 03:18:14 -0000 Author: nyan Date: Sat Feb 16 03:18:09 2019 New Revision: 344199 URL: https://svnweb.freebsd.org/changeset/base/344199 Log: MFC: r343011 Use ${SRCTOP}/contrib/com_err/com_err.h instead of the installed com_err.h. This fixes build when com_err.h is not installed. PR: 234691 Modified: stable/12/kerberos5/lib/libasn1/Makefile stable/12/kerberos5/lib/libgssapi_krb5/Makefile stable/12/kerberos5/lib/libhdb/Makefile stable/12/kerberos5/lib/libheimntlm/Makefile stable/12/kerberos5/lib/libhx509/Makefile stable/12/kerberos5/lib/libkadm5clnt/Makefile stable/12/kerberos5/lib/libkadm5srv/Makefile stable/12/kerberos5/lib/libkdc/Makefile stable/12/kerberos5/lib/libkrb5/Makefile stable/12/kerberos5/lib/libwind/Makefile stable/12/kerberos5/libexec/digest-service/Makefile stable/12/kerberos5/libexec/hprop/Makefile stable/12/kerberos5/libexec/hpropd/Makefile stable/12/kerberos5/libexec/kadmind/Makefile stable/12/kerberos5/libexec/kdc/Makefile stable/12/kerberos5/usr.bin/hxtool/Makefile stable/12/kerberos5/usr.bin/kadmin/Makefile stable/12/kerberos5/usr.bin/string2key/Makefile stable/12/kerberos5/usr.bin/verify_krb5_conf/Makefile stable/12/kerberos5/usr.sbin/kstash/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/kerberos5/lib/libasn1/Makefile ============================================================================== --- stable/12/kerberos5/lib/libasn1/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libasn1/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -21,7 +21,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${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: stable/12/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- stable/12/kerberos5/lib/libgssapi_krb5/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libgssapi_krb5/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -78,7 +78,9 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${SRCTOP}/contrib/com_err +CFLAGS+=-I. .include Modified: stable/12/kerberos5/lib/libhdb/Makefile ============================================================================== --- stable/12/kerberos5/lib/libhdb/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libhdb/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -59,6 +59,7 @@ SRCS= common.c \ CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ + -I${SRCTOP}/contrib/com_err \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: stable/12/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- stable/12/kerberos5/lib/libheimntlm/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libheimntlm/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -5,7 +5,8 @@ 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${KRB5DIR}/lib/roken \ + -I${SRCTOP}/contrib/com_err VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map MAN= ntlm_buf.3 \ Modified: stable/12/kerberos5/lib/libhx509/Makefile ============================================================================== --- stable/12/kerberos5/lib/libhx509/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libhx509/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -211,7 +211,9 @@ 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/roken +CFLAGS+=-I${SRCTOP}/contrib/com_err +CFLAGS+=-I. GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ Modified: stable/12/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- stable/12/kerberos5/lib/libkadm5clnt/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libkadm5clnt/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -34,7 +34,8 @@ 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${KRB5DIR}/lib/roken \ + -I${SRCTOP}/contrib/com_err -I. .include Modified: stable/12/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- stable/12/kerberos5/lib/libkadm5srv/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libkadm5srv/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -35,7 +35,8 @@ 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${KRB5DIR}/lib/roken \ + -I${SRCTOP}/contrib/com_err -I. .include Modified: stable/12/kerberos5/lib/libkdc/Makefile ============================================================================== --- stable/12/kerberos5/lib/libkdc/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libkdc/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -28,7 +28,8 @@ SRCS= \ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/kdc + -I${KRB5DIR}/kdc \ + -I${SRCTOP}/contrib/com_err .include Modified: stable/12/kerberos5/lib/libkrb5/Makefile ============================================================================== --- stable/12/kerberos5/lib/libkrb5/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libkrb5/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -621,7 +621,9 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/ipc \ - -I${KRB5DIR}/base -I. + -I${KRB5DIR}/base \ + -I${SRCTOP}/contrib/com_err \ + -I. .include Modified: stable/12/kerberos5/lib/libwind/Makefile ============================================================================== --- stable/12/kerberos5/lib/libwind/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/lib/libwind/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -27,7 +27,7 @@ SRCS= bidi.c \ SRCS+= wind_err.c \ wind_err.h -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/com_err -I. .include Modified: stable/12/kerberos5/libexec/digest-service/Makefile ============================================================================== --- stable/12/kerberos5/libexec/digest-service/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/libexec/digest-service/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -7,7 +7,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${SRCTOP}/contrib/com_err LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LDFLAGS=${LDAPLDFLAGS} Modified: stable/12/kerberos5/libexec/hprop/Makefile ============================================================================== --- stable/12/kerberos5/libexec/hprop/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/libexec/hprop/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -9,6 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/kdc +CFLAGS+=-I${SRCTOP}/contrib/com_err CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} Modified: stable/12/kerberos5/libexec/hpropd/Makefile ============================================================================== --- stable/12/kerberos5/libexec/hpropd/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/libexec/hpropd/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -3,7 +3,7 @@ PROG= hpropd MAN= hpropd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: stable/12/kerberos5/libexec/kadmind/Makefile ============================================================================== --- stable/12/kerberos5/libexec/kadmind/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/libexec/kadmind/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -8,7 +8,7 @@ SRCS= rpc.c \ kadm_conn.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - ${LDAPCFLAGS} + -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= kadm5srv gssapi hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: stable/12/kerberos5/libexec/kdc/Makefile ============================================================================== --- stable/12/kerberos5/libexec/kdc/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/libexec/kdc/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -9,7 +9,7 @@ SRCS= config.c \ main.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers LDFLAGS=${LDAPLDFLAGS} Modified: stable/12/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- stable/12/kerberos5/usr.bin/hxtool/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/usr.bin/hxtool/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -5,7 +5,9 @@ MAN= CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -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: stable/12/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- stable/12/kerberos5/usr.bin/kadmin/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/usr.bin/kadmin/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -25,7 +25,7 @@ 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${SRCTOP}/contrib/com_err -I. ${LDAPCFLAGS} LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: stable/12/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- stable/12/kerberos5/usr.bin/string2key/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/usr.bin/string2key/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -6,7 +6,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/windc + -I${KRB5DIR}/lib/windc \ + -I${SRCTOP}/contrib/com_err LIBADD= krb5 roken crypto vers .include Modified: stable/12/kerberos5/usr.bin/verify_krb5_conf/Makefile ============================================================================== --- stable/12/kerberos5/usr.bin/verify_krb5_conf/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/usr.bin/verify_krb5_conf/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -2,7 +2,8 @@ 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${SRCTOP}/contrib/com_err LIBADD= krb5 roken vers .include Modified: stable/12/kerberos5/usr.sbin/kstash/Makefile ============================================================================== --- stable/12/kerberos5/usr.sbin/kstash/Makefile Sat Feb 16 01:48:38 2019 (r344198) +++ stable/12/kerberos5/usr.sbin/kstash/Makefile Sat Feb 16 03:18:09 2019 (r344199) @@ -3,7 +3,7 @@ PROG= kstash MAN= kstash.8 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= hdb krb5 crypto vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD}