Index: stable/10/kerberos5/Makefile.inc =================================================================== --- stable/10/kerberos5/Makefile.inc (revision 287427) +++ stable/10/kerberos5/Makefile.inc (revision 287428) @@ -1,50 +1,50 @@ # $FreeBSD$ NO_LINT= KRB5DIR= ${.CURDIR}/../../../crypto/heimdal CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include .if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 -LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib +LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib .endif LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a .if defined(SRCS) ETSRCS= \ ${KRB5DIR}/lib/asn1/asn1_err.et \ ${KRB5DIR}/lib/hdb/hdb_err.et \ ${KRB5DIR}/lib/kadm5/kadm5_err.et \ ${KRB5DIR}/lib/krb5/heim_err.et \ ${KRB5DIR}/lib/krb5/k524_err.et \ ${KRB5DIR}/lib/krb5/krb5_err.et \ ${KRB5DIR}/lib/krb5/krb_err.et \ ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \ ${KRB5DIR}/lib/hx509/hx509_err.et \ ${KRB5DIR}/lib/wind/wind_err.et \ ${KRB5DIR}/lib/ntlm/ntlm_err.et .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" .ORDER: ${_ET}.c ${_ET}.h ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c .endif .endfor .endfor .endif # defined(SRCS) ASN1_COMPILE= asn1_compile MAKE_ROKEN= make-roken SLC= slc Index: stable/10/kerberos5/lib/libhdb/Makefile =================================================================== --- stable/10/kerberos5/lib/libhdb/Makefile (revision 287427) +++ stable/10/kerberos5/lib/libhdb/Makefile (revision 287428) @@ -1,103 +1,103 @@ # $FreeBSD$ LIB= hdb -LDFLAGS= -Wl,--no-undefined +LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite +LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite ${LDAPLDADD} DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 MLINKS= HDB.3 hdb__del.3 \ HDB.3 hdb__get.3 \ HDB.3 hdb__put.3 \ HDB.3 hdb_auth_status.3 \ HDB.3 hdb_check_constrained_delegation.3 \ HDB.3 hdb_check_pkinit_ms_upn_match.3 \ HDB.3 hdb_check_s4u2self.3 \ HDB.3 hdb_close.3 \ HDB.3 hdb_destroy.3 \ HDB.3 hdb_fetch_kvno.3 \ HDB.3 hdb_firstkey.3 \ HDB.3 hdb_free.3 \ HDB.3 hdb_get_realms.3 \ HDB.3 hdb_lock.3 \ HDB.3 hdb_name.3 \ HDB.3 hdb_nextkey.3 \ HDB.3 hdb_open.3 \ HDB.3 hdb_password.3 \ HDB.3 hdb_remove.3 \ HDB.3 hdb_rename.3 \ HDB.3 hdb_store.3 \ HDB.3 hdb_unlock.3 INCS= hdb-protos.h \ hdb.h \ hdb_asn1.h \ hdb_err.h SRCS= common.c \ db.c \ db3.c \ dbinfo.c \ ext.c \ hdb-ldap.c \ hdb.c \ hdb_err.c \ hdb_err.h \ hdb-sqlite.c \ hdb-keytab.c \ hdb-mitdb.c \ keys.c \ keytab.c \ mkey.c \ ndbm.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" GEN= asn1_Salt.x \ asn1_Key.x \ asn1_Event.x \ asn1_HDBFlags.x \ asn1_GENERATION.x \ asn1_HDB_Ext_PKINIT_acl.x \ asn1_HDB_Ext_PKINIT_cert.x \ asn1_HDB_Ext_PKINIT_hash.x \ asn1_HDB_Ext_Constrained_delegation_acl.x \ asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Aliases.x \ asn1_HDB_extension.x \ asn1_HDB_extensions.x \ asn1_hdb_entry.x \ asn1_hdb_entry_alias.x \ asn1_hdb_keyset.x \ hdb_asn1.hx \ hdb_asn1-priv.hx CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \ hdb_asn1-template.[ch]* .ORDER: ${GEN} ${GEN}: hdb.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1 .SUFFIXES: .h .c .x .hx .x.c: cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET} .hx.h: cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/hdb ${KRB5DIR}/doc/doxyout/hdb/man/man3/ Index: stable/10/kerberos5/libexec/digest-service/Makefile =================================================================== --- stable/10/kerberos5/libexec/digest-service/Makefile (revision 287427) +++ stable/10/kerberos5/libexec/digest-service/Makefile (revision 287428) @@ -1,19 +1,20 @@ # $FreeBSD$ PROG= digest-service MAN= CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/roken DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ ${LIBVERS} -lheimntlm +LDFLAGS=${LDAPLDFLAGS} USEPRIVATELIB= heimipcs .include .PATH: ${KRB5DIR}/kdc Index: stable/10/kerberos5/libexec/kdc/Makefile =================================================================== --- stable/10/kerberos5/libexec/kdc/Makefile (revision 287427) +++ stable/10/kerberos5/libexec/kdc/Makefile (revision 287428) @@ -1,19 +1,20 @@ # $FreeBSD$ PROG= kdc MAN= kdc.8 SRCS= config.c \ connect.c \ announce.c \ main.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LDFLAGS=${LDAPLDFLAGS} .include .PATH: ${KRB5DIR}/kdc Index: stable/10/kerberos5/usr.bin/string2key/Makefile =================================================================== --- stable/10/kerberos5/usr.bin/string2key/Makefile (revision 287427) +++ stable/10/kerberos5/usr.bin/string2key/Makefile (revision 287428) @@ -1,16 +1,16 @@ # $FreeBSD$ PROG= string2key MAN= string2key.8 CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/windc -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} .include .PATH: ${KRB5DIR}/kdc Index: stable/10/kerberos5/usr.sbin/iprop-log/Makefile =================================================================== --- stable/10/kerberos5/usr.sbin/iprop-log/Makefile (revision 287427) +++ stable/10/kerberos5/usr.sbin/iprop-log/Makefile (revision 287428) @@ -1,25 +1,26 @@ # $FreeBSD$ PROG= iprop-log MAN= iprop-log.8 SRCS= iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ -I. DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \ ${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT} LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ ${LIBVERS} -ledit +LDFLAGS=${LDAPLDFLAGS} iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in} .for ext in c o iprop-commands.${ext}: iprop-commands.h .endfor .include .PATH: ${KRB5DIR}/lib/kadm5 Index: stable/10 =================================================================== --- stable/10 (revision 287427) +++ stable/10 (revision 287428) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r287208,287216