[src/netbsd-1-5]: src/lib/libkrb5 Pull up revisions 1.4-1.10 (requested by as...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c6660e74390
branches:  netbsd-1-5
changeset: 491159:1c6660e74390
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:25:36 2001 +0000

description:
Pull up revisions 1.4-1.10 (requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 lib/libkrb5/Makefile |  43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diffs (114 lines):

diff -r 0ffbda3246d5 -r 1c6660e74390 lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Thu Apr 05 23:25:33 2001 +0000
+++ b/lib/libkrb5/Makefile      Thu Apr 05 23:25:36 2001 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2000/06/19 23:50:52 thorpej Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2001/04/05 23:25:36 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/krb5
-.PATH: ${DIST}/heimdal/lib/des
 .PATH: ${DIST}/heimdal/doc
 
 WARNS?=  1
@@ -9,7 +11,7 @@
 
 LIB=   krb5
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && make print-objdir
+COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 
 krb5_err.c krb5_err.h: krb5_err.et
        ${COMPILEET}/compile_et ${DIST}/heimdal/lib/krb5/krb5_err.et
@@ -22,10 +24,12 @@
 DPSRCS=        krb5_err.h heim_err.h
 
 SRCS=                                          \
+       acl.c                                   \
        add_et_list.c                           \
        addr_families.c                         \
        address.c                               \
        aname_to_localname.c                    \
+       appdefault.c                            \
        asn1_glue.c                             \
        auth_context.c                          \
        build_ap_req.c                          \
@@ -43,6 +47,7 @@
        creds.c                                 \
        crypto.c                                \
        data.c                                  \
+       eai_to_heim_errno.c                     \
        expand_hostname.c                       \
        fcache.c                                \
        free.c                                  \
@@ -94,6 +99,7 @@
        rd_safe.c                               \
        read_message.c                          \
        recvauth.c                              \
+       replay.c                                \
        send_to_kdc.c                           \
        sendauth.c                              \
        set_default_realm.c                     \
@@ -110,7 +116,6 @@
        version.c                               \
        warn.c                                  \
        write_message.c                         \
-       rnd_keys.c                              \
        $(ERR_FILES)
 
 INCS=  krb5.h                                  \
@@ -120,26 +125,33 @@
        heim_err.h                              \
        krb5-types.h
 
-MAN=   krb5.conf.5                             \
-       krb5_warn.3                             \
+MAN=                                           \
+       krb5.conf.5                             \
+       krb5_425_conv_principal.3               \
+       krb5_appdefault.3                       \
+       krb5_build_principal.3                  \
+       krb5_config.3                           \
+       krb5_free_principal.3                   \
        krb5_openlog.3                          \
-       krb5_425_conv_principal.3               \
-       krb5_build_principal.3                  \
-       krb5_free_principal.3                   \
        krb5_parse_name.3                       \
        krb5_sname_to_principal.3               \
-       krb5_unparse_name.3
+       krb5_unparse_name.3                     \
+       krb5_warn.3                             \
+       kerberos.8                              \
+       verify_krb5_conf.8                      \
+       krb5_auth_context.3                     \
+       krb5_context.3                          \
+       krb5_init_context.3                     \
 
 krb5-types.h:
        cp ${.CURDIR}/../../include/heimdal/$@ $@
 
 INCSDIR= /usr/include/krb5
 
-ASN1!= cd ${.CURDIR}/../libasn1 && ${MAKE} print-objdir
+ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${DIST}/heimdal/lib/krb5             \
-        -I${DIST}/krb4/lib/krb                 \
         -I${DIST}/openssl/crypto/md4           \
         -I${DIST}/openssl/crypto/md5           \
         -I${DIST}/openssl/crypto/sha           \
@@ -172,3 +184,10 @@
 
 .include <bsd.lib.mk>
 .include <bsd.info.mk>
+
+.if ${MKSHARE} != "no"
+FILES=  ${DIST}/heimdal/krb5.conf
+FILESDIR=/usr/share/examples/kerberos
+.endif
+
+.include <bsd.files.mk>