diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -9,13 +9,12 @@ .include -KRB5_VERSION= 1.22-final - # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 KRB5_DIR= ${SRCTOP}/crypto/krb5/src KRB5_ETDIR?= ${DESTDIR}/usr/share/et KRB5_SRCLIBDIR= ${KRB5_DIR}/lib +KRB5_AUTOCONFDIR= ${OBJTOP}/krb5/util/build-tools KRB5_OBJTOP= ${OBJTOP}/krb5 KRB5_OBJHDR= ${OBJTOP}/include diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.hin rename from krb5/include/autoconf.h rename to krb5/include/autoconf.hin --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.hin @@ -641,7 +641,7 @@ #define PACKAGE_NAME "Kerberos 5" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Kerberos 5 1.21.1" +#define PACKAGE_STRING "Kerberos 5 VersionString" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "krb5" @@ -650,7 +650,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.21.1" +#define PACKAGE_VERSION "VersionString" /* Default PKCS11 module name */ #define PKCS11_MODNAME "opensc-pkcs11.so" diff --git a/krb5/lib/apputils/Makefile b/krb5/lib/apputils/Makefile --- a/krb5/lib/apputils/Makefile +++ b/krb5/lib/apputils/Makefile @@ -22,6 +22,8 @@ CFLAGS+=-I${KRB5_DIR}/lib/apputils \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} .include diff --git a/krb5/lib/crypto/Makefile b/krb5/lib/crypto/Makefile --- a/krb5/lib/crypto/Makefile +++ b/krb5/lib/crypto/Makefile @@ -31,6 +31,8 @@ # .include "${KRB5_SRCTOP}/lib/crypto/openssl/Makefile.inc" CFLAGS+=-I${.CURDIR:H:H}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${KRB5_DIR}/include \ -I${KRB5_DIR}/lib/crypto \ -I${KRB5_DIR}/lib/crypto/krb \ diff --git a/krb5/lib/gssapi/Makefile b/krb5/lib/gssapi/Makefile --- a/krb5/lib/gssapi/Makefile +++ b/krb5/lib/gssapi/Makefile @@ -40,7 +40,9 @@ -I${KRB5_OBJTOP}/lib/gssapi \ -I${KRB5_OBJTOP}/lib \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ .include diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -33,7 +33,9 @@ -I${KRB5_DIR}/include \ -I${KRB5_OBJTOP}/include/krb5_private \ -I${KRB5_SRCTOP}/include \ - -I${KRB5_OBJTOP}/lib + -I${KRB5_OBJTOP}/lib \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools INCSDIR=${INCLUDEDIR}/kadm5 INCS= admin.h \ diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile --- a/krb5/lib/kadm5srv/Makefile +++ b/krb5/lib/kadm5srv/Makefile @@ -39,7 +39,10 @@ -I${KRB5_OBJTOP}/lib \ -I${KRB5_OBJTOP}/lib/gssapi \ -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/generic + -I${KRB5_DIR}/lib/gssapi/generic \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools + CWARNFLAGS.gcc+=-Wno-alloc-size-larger-than GEN_KADM_ERR= kadm_err.et diff --git a/krb5/lib/kadmin_common/Makefile b/krb5/lib/kadmin_common/Makefile --- a/krb5/lib/kadmin_common/Makefile +++ b/krb5/lib/kadmin_common/Makefile @@ -27,6 +27,8 @@ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/util \ -I${KRB5_OBJTOP}/util \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} CLEANFILES= kadmin_ct.c ktutil_ct.c diff --git a/krb5/lib/kdb/Makefile b/krb5/lib/kdb/Makefile --- a/krb5/lib/kdb/Makefile +++ b/krb5/lib/kdb/Makefile @@ -35,7 +35,9 @@ -I${KRB5_DIR}/lib/kdb \ -I${KRB5_OBJTOP}/lib/kdb \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools ADB_ERR= adb_err.et ADB_ERR_C= ${ADB_ERR:S/.et$/.c/} diff --git a/krb5/lib/kprop_util/Makefile b/krb5/lib/kprop_util/Makefile --- a/krb5/lib/kprop_util/Makefile +++ b/krb5/lib/kprop_util/Makefile @@ -21,6 +21,8 @@ CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} .include diff --git a/krb5/lib/krad/Makefile b/krb5/lib/krad/Makefile --- a/krb5/lib/krad/Makefile +++ b/krb5/lib/krad/Makefile @@ -27,6 +27,8 @@ CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} .include diff --git a/krb5/lib/krb5/Makefile b/krb5/lib/krb5/Makefile --- a/krb5/lib/krb5/Makefile +++ b/krb5/lib/krb5/Makefile @@ -48,6 +48,8 @@ -I${KRB5_DIR}/util/profile \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${KRB5_DIR} MANGROUPS= KRB5 diff --git a/krb5/lib/rpc/Makefile b/krb5/lib/rpc/Makefile --- a/krb5/lib/rpc/Makefile +++ b/krb5/lib/rpc/Makefile @@ -69,6 +69,8 @@ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ -I${KRB5_OBJTOP}/lib \ + -I${.OBJDIR:H:H}/util/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -DGSSAPI_KRB5 \ -DDEBUG_GSSAPI=0 \ -DGSSRPC__IMPL diff --git a/krb5/libdata/Makefile b/krb5/libdata/Makefile --- a/krb5/libdata/Makefile +++ b/krb5/libdata/Makefile @@ -8,6 +8,8 @@ PACKAGE=kerberos-lib +KRB5_VERSION!= grep '^KRB5_VERSION=' ${KRB5_DIR}/configure | sed 's/^KRB5_VERSION=//' + PCFILES=gssrpc.pc \ kadm-client.pc \ kadm-server.pc \ @@ -22,9 +24,9 @@ .SUFFIXES: .pc .pc.in .pc.in.pc: - sed -e 's,@prefix@,/usr,g ; \ + sed -e 's,@prefix@,${KRB5PREFIX},g ; \ s,@exec_prefix@,$${prefix},g ; \ - s,@libdir@,${LIBDIR},g ; \ + s,@libdir@,${KRB5_LIBDIR},g ; \ s,@includedir@,${INCLUDEDIR},g ; \ s,@KRB5_VERSION@,${KRB5_VERSION},g ; \ s,@KDB5_DB_LIB@,,g ; \ diff --git a/krb5/libexec/kadmind/Makefile b/krb5/libexec/kadmind/Makefile --- a/krb5/libexec/kadmind/Makefile +++ b/krb5/libexec/kadmind/Makefile @@ -31,7 +31,8 @@ -I${KRB5_OBJTOP}/lib \ -I${KRB5_DIR}/lib \ -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/generic + -I${KRB5_DIR}/lib/gssapi/generic \ + -I${.OBJDIR:H:H}/util/build-tools kadmind.8: kadmind.man diff --git a/krb5/libexec/kdc/Makefile b/krb5/libexec/kdc/Makefile --- a/krb5/libexec/kdc/Makefile +++ b/krb5/libexec/kdc/Makefile @@ -43,6 +43,7 @@ CFLAGS+=${DEFINES} \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ -I${.OBJDIR} CLEANFILES+= krb5kdc.8 diff --git a/krb5/libexec/kprop/Makefile b/krb5/libexec/kprop/Makefile --- a/krb5/libexec/kprop/Makefile +++ b/krb5/libexec/kprop/Makefile @@ -18,7 +18,8 @@ MAN= kprop.8 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools .include diff --git a/krb5/libexec/kpropd/Makefile b/krb5/libexec/kpropd/Makefile --- a/krb5/libexec/kpropd/Makefile +++ b/krb5/libexec/kpropd/Makefile @@ -18,7 +18,8 @@ MAN= kpropd.8 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools .include diff --git a/krb5/libexec/kproplog/Makefile b/krb5/libexec/kproplog/Makefile --- a/krb5/libexec/kproplog/Makefile +++ b/krb5/libexec/kproplog/Makefile @@ -16,7 +16,8 @@ MAN= kproplog.8 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools .include diff --git a/krb5/plugins/audit/Makefile b/krb5/plugins/audit/Makefile --- a/krb5/plugins/audit/Makefile +++ b/krb5/plugins/audit/Makefile @@ -20,7 +20,8 @@ SRCS= kdc_j_encode.c -CFLAGS+=-I${KRB5_DIR}/plugins/audit +CFLAGS+=-I${KRB5_DIR}/plugins/audit \ + -I${.OBJDIR:H:H}/util/build-tools .include diff --git a/krb5/plugins/k5tls/Makefile b/krb5/plugins/k5tls/Makefile --- a/krb5/plugins/k5tls/Makefile +++ b/krb5/plugins/k5tls/Makefile @@ -23,7 +23,8 @@ CFLAGS+=-I${KRB5_DIR}/plugins/tls/k5tls \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools .include diff --git a/krb5/plugins/kdb/db2/Makefile b/krb5/plugins/kdb/db2/Makefile --- a/krb5/plugins/kdb/db2/Makefile +++ b/krb5/plugins/kdb/db2/Makefile @@ -42,7 +42,8 @@ -I${KRB5_DIR}/lib/kdb \ -I${KRB5_DIR}/lib \ -I${KRB5_OBJTOP}/plugins/kdb/db2 \ - -I${KRB5_OBJTOP}/lib/kdb + -I${KRB5_OBJTOP}/lib/kdb \ + -I${.OBJDIR:H:H:H}/util/build-tools .include diff --git a/krb5/plugins/preauth/otp/Makefile b/krb5/plugins/preauth/otp/Makefile --- a/krb5/plugins/preauth/otp/Makefile +++ b/krb5/plugins/preauth/otp/Makefile @@ -24,6 +24,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/preauth/otp \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H:H}/util/build-tools .include diff --git a/krb5/plugins/preauth/pkinit/Makefile b/krb5/plugins/preauth/pkinit/Makefile --- a/krb5/plugins/preauth/pkinit/Makefile +++ b/krb5/plugins/preauth/pkinit/Makefile @@ -32,6 +32,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/preauth/pkinit \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H:H}/util/build-tools .include diff --git a/krb5/plugins/preauth/spake/Makefile b/krb5/plugins/preauth/spake/Makefile --- a/krb5/plugins/preauth/spake/Makefile +++ b/krb5/plugins/preauth/spake/Makefile @@ -29,6 +29,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/preauth/spake \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H:H}/util/build-tools .include diff --git a/krb5/plugins/preauth/test/Makefile b/krb5/plugins/preauth/test/Makefile --- a/krb5/plugins/preauth/test/Makefile +++ b/krb5/plugins/preauth/test/Makefile @@ -25,6 +25,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/preauth/test \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H:H}/util/build-tools .include diff --git a/krb5/usr.bin/gss-client/Makefile b/krb5/usr.bin/gss-client/Makefile --- a/krb5/usr.bin/gss-client/Makefile +++ b/krb5/usr.bin/gss-client/Makefile @@ -19,7 +19,8 @@ -I${KRB5_OBJTOP}/lib \ -I${KRB5_DIR}/lib/gssapi/generic \ -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/mechglue + -I${KRB5_DIR}/lib/gssapi/mechglue \ + -I${.OBJDIR:H:H}/util/build-tools MAN= diff --git a/krb5/usr.bin/kadmin/Makefile b/krb5/usr.bin/kadmin/Makefile --- a/krb5/usr.bin/kadmin/Makefile +++ b/krb5/usr.bin/kadmin/Makefile @@ -24,7 +24,8 @@ CLEANFILES= kadmin.1 k5srvutil.1 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools kadmin.1: kadmin.man diff --git a/krb5/usr.bin/kdestroy/Makefile b/krb5/usr.bin/kdestroy/Makefile --- a/krb5/usr.bin/kdestroy/Makefile +++ b/krb5/usr.bin/kdestroy/Makefile @@ -14,7 +14,8 @@ SRCS= kdestroy.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kdestroy.1 diff --git a/krb5/usr.bin/kinit/Makefile b/krb5/usr.bin/kinit/Makefile --- a/krb5/usr.bin/kinit/Makefile +++ b/krb5/usr.bin/kinit/Makefile @@ -16,7 +16,8 @@ kinit_kdb.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kinit.1 diff --git a/krb5/usr.bin/klist/Makefile b/krb5/usr.bin/klist/Makefile --- a/krb5/usr.bin/klist/Makefile +++ b/krb5/usr.bin/klist/Makefile @@ -14,7 +14,8 @@ SRCS= klist.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= klist.1 diff --git a/krb5/usr.bin/kpasswd/Makefile b/krb5/usr.bin/kpasswd/Makefile --- a/krb5/usr.bin/kpasswd/Makefile +++ b/krb5/usr.bin/kpasswd/Makefile @@ -14,7 +14,8 @@ SRCS= kpasswd.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kpasswd.1 diff --git a/krb5/usr.bin/ksu/Makefile b/krb5/usr.bin/ksu/Makefile --- a/krb5/usr.bin/ksu/Makefile +++ b/krb5/usr.bin/ksu/Makefile @@ -24,6 +24,7 @@ CFLAGS+=-I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools \ -DGET_TGT_VIA_PASSWD MAN= ksu.1 diff --git a/krb5/usr.bin/kswitch/Makefile b/krb5/usr.bin/kswitch/Makefile --- a/krb5/usr.bin/kswitch/Makefile +++ b/krb5/usr.bin/kswitch/Makefile @@ -14,7 +14,8 @@ SRCS= kswitch.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kswitch.1 diff --git a/krb5/usr.bin/ktutil/Makefile b/krb5/usr.bin/ktutil/Makefile --- a/krb5/usr.bin/ktutil/Makefile +++ b/krb5/usr.bin/ktutil/Makefile @@ -18,7 +18,8 @@ CFLAGS+=-I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/util \ - -I${KRB5_OBJTOP}/util + -I${KRB5_OBJTOP}/util \ + -I${.OBJDIR:H:H}/util/build-tools MAN= ktutil.1 diff --git a/krb5/usr.bin/kvno/Makefile b/krb5/usr.bin/kvno/Makefile --- a/krb5/usr.bin/kvno/Makefile +++ b/krb5/usr.bin/kvno/Makefile @@ -14,7 +14,8 @@ SRCS= kvno.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kvno.1 diff --git a/krb5/usr.bin/sclient/Makefile b/krb5/usr.bin/sclient/Makefile --- a/krb5/usr.bin/sclient/Makefile +++ b/krb5/usr.bin/sclient/Makefile @@ -14,7 +14,8 @@ SRCS= sclient.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= sclient.1 diff --git a/krb5/usr.bin/sim_client/Makefile b/krb5/usr.bin/sim_client/Makefile --- a/krb5/usr.bin/sim_client/Makefile +++ b/krb5/usr.bin/sim_client/Makefile @@ -14,7 +14,8 @@ SRCS= sim_client.c CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= diff --git a/krb5/usr.sbin/gss-server/Makefile b/krb5/usr.sbin/gss-server/Makefile --- a/krb5/usr.sbin/gss-server/Makefile +++ b/krb5/usr.sbin/gss-server/Makefile @@ -21,7 +21,8 @@ -I${KRB5_OBJTOP}/lib \ -I${KRB5_DIR}/lib/gssapi/generic \ -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/mechglue + -I${KRB5_DIR}/lib/gssapi/mechglue \ + -I${.OBJDIR:H:H}/util/build-tools MAN= diff --git a/krb5/usr.sbin/kadmin.local/Makefile b/krb5/usr.sbin/kadmin.local/Makefile --- a/krb5/usr.sbin/kadmin.local/Makefile +++ b/krb5/usr.sbin/kadmin.local/Makefile @@ -19,7 +19,8 @@ MAN= kadmin.local.8 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile --- a/krb5/usr.sbin/kdb5_util/Makefile +++ b/krb5/usr.sbin/kdb5_util/Makefile @@ -33,7 +33,8 @@ CFLAGS+=-I. \ -I${KRB5_DIR}/include \ -I${KRB5_DIR}/lib \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= kdb5_util.8 diff --git a/krb5/usr.sbin/sim_server/Makefile b/krb5/usr.sbin/sim_server/Makefile --- a/krb5/usr.sbin/sim_server/Makefile +++ b/krb5/usr.sbin/sim_server/Makefile @@ -17,7 +17,8 @@ CFLAGS+=-I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ - -I${KRB5_DIR}/appl/simple + -I${KRB5_DIR}/appl/simple \ + -I${.OBJDIR:H:H}/util/build-tools MAN= diff --git a/krb5/usr.sbin/sserver/Makefile b/krb5/usr.sbin/sserver/Makefile --- a/krb5/usr.sbin/sserver/Makefile +++ b/krb5/usr.sbin/sserver/Makefile @@ -18,7 +18,8 @@ MAN= sserver.8 CFLAGS+=-I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${.OBJDIR:H:H}/util/build-tools MAN= sserver.8 diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile --- a/krb5/util/build-tools/Makefile +++ b/krb5/util/build-tools/Makefile @@ -14,12 +14,35 @@ SCRIPTS= krb5-config.sh BINDIR?= /usr/bin +INCS= autoconf.h + MAN= krb5-config.1 -CLEANFILES= krb5-config.1 +CLEANFILES= krb5-config.sh krb5-config.1 autoconf.h + +KRB5_RELEASE!= awk '$$0 ~ /\#define KRB5_MAJOR_RELEASE/ {major = $$3}; $$0 ~ /\#define KRB5_MINOR_RELEASE/ {minor = $$3}; $$0 ~ /\#define KRB5_PATCHLEVEL/ {patchlevel = $$3}; END {print major "." minor "." patchlevel}' ${KRB5_DIR}/patchlevel.h + +krb5-config.sh: krb5-config.in autoconf.h + sed 's|@prefix@|/usr|; s|@exec_prefix@|$${prefix}|; \ + s|@includedir@|$${prefix}/include|; \ + s|@libdir@|$${exec_prefix}/lib|; \ + s|@CC_LINK@|$$(CC) $$(PROG_LIBPATH) $$(PROG_RPATH_FLAGS) $$(CFLAGS) $$(LDFLAGS)|; \ + s|@KDB5_DB_LIB@||; s|@RPATH_FLAG@||; s|@PROG_RPATH_FLAGS@||; \ + s|@PTHREAD_CFLAGS@|-pthread|; s|@DL_LIB@||; \ + s|@DEFCCNAME@|FILE\:/tmp/krb5cc_%{uid}|; \ + s|@DEFKTNAME@|FILE\:/etc/krb5.keytab|; \ + s|@DEFCKTNAME@|FILE\:/var/krb5/user/%{euid}/client.keytab|; \ + s|@LIBS@||; s|@COM_ERR_LIB@|-lcom_err|; \ + s|@KRB5_VERSION@|${KRB5_RELEASE}|' \ + ${KRB5_DIR}/build-tools/krb5-config.in > ${.TARGET} + +autoconf.h: autoconf.hin + sed 's/VersionString/${KRB5_RELEASE}/' ${.ALLSRC} > ${.TARGET} krb5-config.1: krb5-config.man +installincludes: + .include .SUFFIXES: .sh .man .1 @@ -28,5 +51,7 @@ @cp ${.ALLSRC} ${.TARGET} .PATH: ${KRB5_DIR}/build-tools \ + ${KRB5_SRCTOP}/include \ ${KRB5_DIR}/man \ - ${KRB5_OBJTOP}/build-tools + ${.OBJDIR:H}/build-tools \ + ${KRB5_SRCTOP} diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh deleted file mode 100755 --- a/krb5/util/build-tools/krb5-config.sh +++ /dev/null @@ -1,263 +0,0 @@ -#!/bin/sh - -# Copyright 2001, 2002, 2003 by the Massachusetts Institute of Technology. -# All Rights Reserved. -# -# Export of this software from the United States of America may -# require a specific license from the United States Government. -# It is the responsibility of any person or organization contemplating -# export to obtain such a license before exporting. -# -# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and -# distribute this software and its documentation for any purpose and -# without fee is hereby granted, provided that the above copyright -# notice appear in all copies and that both that copyright notice and -# this permission notice appear in supporting documentation, and that -# the name of M.I.T. not be used in advertising or publicity pertaining -# to distribution of the software without specific, written prior -# permission. Furthermore if you modify this software you must label -# your software as modified software and not distribute it in such a -# fashion that it might be confused with the original M.I.T. software. -# M.I.T. makes no representations about the suitability of -# this software for any purpose. It is provided "as is" without express -# or implied warranty. -# -# - -# Configurable parameters set by autoconf -# Disreagard the above. Edit this by hand in the bespoke FreeBSD build. -version_string="Kerberos 5 release 1.21.3" - -prefix=/usr -exec_prefix=${prefix} -includedir=${prefix}/include -libdir=${exec_prefix}/lib -CC_LINK='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' -KDB5_DB_LIB= -RPATH_FLAG='' -PROG_RPATH_FLAGS='' -PTHREAD_CFLAGS='-pthread' -DL_LIB='' -DEFCCNAME='FILE:/tmp/krb5cc_%{uid}' -DEFKTNAME='FILE:/etc/krb5.keytab' -DEFCKTNAME='FILE:/var/krb5/user/%{euid}/client.keytab' - -LIBS='-lintl -L/usr/local/lib' -GEN_LIB= - -# Defaults for program -library=krb5 - -# Some constants -vendor_string="Massachusetts Institute of Technology" - -# Process arguments -# Yes, we are sloppy, library specifications can come before options -while test $# != 0; do - case $1 in - --all) - do_all=1 - ;; - --cflags) - do_cflags=1 - ;; - --defccname) - do_defccname=1 - ;; - --defcktname) - do_defcktname=1 - ;; - --defktname) - do_defktname=1 - ;; - --deps) # historically a no-op - ;; - --exec-prefix) - do_exec_prefix=1 - ;; - --help) - do_help=1 - ;; - --libs) - do_libs=1 - ;; - --prefix) - do_prefix=1 - ;; - --vendor) - do_vendor=1 - ;; - --version) - do_version=1 - ;; - krb5) - library=krb5 - ;; - gssapi) - library=gssapi - ;; - gssrpc) - library=gssrpc - ;; - kadm-client) - library=kadm_client - ;; - kadm-server) - library=kadm_server - ;; - kdb) - library=kdb - ;; - *) - echo "$0: Unknown option \`$1' -- use \`--help' for usage" - exit 1 - esac - shift -done - -# If required options - provide help -if test -z "$do_all" -a -z "$do_version" -a -z "$do_vendor" -a \ - -z "$do_prefix" -a -z "$do_vendor" -a -z "$do_exec_prefix" -a \ - -z "$do_defccname" -a -z "$do_defktname" -a -z "$do_defcktname" -a \ - -z "$do_cflags" -a -z "$do_libs"; then - do_help=1 -fi - - -if test -n "$do_help"; then - echo "Usage: $0 [OPTIONS] [LIBRARIES]" - echo "Options:" - echo " [--help] Help" - echo " [--all] Display version, vendor, and various values" - echo " [--version] Version information" - echo " [--vendor] Vendor information" - echo " [--prefix] Kerberos installed prefix" - echo " [--exec-prefix] Kerberos installed exec_prefix" - echo " [--defccname] Show built-in default ccache name" - echo " [--defktname] Show built-in default keytab name" - echo " [--defcktname] Show built-in default client keytab name" - echo " [--cflags] Compile time CFLAGS" - echo " [--libs] List libraries required to link [LIBRARIES]" - echo "Libraries:" - echo " krb5 Kerberos 5 application" - echo " gssapi GSSAPI application with Kerberos 5 bindings" - echo " gssrpc GSSAPI RPC application" - echo " kadm-client Kadmin client" - echo " kadm-server Kadmin server" - echo " kdb Application that accesses the kerberos database" - exit 0 -fi - -if test -n "$do_all"; then - all_exit= - do_version=1 - do_prefix=1 - do_exec_prefix=1 - do_vendor=1 - title_version="Version: " - title_prefix="Prefix: " - title_exec_prefix="Exec_prefix: " - title_vendor="Vendor: " -else - all_exit="exit 0" -fi - -if test -n "$do_version"; then - echo "$title_version$version_string" - $all_exit -fi - -if test -n "$do_vendor"; then - echo "$title_vendor$vendor_string" - $all_exit -fi - -if test -n "$do_prefix"; then - echo "$title_prefix$prefix" - $all_exit -fi - -if test -n "$do_exec_prefix"; then - echo "$title_exec_prefix$exec_prefix" - $all_exit -fi - -if test -n "$do_defccname"; then - echo "$DEFCCNAME" - $all_exit -fi - -if test -n "$do_defktname"; then - echo "$DEFKTNAME" - $all_exit -fi - -if test -n "$do_defcktname"; then - echo "$DEFCKTNAME" - $all_exit -fi - -if test -n "$do_cflags"; then - if test x"$includedir" != x"/usr/include" ; then - echo "-I${includedir}" - else - echo '' - fi -fi - - -if test -n "$do_libs"; then - # Assumes /usr/lib is the standard library directory everywhere... - if test "$libdir" = /usr/lib; then - libdirarg= - else - libdirarg="-L$libdir" - fi - # Ugly gross hack for our build tree - lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ - -e 's/\$(PURE)//' \ - -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \ - -e 's#\$(PROG_RPATH)#'$libdir'#' \ - -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)##' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)##'` - - if test $library = 'kdb'; then - lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" - library=krb5 - fi - - if test $library = 'kadm_server'; then - lib_flags="$lib_flags -lkadm5srv_mit -lkdb5 $KDB5_DB_LIB" - library=gssrpc - fi - - if test $library = 'kadm_client'; then - lib_flags="$lib_flags -lkadm5clnt_mit" - library=gssrpc - fi - - if test $library = 'gssrpc'; then - lib_flags="$lib_flags -lgssrpc" - library=gssapi - fi - - if test $library = 'gssapi'; then - lib_flags="$lib_flags -lgssapi_krb5" - library=krb5 - fi - - if test $library = 'krb5'; then - lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" - fi - - # If we ever support a flag to generate output suitable for static - # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" - # here. - - echo $lib_flags -fi - -exit 0 diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile --- a/krb5/util/et/Makefile +++ b/krb5/util/et/Makefile @@ -36,6 +36,8 @@ CFLAGS+=-I${KRB5_DIR}/util/et \ -I${KRB5_DIR}/include \ -I${.CURDIR:H:H}/include \ + -I${.OBJDIR:H}/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} .include diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile --- a/krb5/util/profile/Makefile +++ b/krb5/util/profile/Makefile @@ -36,6 +36,8 @@ -I${KRB5_DIR}/util/et \ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/include \ + -I${.OBJDIR:H}/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} GEN= profile.h ${GEN_PROF_ERR_C} ${GEN_PROF_ERR_H} diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile --- a/krb5/util/ss/Makefile +++ b/krb5/util/ss/Makefile @@ -44,6 +44,8 @@ -I${KRB5_DIR}/util \ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/include \ + -I${.OBJDIR:H}/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR:H} \ -I${.OBJDIR} diff --git a/krb5/util/support/Makefile b/krb5/util/support/Makefile --- a/krb5/util/support/Makefile +++ b/krb5/util/support/Makefile @@ -44,6 +44,8 @@ CFLAGS+=-I${KRB5_DIR}/util/support \ -I${KRB5_DIR}/include \ -I${.CURDIR:H:H}/include \ + -I${.OBJDIR:H}/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} .include diff --git a/krb5/util/verto/Makefile b/krb5/util/verto/Makefile --- a/krb5/util/verto/Makefile +++ b/krb5/util/verto/Makefile @@ -39,6 +39,8 @@ -I${KRB5_DIR}/util/verto \ -I${KRB5_DIR}/include \ -I${.CURDIR:H:H}/include \ + -I${.OBJDIR:H}/build-tools \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ -I${.OBJDIR} GEN= rename.h diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -62,6 +62,8 @@ CFLAGS= -I${SRCDIR} \ -I${.CURDIR} \ + -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools \ + -I${.OBJDIR:H:H:H:H:H}/krb5/util/build-tools \ -fno-strict-aliasing \ -DHAVE_CONFIG_H diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -38,6 +38,8 @@ WARNS= 2 CFLAGS+= -I${SRCTOP}/crypto/krb5/src/include CFLAGS+= -I${SRCTOP}/krb5/include +CFLAGS+= -I${.OBJDIR:H:H:H:H}/krb5/util/build-tools +CFLAGS+= -I${.OBJDIR:H:H:H:H:H}/krb5/util/build-tools CFLAGS+= -include ${SRCTOP}/crypto/krb5/src/include/k5-int.h CFLAGS+= -DMK_MITKRB5=yes .endif