Update the kerberos5 build framework to work with heimdal 0.6.3.
authorEirik Nygaard <eirikn@dragonflybsd.org>
Sun, 16 Jan 2005 14:25:47 +0000 (14:25 +0000)
committerEirik Nygaard <eirikn@dragonflybsd.org>
Sun, 16 Jan 2005 14:25:47 +0000 (14:25 +0000)
Based on: Kerberos5 build framework from FreeBSD.

68 files changed:
Makefile.inc1
kerberos5/Makefile
kerberos5/Makefile.inc
kerberos5/README
kerberos5/bintools/Makefile [new file with mode: 0644]
kerberos5/bintools/Makefile.inc [new file with mode: 0644]
kerberos5/bintools/asn1_compile/Makefile [new file with mode: 0644]
kerberos5/bintools/make-print-version/Makefile [new file with mode: 0644]
kerberos5/bintools/make-roken/Makefile [new file with mode: 0644]
kerberos5/doc/Makefile [new file with mode: 0644]
kerberos5/include/Makefile [deleted file]
kerberos5/include/config.h
kerberos5/include/crypto-headers.h
kerberos5/include/krb5-private.h [deleted file]
kerberos5/include/krb5-types.h
kerberos5/include/version.h
kerberos5/lib/Makefile
kerberos5/lib/Makefile.inc
kerberos5/lib/libasn1/Makefile
kerberos5/lib/libgssapi/Makefile
kerberos5/lib/libhdb/Makefile
kerberos5/lib/libkadm5clnt/Makefile
kerberos5/lib/libkadm5srv/Makefile
kerberos5/lib/libkafs5/Makefile
kerberos5/lib/libkrb5/Makefile
kerberos5/lib/libroken/Makefile
kerberos5/lib/libsl/Makefile
kerberos5/lib/libtelnet/Makefile [deleted file]
kerberos5/lib/libvers/Makefile
kerberos5/libexec/Makefile
kerberos5/libexec/Makefile.inc
kerberos5/libexec/hprop/Makefile
kerberos5/libexec/hpropd/Makefile
kerberos5/libexec/ipropd-master/Makefile
kerberos5/libexec/ipropd-slave/Makefile
kerberos5/libexec/k5admind/Makefile [deleted file]
kerberos5/libexec/k5passwdd/Makefile [deleted file]
kerberos5/libexec/kadmind/Makefile [new file with mode: 0644]
kerberos5/libexec/kdc/Makefile
kerberos5/libexec/kpasswdd/Makefile [new file with mode: 0644]
kerberos5/libexec/telnetd/Makefile [deleted file]
kerberos5/tools/Makefile [new file with mode: 0644]
kerberos5/tools/Makefile.inc [new file with mode: 0644]
kerberos5/tools/asn1_compile/Makefile [new file with mode: 0644]
kerberos5/tools/make-print-version/Makefile [new file with mode: 0644]
kerberos5/tools/make-roken/Makefile [new file with mode: 0644]
kerberos5/usr.bin/Makefile
kerberos5/usr.bin/Makefile.inc
kerberos5/usr.bin/k5admin/Makefile [deleted file]
kerberos5/usr.bin/k5destroy/Makefile [deleted file]
kerberos5/usr.bin/k5init/Makefile [deleted file]
kerberos5/usr.bin/k5list/Makefile [deleted file]
kerberos5/usr.bin/k5passwd/Makefile [deleted file]
kerberos5/usr.bin/k5su/Makefile [deleted file]
kerberos5/usr.bin/kadmin/Makefile [new file with mode: 0644]
kerberos5/usr.bin/kdestroy/Makefile [new file with mode: 0644]
kerberos5/usr.bin/kinit/Makefile [new file with mode: 0644]
kerberos5/usr.bin/klist/Makefile [new file with mode: 0644]
kerberos5/usr.bin/kpasswd/Makefile [new file with mode: 0644]
kerberos5/usr.bin/krb5-config/Makefile
kerberos5/usr.bin/ksu/Makefile [new file with mode: 0644]
kerberos5/usr.bin/telnet/Makefile [deleted file]
kerberos5/usr.bin/verify_krb5_conf/Makefile [new file with mode: 0644]
kerberos5/usr.sbin/Makefile
kerberos5/usr.sbin/Makefile.inc
kerberos5/usr.sbin/k5stash/Makefile [deleted file]
kerberos5/usr.sbin/kstash/Makefile [new file with mode: 0644]
kerberos5/usr.sbin/ktutil/Makefile

index 5d61eff..d0b6374 100644 (file)
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.52 2005/01/05 22:03:51 joerg Exp $
+# $DragonFly: src/Makefile.inc1,v 1.53 2005/01/16 14:25:45 eirikn Exp $
 #
 # Make command line options:
 #      -DMAKE_KERBEROS5 to build Kerberos5
@@ -831,7 +831,7 @@ _fortran= gnu/usr.bin/cc34/f771
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
     !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
-_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
+_libkrb5= kerberos5/bintools kerberos5/lib/libroken kerberos5/lib/libvers \
     kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
 .endif
 
@@ -841,7 +841,7 @@ _sysinstall= release/sysinstall
 
 build-tools:
 .for _tool in ${_gcc2_tools} ${_gcc34_tools} \
-             ${_fortran} ${_libroken4} ${_libkrb5} \
+             ${_fortran} ${_libkrb5} \
              ${_share} ${_sysinstall}
        ${ECHODIR} "===> ${_tool} (build-tools)"; \
                cd ${.CURDIR}/${_tool}; \
@@ -923,6 +923,8 @@ _prebuild_libs=     lib/libarchive
 _generic_libs= gnu/lib
 
 .if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+_prebuild_libs+=       lib/libutil
+_prebuild_libs+=       kerberos5/tools
 _prebuild_libs+=       kerberos5/lib/libasn1
 _prebuild_libs+=       kerberos5/lib/libgssapi
 _prebuild_libs+=       kerberos5/lib/libkrb5
index aaea2c3..0edeaad 100644 (file)
@@ -1,31 +1,32 @@
-# $FreeBSD: src/kerberos5/Makefile,v 1.8.2.1 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/Makefile,v 1.2 2003/06/17 04:26:16 dillon Exp $
+# $FreeBSD: src/kerberos5/Makefile,v 1.16 2004/01/31 08:15:52 ru Exp $
+# $DragonFly: src/kerberos5/Makefile,v 1.3 2005/01/16 14:25:45 eirikn Exp $
 
-SUBDIR=        lib libexec usr.bin usr.sbin
+SUBDIR=        doc tools lib libexec usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
-KPROGS=        secure/usr.bin/ssh secure/usr.sbin/sshd
+KPROGS=        lib/libpam \
+       secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
 
 # This target is used to rebuild these programs WITH Kerberos.
 kerberize:
 .for entry in ${KPROGS}
        cd ${.CURDIR}/../${entry}; \
-       ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 cleandir; \
-       ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 obj; \
-       ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 depend; \
-       ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 all; \
-       ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 install
+       ${MAKE} cleandir; \
+       ${MAKE} obj; \
+       ${MAKE} depend; \
+       ${MAKE} all; \
+       ${MAKE} install
 .endfor
 
 # This target is used to rebuild these programs WITHOUT Kerberos.
 dekerberize:
 .for entry in ${KPROGS}
        cd ${.CURDIR}/../${entry}; \
-       ${MAKE} ${MFLAGS} cleandir; \
-       ${MAKE} ${MFLAGS} obj; \
-       ${MAKE} ${MFLAGS} depend; \
-       ${MAKE} ${MFLAGS} all; \
-       ${MAKE} ${MFLAGS} install
+       ${MAKE} -DNO_KERBEROS cleandir; \
+       ${MAKE} -DNO_KERBEROS obj; \
+       ${MAKE} -DNO_KERBEROS depend; \
+       ${MAKE} -DNO_KERBEROS all; \
+       ${MAKE} -DNO_KERBEROS install
 .endfor
 
 .include <bsd.subdir.mk>
index 09e0bdb..f38dfc4 100644 (file)
-# $FreeBSD: src/kerberos5/Makefile.inc,v 1.5.2.5 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/Makefile.inc,v 1.5 2004/03/26 21:58:09 dillon Exp $
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $
+# $DragonFly: src/kerberos5/Makefile.inc,v 1.6 2005/01/16 14:25:45 eirikn Exp $
 
-DISTRIBUTION?= krb5
+NO_LINT=
 
-.if !defined(INCLUDEOBJDIR)
+KRB5DIR=       ${.CURDIR}/../../../crypto/heimdal-0.6.3
 
-KRB5DIR=       ${.CURDIR}/../../../crypto/heimdal
-ROKENDIR=      ${.CURDIR}/../../lib/libroken
-TELNETDIR=     ${.CURDIR}/../../../crypto/telnet
+CFLAGS+=       -DHAVE_CONFIG_H -I${.CURDIR}/../../include
+CFLAGS+=       -DINET6
 
-CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
-
-CFLAGS+=-DINET6
-
-.if exists(${.OBJDIR}/../../include)
-INCLUDEOBJDIR= ${.OBJDIR}/../../include
-.else
-INCLUDEOBJDIR= ${.CURDIR}/../../include
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libasn1)
-ASN1OBJDIR=    ${.OBJDIR}/../../lib/libasn1
-.else
-ASN1OBJDIR=    ${.CURDIR}/../../lib/libasn1
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libhdb)
-HDBOBJDIR=     ${.OBJDIR}/../../lib/libhdb
-.else
-HDBOBJDIR=     ${.CURDIR}/../../lib/libhdb
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libroken)
-ROKENOBJDIR=   ${.OBJDIR}/../../lib/libroken
-.else
-ROKENOBJDIR=   ${.CURDIR}/../../lib/libroken
+.if defined(WITH_OPENLDAP)
+OPENLDAPBASE?= /usr/local
+LDAPLDADD=     -lldap -llber
+LDAPDPADD=     ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
+LDAPCFLAGS=    -I${OPENLDAPBASE}/include -DOPENLDAP=1
+LDAPLDFLAGS=   -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 
 .if exists(${.OBJDIR}/../../lib/libvers)
-VERSOBJDIR=    ${.OBJDIR}/../../lib/libvers
+LIBVERS=       ${.OBJDIR}/../../lib/libvers/libvers.a
 .else
-VERSOBJDIR=    ${.CURDIR}/../../lib/libvers
+LIBVERS=       ${.CURDIR}/../../lib/libvers/libvers.a
 .endif
 
-.if exists(${.OBJDIR}/../../lib/libkrb5)
-KRB5OBJDIR=    ${.OBJDIR}/../../lib/libkrb5
-.else
-KRB5OBJDIR=    ${.CURDIR}/../../lib/libkrb5
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkadm5clnt)
-KADM5COBJDIR=  ${.OBJDIR}/../../lib/libkadm5clnt
-.else
-KADM5COBJDIR=  ${.CURDIR}/../../lib/libkadm5clnt
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkadm5srv)
-KADM5SOBJDIR=  ${.OBJDIR}/../../lib/libkadm5srv
+.if exists(${.OBJDIR}/../../lib/libsl)
+LIBSL=         ${.OBJDIR}/../../lib/libsl/libsl.a
 .else
-KADM5SOBJDIR=  ${.CURDIR}/../../lib/libkadm5srv
+LIBSL=         ${.CURDIR}/../../lib/libsl/libsl.a
 .endif
 
-.if exists(${.OBJDIR}/../../lib/libkafs5)
-KAFS5OBJDIR=   ${.OBJDIR}/../../lib/libkafs5
+.if exists(${.OBJDIR}/../../tools/make-print-version/make-print-version)
+MAKEPRINTVERSION=${.OBJDIR}/../../tools/make-print-version/make-print-version
+.elif exists(${.OBJDIR}/../../bintools/make-print-version/make-print-version)
+MAKEPRINTVERSION=${.OBJDIR}/../../bintools/make-print-version/make-print-version
 .else
-KAFS5OBJDIR=   ${.CURDIR}/../../lib/libkafs5
+MAKEPRINTVERSION=make-print-version
 .endif
-
-.if exists(${.OBJDIR}/../../lib/libkrb5util)
-KRB5UTILOBJDIR=        ${.OBJDIR}/../../lib/libkrb5util
+.if exists(${.OBJDIR}/../../tools/make-roken/make-roken)
+MAKEROKEN=     ${.OBJDIR}/../../tools/make-roken/make-roken
+.elif exists(${.OBJDIR}/../../bintools/make-roken/make-roken)
+MAKEROKEN=     ${.OBJDIR}/../../bintools/make-roken/make-roken
 .else
-KRB5UTILOBJDIR=        ${.CURDIR}/../../lib/libkrb5util
+MAKEROKEN=     make-roken
 .endif
-
-.if exists(${.OBJDIR}/../../lib/libkdb5)
-KDB5OBJDIR=    ${.OBJDIR}/../../lib/libkdb5
+.if exists(${.OBJDIR}/../../tools/asn1_compile/asn1_compile)
+ASN1COMPILE=   ${.OBJDIR}/../../tools/asn1_compile/asn1_compile
+.elif exists(${.OBJDIR}/../../bintools/asn1_compile/asn1_compile)
+ASN1COMPILE=   ${.OBJDIR}/../../bintools/asn1_compile/asn1_compile
 .else
-KDB5OBJDIR=    ${.CURDIR}/../../lib/libkdb5
+ASN1COMPILE=   asn1_compile
 .endif
 
-.if exists(${.OBJDIR}/../../lib/libsl)
-SLOBJDIR=      ${.OBJDIR}/../../lib/libsl
-.else
-SLOBJDIR=      ${.CURDIR}/../../lib/libsl
+.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
+
+.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
 
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-LIBTELNET=     ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
-.else
-LIBTELNET=     ${.CURDIR}/../../lib/libtelnet/libtelnet.a
-.endif
-
-COMPILE_ET=     compile_et
-
-.ORDER: asn1_err.c asn1_err.h
-asn1_err.c asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et
-       test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} asn1_err.et
-
-CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et
-
-.ORDER: hdb_err.c hdb_err.h
-hdb_err.c hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et
-       test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} hdb_err.et
-
-CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et
-
-.ORDER: heim_err.c heim_err.h
-heim_err.c heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et
-       test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} heim_err.et
-
-CLEANFILES+=heim_err.h heim_err.c heim_err.et
-
-krb5_err.c krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et
-       test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} krb5_err.et
-.ORDER: krb5_err.c krb5_err.h
-
-CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et
-
-kadm5_err.c kadm5_err.h: \
-       ${KRB5DIR}/lib/kadm5/kadm5_err.et
-       test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} kadm5_err.et
-.ORDER: kadm5_err.c kadm5_err.h
-
-CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
-
-.ORDER: k524_err.c k524_err.h
-k524_err.c k524_err.h: \
-       ${KRB5DIR}/lib/krb5/k524_err.et
-       test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC}
-       ${COMPILE_ET} k524_err.et
-
-CLEANFILES+=k524_err.h k524_err.c k524_err.et
-
-roken.h: make-roken.nx
-       ./make-roken.nx > tmp.h ;\
-       if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
-       else rm -f roken.h; mv tmp.h roken.h; fi
-
-make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
-       awk -f ${.ALLSRC} > ${.TARGET}
-
-make-roken.nx: make-roken.c
-       ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
-
-CLEANFILES+=   make-roken.c make-roken.nx roken.h
-
-.else
-
-KRB5DIR=       ${.CURDIR}/../../crypto/heimdal
-ROKENDIR=      ${.CURDIR}/../../lib/libroken
-
-.endif
+.endif defined(SRCS)
index 9f97cf6..42e7782 100644 (file)
@@ -1,3 +1,5 @@
+$DragonFly: src/kerberos5/README,v 1.2 2005/01/16 14:25:45 eirikn Exp $
+
 This subtree is world-exportable, as it does not contain any
 cryptographic code.
 
diff --git a/kerberos5/bintools/Makefile b/kerberos5/bintools/Makefile
new file mode 100644 (file)
index 0000000..db7ccba
--- /dev/null
@@ -0,0 +1,6 @@
+# $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $
+# $DragonFly: src/kerberos5/bintools/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $
+
+SUBDIR=        make-print-version make-roken asn1_compile
+
+.include <bsd.subdir.mk>
diff --git a/kerberos5/bintools/Makefile.inc b/kerberos5/bintools/Makefile.inc
new file mode 100644 (file)
index 0000000..fa8af98
--- /dev/null
@@ -0,0 +1,5 @@
+# $DragonFly: src/kerberos5/bintools/Attic/Makefile.inc,v 1.1 2005/01/16 14:25:45 eirikn Exp $
+
+BINDIR=        /usr/bin
+
+.include "../Makefile.inc"
diff --git a/kerberos5/bintools/asn1_compile/Makefile b/kerberos5/bintools/asn1_compile/Makefile
new file mode 100644 (file)
index 0000000..d72f649
--- /dev/null
@@ -0,0 +1,3 @@
+# $DragonFly: src/kerberos5/bintools/asn1_compile/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $
+
+.include "../../tools/asn1_compile/Makefile"
diff --git a/kerberos5/bintools/make-print-version/Makefile b/kerberos5/bintools/make-print-version/Makefile
new file mode 100644 (file)
index 0000000..4a4e5de
--- /dev/null
@@ -0,0 +1,5 @@
+# $DragonFly: src/kerberos5/bintools/make-print-version/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $
+
+depend: make-print-version
+
+.include "../../tools/make-print-version/Makefile"
diff --git a/kerberos5/bintools/make-roken/Makefile b/kerberos5/bintools/make-roken/Makefile
new file mode 100644 (file)
index 0000000..85418af
--- /dev/null
@@ -0,0 +1,5 @@
+# $DragonFly: src/kerberos5/bintools/make-roken/Attic/Makefile,v 1.1 2005/01/16 14:25:46 eirikn Exp $
+
+depend: make-roken
+
+.include "../../tools/make-roken/Makefile"
diff --git a/kerberos5/doc/Makefile b/kerberos5/doc/Makefile
new file mode 100644 (file)
index 0000000..3689375
--- /dev/null
@@ -0,0 +1,7 @@
+# $FreeBSD: src/kerberos5/doc/Makefile,v 1.1 2002/07/05 05:47:13 ru Exp $
+# $DragonFly: src/kerberos5/doc/Makefile,v 1.1 2005/01/16 14:25:46 eirikn Exp $
+
+INFO=  heimdal
+SRCDIR=        ${.CURDIR}/../../crypto/heimdal-0.6.3/doc
+
+.include <bsd.info.mk>
diff --git a/kerberos5/include/Makefile b/kerberos5/include/Makefile
deleted file mode 100644 (file)
index 781f959..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#      $Id$
-
-.if exists(${.OBJDIR}/../../include)
-INCLUDEOBJDIR= ${.OBJDIR}/../include
-.else
-INCLUDEOBJDIR= ${.CURDIR}/../include
-.endif
-
-depend lint tags:
-
-.include <bsd.prog.mk>
index a5e79ab..cd05eea 100644 (file)
@@ -1,35 +1,12 @@
-/* include/config.h.  Generated automatically by configure.  */
-/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* $FreeBSD: src/kerberos5/include/config.h,v 1.2.2.7 2002/12/01 17:45:32 nectar Exp $ */
-/* $DragonFly: src/kerberos5/include/config.h,v 1.3 2004/09/28 18:17:37 joerg Exp $ */
-
-#include <osreldate.h>
+/* $DragonFly: src/kerberos5/include/config.h,v 1.4 2005/01/16 14:25:46 eirikn Exp $ */
+/* include/config.h.  Generated by configure.  */
+/* include/config.h.in.  Generated from configure.in by autoheader.  */
 
 #ifndef RCSID
 #define RCSID(msg) \
 static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #endif
 
-#define BINDIR "/usr/bin"
-#define LIBDIR "/usr/lib"
-#define LIBEXECDIR "/usr/libexec"
-#define SBINDIR "/usr/sbin"
-#define SYSCONFDIR "/etc"
-
-#define HAVE_INT8_T 1
-#define HAVE_INT16_T 1
-#define HAVE_INT32_T 1
-#define HAVE_INT64_T 1
-#define HAVE_U_INT8_T 1
-#define HAVE_U_INT16_T 1
-#define HAVE_U_INT32_T 1
-#define HAVE_U_INT64_T 1
-#define HAVE_UINT8_T 1
-#define HAVE_UINT16_T 1
-#define HAVE_UINT32_T 1
-#define HAVE_UINT64_T 1
-
 /* Maximum values on all known systems */
 #define MaxHostNameLen (64+4)
 #define MaxPathLen (1024+4)
@@ -39,6 +16,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define if you want authentication support in telnet. */
 #define AUTHENTICATION 1
 
+/* path to bin */
+#define BINDIR "/usr/bin"
+
 /* Define if realloc(NULL) doesn't work. */
 /* #undef BROKEN_REALLOC */
 
@@ -239,12 +219,10 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_FNMATCH_H 1
 
 /* Define if el_init takes four arguments. */
-#if __FreeBSD_version >= 500024
-#define HAVE_FOUR_VALUED_EL_INIT 1
-#endif
+/* #undef HAVE_FOUR_VALUED_EL_INIT */
 
 /* define if krb_put_int takes four arguments. */
-#define HAVE_FOUR_VALUED_KRB_PUT_INT 1
+/* #undef HAVE_FOUR_VALUED_KRB_PUT_INT */
 
 /* Define to 1 if you have the `freeaddrinfo' function. */
 #define HAVE_FREEADDRINFO 1
@@ -313,10 +291,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_GETPAGESIZE 1
 
 /* Define to 1 if you have the `getprogname' function. */
-#if (__FreeBSD_version >= 430002 && __FreeBSD_version < 500000) || \
-    __FreeBSD_version >= 500019
 #define HAVE_GETPROGNAME 1
-#endif
 
 /* Define to 1 if you have the `getpwnam_r' function. */
 /* #undef HAVE_GETPWNAM_R */
@@ -397,6 +372,18 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define if you have the function `innetgr'. */
 #define HAVE_INNETGR 1
 
+/* Define to 1 if the system has the type `int16_t'. */
+#define HAVE_INT16_T 1
+
+/* Define to 1 if the system has the type `int32_t'. */
+#define HAVE_INT32_T 1
+
+/* Define to 1 if the system has the type `int64_t'. */
+#define HAVE_INT64_T 1
+
+/* Define to 1 if the system has the type `int8_t'. */
+#define HAVE_INT8_T 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -413,19 +400,19 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_ISSETUGID 1
 
 /* Define to 1 if you have the `krb_disable_debug' function. */
-#define HAVE_KRB_DISABLE_DEBUG 1
+/* #undef HAVE_KRB_DISABLE_DEBUG */
 
 /* Define to 1 if you have the `krb_enable_debug' function. */
-#define HAVE_KRB_ENABLE_DEBUG 1
+/* #undef HAVE_KRB_ENABLE_DEBUG */
 
 /* Define to 1 if you have the `krb_get_kdc_time_diff' function. */
-#define HAVE_KRB_GET_KDC_TIME_DIFF 1
+/* #undef HAVE_KRB_GET_KDC_TIME_DIFF */
 
 /* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
-#define HAVE_KRB_GET_OUR_IP_FOR_REALM 1
+/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
 
 /* Define to 1 if you have the `krb_kdctimeofday' function. */
-#define HAVE_KRB_KDCTIMEOFDAY 1
+/* #undef HAVE_KRB_KDCTIMEOFDAY */
 
 /* Define to 1 if you have the <libutil.h> header file. */
 #define HAVE_LIBUTIL_H 1
@@ -641,10 +628,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_SETPROCTITLE 1
 
 /* Define to 1 if you have the `setprogname' function. */
-#if (__FreeBSD_version >= 430002 && __FreeBSD_version < 500000) || \
-    __FreeBSD_version >= 500019
 #define HAVE_SETPROGNAME 1
-#endif
 
 /* Define to 1 if you have the `setregid' function. */
 #define HAVE_SETREGID 1
@@ -704,9 +688,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* #undef HAVE_STANDARDS_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#if __FreeBSD_version >= 500028
 #define HAVE_STDINT_H 1
-#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -886,7 +868,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/proc.h> header file. */
-#define HAVE_SYS_PROC_H 1
+/* #undef HAVE_SYS_PROC_H */
 
 /* Define to 1 if you have the <sys/ptyio.h> header file. */
 /* #undef HAVE_SYS_PTYIO_H */
@@ -999,6 +981,18 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define to 1 if you have the <udb.h> header file. */
 /* #undef HAVE_UDB_H */
 
+/* Define to 1 if the system has the type `uint16_t'. */
+#define HAVE_UINT16_T 1
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#define HAVE_UINT32_T 1
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#define HAVE_UINT64_T 1
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#define HAVE_UINT8_T 1
+
 /* Define to 1 if you have the `umask' function. */
 #define HAVE_UMASK 1
 
@@ -1032,6 +1026,18 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define to 1 if you have the <utmp.h> header file. */
 #define HAVE_UTMP_H 1
 
+/* Define to 1 if the system has the type `u_int16_t'. */
+#define HAVE_U_INT16_T 1
+
+/* Define to 1 if the system has the type `u_int32_t'. */
+#define HAVE_U_INT32_T 1
+
+/* Define to 1 if the system has the type `u_int64_t'. */
+#define HAVE_U_INT64_T 1
+
+/* Define to 1 if the system has the type `u_int8_t'. */
+#define HAVE_U_INT8_T 1
+
 /* Define to 1 if you have the `vasnprintf' function. */
 /* #undef HAVE_VASNPRINTF */
 
@@ -1081,13 +1087,13 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_WS_YPIXEL 1
 
 /* Define to 1 if you have the `XauFileName' function. */
-/* #undef HAVE_XAUFILENAME */
+#define HAVE_XAUFILENAME 1
 
 /* Define to 1 if you have the `XauReadAuth' function. */
-/* #undef HAVE_XAUREADAUTH */
+#define HAVE_XAUREADAUTH 1
 
 /* Define to 1 if you have the `XauWriteAuth' function. */
-/* #undef HAVE_XAUWRITEAUTH */
+#define HAVE_XAUWRITEAUTH 1
 
 /* Define to 1 if you have the `yp_get_default_domain' function. */
 #define HAVE_YP_GET_DEFAULT_DOMAIN 1
@@ -1140,6 +1146,15 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define to two if your krb.h doesn't */
 /* #undef KRB_VERIFY_SECURE_FAIL */
 
+/* path to lib */
+#define LIBDIR "/usr/lib"
+
+/* path to libexec */
+#define LIBEXECDIR "/usr/libexec"
+
+/* path to localstate */
+#define LOCALSTATEDIR "/var/heimdal"
+
 /* define if the system is missing a prototype for asnprintf() */
 #define NEED_ASNPRINTF_PROTO 1
 
@@ -1229,7 +1244,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define OPENLOG_PROTO_COMPATIBLE 1
 
 /* Define if you want OTP support in applications. */
-/* #undef OTP */
+#define OTP 1
 
 /* Name of package */
 #define PACKAGE "heimdal"
@@ -1241,13 +1256,13 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define PACKAGE_NAME "Heimdal"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Heimdal 0.5.1"
+#define PACKAGE_STRING "Heimdal 0.6.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "heimdal"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.5.1"
+#define PACKAGE_VERSION "0.6.3"
 
 /* Define if getlogin has POSIX flavour (and not BSD). */
 /* #undef POSIX_GETLOGIN */
@@ -1261,12 +1276,18 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
+/* path to sbin */
+#define SBINDIR "/usr/sbin"
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define if you have streams ptys. */
 /* #undef STREAMSPTY */
 
+/* path to sysconf */
+#define SYSCONFDIR "/etc"
+
 /* Define to what version of SunOS you are running. */
 /* #undef SunOS */
 
@@ -1277,7 +1298,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.4f"
+#define VERSION "0.6.3"
 
 /* Define if signal handlers return void. */
 #define VOID_RETSIGTYPE 1
@@ -1307,9 +1328,11 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define this to what the type mode_t should be. */
 /* #undef mode_t */
index f0c50d9..48e9900 100644 (file)
@@ -1,5 +1,5 @@
-/* $FreeBSD: src/kerberos5/include/crypto-headers.h,v 1.1.2.2 2003/02/13 20:15:26 nectar Exp $ */
-/* $DragonFly: src/kerberos5/include/crypto-headers.h,v 1.2 2003/06/17 04:26:17 dillon Exp $ */
+/* $FreeBSD: src/kerberos5/include/crypto-headers.h,v 1.2 2003/01/21 14:08:24 nectar Exp $ */
+/* $DragonFly: src/kerberos5/include/crypto-headers.h,v 1.3 2005/01/16 14:25:46 eirikn Exp $ */
 #ifndef __crypto_headers_h__
 #define __crypto_headers_h__
 #define OPENSSL_DES_LIBDES_COMPATIBILITY
diff --git a/kerberos5/include/krb5-private.h b/kerberos5/include/krb5-private.h
deleted file mode 100644 (file)
index 6996090..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This is a generated file */
-#ifndef __krb5_private_h__
-#define __krb5_private_h__
-
-/* $FreeBSD: src/kerberos5/include/krb5-private.h,v 1.1.1.1.2.3 2002/09/01 04:22:00 nectar Exp $ */
-/* $DragonFly: src/kerberos5/include/Attic/krb5-private.h,v 1.2 2003/06/17 04:26:17 dillon Exp $ */
-
-#include <stdarg.h>
-void
-_krb5_crc_init_table (void);
-
-u_int32_t
-_krb5_crc_update (
-       const char */*p*/,
-       size_t /*len*/,
-       u_int32_t /*res*/);
-
-int
-_krb5_extract_ticket (
-       krb5_context /*context*/,
-       krb5_kdc_rep */*rep*/,
-       krb5_creds */*creds*/,
-       krb5_keyblock */*key*/,
-       krb5_const_pointer /*keyseed*/,
-       krb5_key_usage /*key_usage*/,
-       krb5_addresses */*addrs*/,
-       unsigned /*nonce*/,
-       krb5_boolean /*allow_server_mismatch*/,
-       krb5_boolean /*ignore_cname*/,
-       krb5_decrypt_proc /*decrypt_proc*/,
-       krb5_const_pointer /*decryptarg*/);
-
-krb5_ssize_t
-_krb5_get_int (
-       void */*buffer*/,
-       unsigned long */*value*/,
-       size_t /*size*/);
-
-void
-_krb5_n_fold (
-       const void */*str*/,
-       size_t /*len*/,
-       void */*key*/,
-       size_t /*size*/);
-
-krb5_ssize_t
-_krb5_put_int (
-       void */*buffer*/,
-       unsigned long /*value*/,
-       size_t /*size*/);
-
-#endif /* __krb5_private_h__ */
index 85b52ff..3adad24 100644 (file)
@@ -1,8 +1,8 @@
 /* krb5-types.h -- this file was generated for i386-unknown-freebsd5.0 by
                    $Id: bits.c,v 1.22 2002/08/28 16:08:44 joda Exp $ */
 
-/* $FreeBSD: src/kerberos5/include/krb5-types.h,v 1.1.1.1.2.2 2002/09/01 04:22:00 nectar Exp $ */
-/* $DragonFly: src/kerberos5/include/krb5-types.h,v 1.2 2003/06/17 04:26:17 dillon Exp $ */
+/* $FreeBSD: src/kerberos5/include/krb5-types.h,v 1.3 2002/08/30 21:33:16 nectar Exp $ */
+/* $DragonFly: src/kerberos5/include/krb5-types.h,v 1.3 2005/01/16 14:25:46 eirikn Exp $ */
 
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
index 70373f2..566b8ed 100644 (file)
@@ -1,6 +1,3 @@
-/* $FreeBSD: src/kerberos5/include/version.h,v 1.2.2.7 2002/12/01 17:45:32 nectar Exp $ */
-/* $DragonFly: src/kerberos5/include/version.h,v 1.2 2003/06/17 04:26:17 dillon Exp $ */
-const char *krb4_long_version = "@(#)$Version: krb4-1.0.5fb1 (FreeBSD) $";
-const char *krb4_version = "krb4-1.0.5fb1";
-const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5.1 (FreeBSD) $";
-const char *heimdal_version = "Heimdal 0.5.1";
+/* $DragonFly: src/kerberos5/include/version.h,v 1.3 2005/01/16 14:25:46 eirikn Exp $ */
+const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.3 by eirik on lap.eirikn.net (i386-unknown-dragonfly1.1) Sat Jan 15 17:36:21 GMT 2005 $";
+const char *heimdal_version = "Heimdal 0.6.3";
index 6b3d0dd..06719d5 100644 (file)
@@ -1,5 +1,7 @@
-# $FreeBSD: src/kerberos5/lib/Makefile,v 1.2.2.4 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/lib/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
+# $FreeBSD: src/kerberos5/lib/Makefile,v 1.10 2004/01/31 08:15:52 ru Exp $
+# $DragonFly: src/kerberos5/lib/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
+
+SUBDIR=        libasn1 libgssapi libhdb libkadm5clnt libkadm5srv \
+       libkafs5 libkrb5 libroken libsl libvers
 
-SUBDIR=        libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet
 .include <bsd.subdir.mk>
index dae5c23..50a0cb7 100644 (file)
@@ -1,7 +1,10 @@
-# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.1.1.1.2.2 2002/09/01 04:22:01 nectar Exp $
-# $DragonFly: src/kerberos5/lib/Makefile.inc,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.6 2003/10/09 19:48:45 nectar Exp $
+# $DragonFly: src/kerberos5/lib/Makefile.inc,v 1.3 2005/01/16 14:25:46 eirikn Exp $
 
-SHLIB_MAJOR?=  5
-SHLIB_MINOR?=  0
+SHLIB_MAJOR?=  7
+
+CFLAGS+=-I${.OBJDIR}/../../lib/libroken -I${.OBJDIR}/../../lib/libasn1 \
+       -I${.OBJDIR}/../../lib/libkrb5 -I${KRB5DIR}/lib/roken \
+       -I${KRB5DIR}/lib/krb5
 
 .include "../Makefile.inc"
index dd82fa7..5c4f8c8 100644 (file)
-# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.3.2.8 2002/08/19 16:10:21 ru Exp $
-# $DragonFly: src/kerberos5/lib/libasn1/Makefile,v 1.4 2004/03/26 21:58:10 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.22 2004/02/05 18:51:48 ru Exp $
+# $DragonFly: src/kerberos5/lib/libasn1/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   asn1
-CFLAGS+=-I${KRB5DIR}/include \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/roken \
-       -I${INCLUDEOBJDIR} \
-       -I${.OBJDIR}
-SRCS=  der_get.c der_put.c der_free.c der_length.c der_copy.c \
-       timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \
-       ${GEN:S/.x/.c/g}
-
-GEN=                                           \
-       asn1_APOptions.x                        \
-       asn1_AP_REP.x                           \
-       asn1_AP_REQ.x                           \
-       asn1_AS_REP.x                           \
-       asn1_AS_REQ.x                           \
-       asn1_Authenticator.x                    \
-       asn1_AuthorizationData.x                \
-       asn1_CKSUMTYPE.x                        \
-       asn1_Checksum.x                         \
-       asn1_ENCTYPE.x                          \
-       asn1_ETYPE_INFO.x                       \
-       asn1_ETYPE_INFO_ENTRY.x                 \
-       asn1_EncAPRepPart.x                     \
-       asn1_EncASRepPart.x                     \
-       asn1_EncKDCRepPart.x                    \
-       asn1_EncKrbCredPart.x                   \
-       asn1_EncKrbPrivPart.x                   \
-       asn1_EncTGSRepPart.x                    \
-       asn1_EncTicketPart.x                    \
-       asn1_EncryptedData.x                    \
-       asn1_EncryptionKey.x                    \
-       asn1_HostAddress.x                      \
-       asn1_HostAddresses.x                    \
-       asn1_KDCOptions.x                       \
-       asn1_KDC_REP.x                          \
-       asn1_KDC_REQ.x                          \
-       asn1_KDC_REQ_BODY.x                     \
-       asn1_KRB_CRED.x                         \
-       asn1_KRB_ERROR.x                        \
-       asn1_KRB_PRIV.x                         \
-       asn1_KRB_SAFE.x                         \
-       asn1_KRB_SAFE_BODY.x                    \
-       asn1_KerberosTime.x                     \
-       asn1_KrbCredInfo.x                      \
-       asn1_LastReq.x                          \
-       asn1_LR_TYPE.x                          \
-       asn1_MESSAGE_TYPE.x                     \
-       asn1_METHOD_DATA.x                      \
-       asn1_NAME_TYPE.x                        \
-       asn1_PADATA_TYPE.x                      \
-       asn1_PA_DATA.x                          \
-       asn1_PA_ENC_TS_ENC.x                    \
-       asn1_Principal.x                        \
-       asn1_PrincipalName.x                    \
-       asn1_Realm.x                            \
-       asn1_TGS_REP.x                          \
-       asn1_TGS_REQ.x                          \
-       asn1_Ticket.x                           \
-       asn1_TicketFlags.x                      \
-       asn1_TransitedEncoding.x                \
+INCS=  asn1_err.h krb5_asn1.h
+
+SRCS=  asn1_err.c \
+       asn1_err.h \
+       der_copy.c \
+       der_free.c \
+       der_get.c \
+       der_length.c \
+       der_put.c \
+       krb5_asn1.h \
+       timegm.c \
+       ${GEN:S/.x$/.c/}
+
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+
+GEN=   asn1_APOptions.x \
+       asn1_AP_REP.x \
+       asn1_AP_REQ.x \
+       asn1_AS_REP.x \
+       asn1_AS_REQ.x \
+       asn1_Authenticator.x \
+       asn1_AuthorizationData.x \
+       asn1_CKSUMTYPE.x \
+       asn1_ChangePasswdDataMS.x \
+       asn1_Checksum.x \
+       asn1_ENCTYPE.x \
+       asn1_ETYPE_INFO.x \
+       asn1_ETYPE_INFO_ENTRY.x \
+       asn1_EncAPRepPart.x \
+       asn1_EncASRepPart.x \
+       asn1_EncKDCRepPart.x \
+       asn1_EncKrbCredPart.x \
+       asn1_EncKrbPrivPart.x \
+       asn1_EncTGSRepPart.x \
+       asn1_EncTicketPart.x \
+       asn1_EncryptedData.x \
+       asn1_EncryptionKey.x \
+       asn1_HostAddress.x \
+       asn1_HostAddresses.x \
+       asn1_KDCOptions.x \
+       asn1_KDC_REP.x \
+       asn1_KDC_REQ.x \
+       asn1_KDC_REQ_BODY.x \
+       asn1_KRB_CRED.x \
+       asn1_KRB_ERROR.x \
+       asn1_KRB_PRIV.x \
+       asn1_KRB_SAFE.x \
+       asn1_KRB_SAFE_BODY.x \
+       asn1_KerberosTime.x \
+       asn1_KrbCredInfo.x \
+       asn1_LR_TYPE.x \
+       asn1_LastReq.x \
+       asn1_MESSAGE_TYPE.x \
+       asn1_METHOD_DATA.x \
+       asn1_NAME_TYPE.x \
+       asn1_PADATA_TYPE.x \
+       asn1_PA_DATA.x \
+       asn1_PA_ENC_TS_ENC.x \
+       asn1_Principal.x \
+       asn1_PrincipalName.x \
+       asn1_Realm.x \
+       asn1_TGS_REP.x \
+       asn1_TGS_REQ.x \
+       asn1_Ticket.x \
+       asn1_TicketFlags.x \
+       asn1_TransitedEncoding.x \
        asn1_UNSIGNED.x
 
-INCS=  krb5_asn1.h asn1_err.h 
-
-.include <bsd.lib.mk>
-
-.PATH:         ${KRB5DIR}/lib/asn1
-.PATH:         ${KRB5DIR}/lib/vers
-.PATH:         ${KRB5DIR}/lib/roken
+CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} krb5_asn1.h asn1_files
 
-beforedepend all: roken.h
+.ORDER: ${GEN} krb5_asn1.h
+${GEN} krb5_asn1.h: k5.asn1
+       ${ASN1COMPILE} ${.ALLSRC:M*.asn1} krb5_asn1
 
 .for I in ${GEN}
-${I:S/.x/.c/}: ${I}
-       cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
+${I:R}.c: ${I}
+       cat ${.ALLSRC} > ${.TARGET}
 .endfor
 
-CLEANFILES+=   ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
-
-${GEN} krb5_asn1.h:            asn1_compile.nx k5.asn1
-       ./asn1_compile.nx ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
-
-build-tools:   make-print-version.nx make-roken.nx asn1_compile.nx
-
-asn1_compile.nx:                               \
-       gen.c                                   \
-       gen_copy.c                              \
-       gen_decode.c                            \
-       gen_encode.c                            \
-       gen_free.c                              \
-       gen_glue.c                              \
-       gen_length.c                            \
-       hash.c                                  \
-       emalloc.c                               \
-       lex.no                                  \
-       main.c                                  \
-       parse.no                                \
-       symbol.c                                \
-       getarg.c                                \
-       warnerr.c                               \
-       print_version.no                        \
-       get_window_size.c                       \
-       strupr.c
-       ${NXCC} ${NXCFLAGS} ${.ALLSRC} -o ${.TARGET}
-
-.if defined(BOOTSTRAPPING)
-asn1_compile.nx: getprogname.c setprogname.c
-.endif
-
-parse.no:      parse.c roken.h
-       ${NXCC} ${NXCFLAGS} -c -o ${.TARGET} parse.c
-
-.ORDER: parse.c parse.h
-parse.h parse.c:       parse.y
-       ${YACC} -d ${.OODATE}
-       cp y.tab.c parse.c
-       cp y.tab.h parse.h
-
-lex.no:                lex.l parse.h roken.h
-       ${LEX} ${LFLAGS} -o${.TARGET}.c ${.ALLSRC:M*.l}
-       ${NXCC} ${CFLAGS} -c ${.TARGET}.c -o ${.TARGET}
-       rm -f ${.TARGET}.c
-
-print_version.no: print_version.h print_version.c roken.h
-       ${NXCC} ${NXCFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
-
-print_version.h: make-print-version.nx
-       ./make-print-version.nx print_version.h
-
-make-print-version.nx: make-print-version.c
-       ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
+.include <bsd.lib.mk>
 
-CLEANFILES+=   ${GEN} asn1_compile.nx lex.no parse.no parse.c parse.h \
-               hdb_asn1.h make-print-version.nx print_version.h \
-               print_version.no y.tab.c y.tab.h
+.PATH: ${KRB5DIR}/lib/asn1
index a1cc704..b1b404a 100644 (file)
@@ -1,61 +1,98 @@
-# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.2.2.4 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/lib/libgssapi/Makefile,v 1.3 2004/03/26 21:58:11 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.10 2004/04/04 03:31:05 nectar Exp $
+# $DragonFly: src/kerberos5/lib/libgssapi/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   gssapi
-CFLAGS+=-I${KRB5DIR}/lib/gssapi        \
-       -I${KRB5DIR}/lib/krb5   \
-       -I${KRB5DIR}/lib/asn1   \
-       -I${KRB5DIR}/lib/roken  \
-       -I${KRB5DIR}/lib/des    \
-       -I${KRB5DIR}/include    \
-       -I${ASN1OBJDIR}         \
-       -I${.OBJDIR}
+INCS=  gssapi.h
+MAN=   gss_acquire_cred.3 gssapi.3
 
-SRCS=                          \
-       8003.c                  \
-       accept_sec_context.c    \
-       acquire_cred.c          \
-       add_oid_set_member.c    \
-       canonicalize_name.c     \
-       compare_name.c          \
-       context_time.c          \
-       copy_ccache.c           \
-       create_emtpy_oid_set.c  \
-       decapsulate.c           \
-       delete_sec_context.c    \
-       display_name.c          \
-       display_status.c        \
-       duplicate_name.c        \
-       encapsulate.c           \
-       export_sec_context.c    \
-       export_name.c           \
-       external.c              \
-       get_mic.c               \
-       gssapi.h                \
-       gssapi_locl.h           \
-       import_name.c           \
-       import_sec_context.c    \
-       indicate_mechs.c        \
-       init.c                  \
-       init_sec_context.c      \
-       inquire_context.c       \
-       inquire_cred.c          \
-       release_buffer.c        \
-       release_cred.c          \
-       release_name.c          \
-       release_oid_set.c       \
-       test_oid_set_member.c   \
-       unwrap.c                \
-       v1.c                    \
-       verify_mic.c            \
-        wrap.c                  \
-        address_to_krb5addr.c  \
-       k524_err.h              \
-       krb5_err.h              \
-       heim_err.h
+MLINKS=        gss_acquire_cred.3 gss_accept_sec_context.3 \
+       gss_acquire_cred.3 gss_add_cred.3 \
+       gss_acquire_cred.3 gss_add_oid_set_member.3 \
+       gss_acquire_cred.3 gss_canonicalize_name.3 \
+       gss_acquire_cred.3 gss_compare_name.3 \
+       gss_acquire_cred.3 gss_context_time.3 \
+       gss_acquire_cred.3 gss_create_empty_oid_set.3 \
+       gss_acquire_cred.3 gss_delete_sec_context.3 \
+       gss_acquire_cred.3 gss_display_name.3 \
+       gss_acquire_cred.3 gss_display_status.3 \
+       gss_acquire_cred.3 gss_duplicate_name.3 \
+       gss_acquire_cred.3 gss_export_name.3 \
+       gss_acquire_cred.3 gss_export_sec_context.3 \
+       gss_acquire_cred.3 gss_get_mic.3 \
+       gss_acquire_cred.3 gss_import_name.3 \
+       gss_acquire_cred.3 gss_import_sec_context.3 \
+       gss_acquire_cred.3 gss_indicate_mechs.3 \
+       gss_acquire_cred.3 gss_init_sec_context.3 \
+       gss_acquire_cred.3 gss_inquire_context.3 \
+       gss_acquire_cred.3 gss_inquire_cred.3 \
+       gss_acquire_cred.3 gss_inquire_cred_by_mech.3 \
+       gss_acquire_cred.3 gss_inquire_mechs_for_name.3 \
+       gss_acquire_cred.3 gss_inquire_names_for_mech.3 \
+       gss_acquire_cred.3 gss_krb5_compat_des3_mic.3 \
+       gss_acquire_cred.3 gss_krb5_copy_ccache.3 \
+       gss_acquire_cred.3 gss_process_context_token.3 \
+       gss_acquire_cred.3 gss_release_buffer.3 \
+       gss_acquire_cred.3 gss_release_cred.3 \
+       gss_acquire_cred.3 gss_release_name.3 \
+       gss_acquire_cred.3 gss_release_oid_set.3 \
+       gss_acquire_cred.3 gss_seal.3 \
+       gss_acquire_cred.3 gss_sign.3 \
+       gss_acquire_cred.3 gss_test_oid_set_member.3 \
+       gss_acquire_cred.3 gss_unseal.3 \
+       gss_acquire_cred.3 gss_unwrap.3 \
+       gss_acquire_cred.3 gss_verify.3 \
+       gss_acquire_cred.3 gss_verify_mic.3 \
+       gss_acquire_cred.3 gss_wrap.3 \
+       gss_acquire_cred.3 gss_wrap_size_limit.3
 
-INCS=  gssapi.h heim_err.h krb5_err.h k524_err.h
+SRCS=  8003.c \
+       accept_sec_context.c \
+       acquire_cred.c \
+       add_cred.c \
+       add_oid_set_member.c \
+       address_to_krb5addr.c \
+       arcfour.c \
+       canonicalize_name.c \
+       compare_name.c \
+       compat.c \
+       context_time.c \
+       copy_ccache.c \
+       create_emtpy_oid_set.c \
+       decapsulate.c \
+       delete_sec_context.c \
+       display_name.c \
+       display_status.c \
+       duplicate_name.c \
+       encapsulate.c \
+       export_name.c \
+       export_sec_context.c \
+       external.c \
+       get_mic.c \
+       gssapi.h \
+       import_name.c \
+       import_sec_context.c \
+       indicate_mechs.c \
+       init.c \
+       init_sec_context.c \
+       inquire_context.c \
+       inquire_cred.c \
+       inquire_cred_by_mech.c \
+       inquire_mechs_for_name.c \
+       inquire_names_for_mech.c \
+       process_context_token.c \
+       release_buffer.c \
+       release_cred.c \
+       release_name.c \
+       release_oid_set.c \
+       test_oid_set_member.c \
+       unwrap.c \
+       v1.c \
+       verify_mic.c \
+       wrap.c
+
+CFLAGS+=-I${KRB5DIR}/lib/gssapi -I${KRB5DIR}/lib/krb5 \
+       -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/gssapi
+.PATH: ${KRB5DIR}/lib/gssapi
index 9ca2a91..d2b18ac 100644 (file)
@@ -1,94 +1,49 @@
-# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.2.2.5 2002/08/19 16:10:22 ru Exp $
-# $DragonFly: src/kerberos5/lib/libhdb/Makefile,v 1.4 2004/03/26 21:58:12 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.18 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libhdb/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   hdb
-CFLAGS+=-I${KRB5DIR}/include \
-       -I${INCLUDEOBJDIR} \
-       -I${KRB5DIR}/lib/krb5 \
-       -I${KRB5DIR}/lib/hdb \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/roken \
-       -I${.OBJDIR} \
-       -I${ASN1OBJDIR}
 
-SRCS=  \
-       common.c                                \
-       db.c                                    \
-       db3.c                                   \
-       hdb-ldap.c                              \
-       hdb.c                                   \
-       keytab.c                                \
-       mkey.c                                  \
-       ndbm.c                                  \
-       print.c                                 \
-       hdb_err.c                               \
-       hdb_err.h                               \
-       hdb_asn1.h                              \
-       k524_err.h                              \
-       krb5_err.h                              \
-       heim_err.h                              \
-       ${GEN:S/.x/.c/g}
-
-GEN=                                           \
-       asn1_Key.x                              \
-       asn1_GENERATION.x                       \
-       asn1_Event.x                            \
-       asn1_HDBFlags.x                         \
-       asn1_hdb_entry.x                        \
-       asn1_Salt.x
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/hdb
-.PATH: ${KRB5DIR}/lib/asn1
-.PATH: ${KRB5DIR}/lib/vers
-.PATH: ${KRB5DIR}/lib/roken
-
-build-tools:   make-print-version.nx asn1_compile.nx
+INCS=  hdb-private.h \
+       hdb-protos.h \
+       hdb.h \
+       hdb_asn1.h \
+       hdb_err.h
+
+SRCS=  common.c \
+       db.c \
+       db3.c \
+       hdb-ldap.c \
+       hdb.c \
+       hdb_asn1.h \
+       hdb_err.c \
+       hdb_err.h \
+       keytab.c \
+       mkey.c \
+       ndbm.c \
+       print.c \
+       ${GEN:S/.x$/.c/}
+
+CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
+       -I${KRB5DIR}/lib/roken -I. ${LDAPCFLAGS}
+
+GEN=   asn1_Event.x \
+       asn1_GENERATION.x \
+       asn1_HDBFlags.x \
+       asn1_Key.x \
+       asn1_Salt.x \
+       asn1_hdb_entry.x
+
+CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} hdb_asn1.h asn1_files
+
+.ORDER: ${GEN} hdb_asn1.h
+${GEN} hdb_asn1.h: hdb.asn1
+       ${ASN1COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
 
 .for I in ${GEN}
-${I:S/.x/.c/}:  ${I}
-       cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
+${I:R}.c: ${I}
+       cat ${.ALLSRC} > ${.TARGET}
 .endfor
 
-CLEANFILES+=   ${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
-
-${GEN} hdb_asn1.h:     asn1_compile.nx hdb.asn1
-       ./asn1_compile.nx ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
-
-asn1_compile.nx:       parse.no lex.no main.c hash.c symbol.c emalloc.c gen.c \
-               gen_encode.c gen_decode.c gen_free.c gen_length.c \
-               gen_copy.c gen_glue.c getarg.c warnerr.c print_version.no \
-               get_window_size.c strupr.c
-       ${NXCC} ${NXCFLAGS} ${.ALLSRC} -o ${.TARGET}
-
-.if defined(BOOTSTRAPPING)
-asn1_compile.nx: getprogname.c setprogname.c
-.endif
-
-parse.no:      parse.c
-       ${NXCC} ${NXCFLAGS} -c -o ${.TARGET} parse.c
-
-.ORDER: parse.c parse.h
-parse.h parse.c:       parse.y
-       ${YACC} -d ${.OODATE}
-       cp y.tab.c parse.c
-       cp y.tab.h parse.h
-
-lex.no:                lex.l
-       ${LEX} ${LFLAGS} -o${.TARGET}.c ${.ALLSRC:M*.l}
-       ${NXCC} ${CFLAGS} -c ${.TARGET}.c -o ${.TARGET}
-       rm -f ${.TARGET}.c
-
-print_version.no: print_version.h print_version.c
-       ${NXCC} ${NXCFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
-
-print_version.h: make-print-version.nx
-       ./make-print-version.nx print_version.h
-
-make-print-version.nx: make-print-version.c
-       ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
+.include <bsd.lib.mk>
 
-CLEANFILES+=   ${GEN} asn1_compile.nx lex.no parse.no parse.c parse.h \
-               hdb_asn1.h make-print-version.nx print_version.h \
-               print_version.no y.tab.c y.tab.h
+.PATH: ${KRB5DIR}/lib/hdb
index b4b72b0..fcd3213 100644 (file)
@@ -1,41 +1,38 @@
-# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.1.1.1.2.1 2001/03/04 13:49:45 markm Exp $
-# $DragonFly: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.3 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   kadm5clnt
-CFLAGS+=-I${KRB5DIR}/include \
-       -I${KRB5DIR}/lib/krb5 \
-       -I${KRB5DIR}/lib/kadm5 \
-       -I${KRB5DIR}/lib/hdb \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/roken \
-       -I${ASN1OBJDIR} \
-       -I${HDBOBJDIR} \
-       -I${.OBJDIR}
 
-SRCS=  \
-       admin.h                                 \
-       chpass_c.c                              \
-       common_glue.c                           \
-       create_c.c                              \
-       delete_c.c                              \
-       destroy_c.c                             \
-       flush_c.c                               \
-       free.c                                  \
-       get_c.c                                 \
-       get_princs_c.c                          \
-       init_c.c                                \
-       kadm5_err.c                             \
-       kadm5_err.h                             \
-       kadm5_locl.h                            \
-       marshall.c                              \
-       modify_c.c                              \
-       private.h                               \
-       privs_c.c                               \
-       randkey_c.c                             \
-       rename_c.c                              \
-       send_recv.c                             \
-       client_glue.c
+INCS=  admin.h \
+       kadm5-private.h \
+       kadm5-protos.h \
+       kadm5_err.h \
+       private.h
+
+INCSDIR=${INCLUDEDIR}/kadm5
+
+SRCS=  chpass_c.c \
+       client_glue.c \
+       common_glue.c \
+       create_c.c \
+       delete_c.c \
+       destroy_c.c \
+       flush_c.c \
+       free.c \
+       get_c.c \
+       get_princs_c.c \
+       init_c.c \
+       kadm5_err.c \
+       kadm5_err.h \
+       marshall.c \
+       modify_c.c \
+       privs_c.c \
+       randkey_c.c \
+       rename_c.c \
+       send_recv.c
+
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
index e078dd9..973dd1e 100644 (file)
@@ -1,50 +1,39 @@
-# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.1.1.1.2.1 2001/03/04 13:49:51 markm Exp $
-# $DragonFly: src/kerberos5/lib/libkadm5srv/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.7 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libkadm5srv/Makefile,v 1.3 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   kadm5srv
-CFLAGS+=-I${KRB5DIR}/include \
-       -I${KRB5DIR}/lib/krb5 \
-       -I${KRB5DIR}/lib/kadm5 \
-       -I${KRB5DIR}/lib/hdb \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/roken \
-       -I${ASN1OBJDIR} \
-       -I${HDBOBJDIR} \
-       -I${.OBJDIR}
 
-SRCS=  \
-       acl.c                                   \
-       admin.h                                 \
-       bump_pw_expire.c                        \
-       chpass_s.c                              \
-       common_glue.c                           \
-       context_s.c                             \
-       create_s.c                              \
-       delete_s.c                              \
-       destroy_s.c                             \
-       ent_setup.c                             \
-       error.c                                 \
-       flush_s.c                               \
-       free.c                                  \
-       get_princs_s.c                          \
-       get_s.c                                 \
-       init_s.c                                \
-       kadm5_err.c                             \
-       kadm5_err.h                             \
-       kadm5_locl.h                            \
-       keys.c                                  \
-       log.c                                   \
-       marshall.c                              \
-       modify_s.c                              \
-       private.h                               \
-       privs_s.c                               \
-       randkey_s.c                             \
-       rename_s.c                              \
-       set_keys.c                              \
-       set_modifier.c                          \
-       password_quality.c                      \
-       server_glue.c
+SRCS=  acl.c \
+       bump_pw_expire.c \
+       chpass_s.c \
+       common_glue.c \
+       context_s.c \
+       create_s.c \
+       delete_s.c \
+       destroy_s.c \
+       ent_setup.c \
+       error.c \
+       flush_s.c \
+       free.c \
+       get_princs_s.c \
+       get_s.c \
+       init_s.c \
+       kadm5_err.c \
+       kadm5_err.h \
+       keys.c \
+       log.c \
+       marshall.c \
+       modify_s.c \
+       password_quality.c \
+       privs_s.c \
+       randkey_s.c \
+       rename_s.c \
+       server_glue.c \
+       set_keys.c \
+       set_modifier.c
+
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
index 4fe3f89..c592e34 100644 (file)
@@ -1,16 +1,33 @@
-# $FreeBSD: src/kerberos5/lib/libkafs5/Makefile,v 1.2 2000/03/01 13:50:30 markm Exp $
-# $DragonFly: src/kerberos5/lib/libkafs5/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libkafs5/Makefile,v 1.9 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libkafs5/Makefile,v 1.3 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   kafs5
-CFLAGS+=-I${KRB5DIR}/lib/kafs \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/krb5 \
-       -I${KRB5DIR}/lib/roken \
-       -I${KRB5DIR}/include \
-       -I${KRB5OBJDIR} \
-       -I${ASN1OBJDIR}
+INCS=  kafs.h
+MAN=   kafs5.3
+
+MLINKS=        kafs5.3 k_afs_cell_of_file.3 \
+       kafs5.3 k_hasafs.3 \
+       kafs5.3 k_pioctl.3 \
+       kafs5.3 k_setpag.3 \
+       kafs5.3 k_unlog.3 \
+       kafs5.3 kafs.3 \
+       kafs5.3 kafs_set_verbose.3 \
+       kafs5.3 kafs_settoken.3 \
+       kafs5.3 kafs_settoken5.3 \
+       kafs5.3 kafs_settoken_rxkad.3 \
+       kafs5.3 krb5_afslog.3 \
+       kafs5.3 krb5_afslog_uid.3 \
+       kafs5.3 krb_afslog.3 \
+       kafs5.3 krb_afslog_uid.3
+
 SRCS=  afssys.c afskrb5.c common.c
+CFLAGS+=-I${KRB5DIR}/lib/kafs -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+
+CLEANFILES= kafs5.3
+
+kafs5.3: kafs.3
+       sed -e 's/libkafs, -lkafs/libkafs5, -lkafs5/g' ${.ALLSRC} >${.TARGET}
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/kafs
+.PATH: ${KRB5DIR}/lib/kafs
index 99be8b1..6ce493a 100644 (file)
-# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.3.2.5 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/lib/libkrb5/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
+# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.17 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libkrb5/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   krb5
-CFLAGS+=-I${KRB5DIR}/lib/krb5 \
-       -I${KRB5DIR}/lib/asn1 \
-       -I${KRB5DIR}/lib/des \
-       -I${KRB5DIR}/lib/roken \
-       -I${KRB5DIR}/include \
-       -I${KRB5OBJDIR} \
-       -I${ASN1OBJDIR}
-SRCS=  \
-       acl.c \
+
+INCS=  heim_err.h \
+       k524_err.h \
+       krb5-protos.h \
+       krb5-types.h \
+       krb5.h \
+       krb5_err.h
+
+MAN=   krb5.3 \
+       krb5_425_conv_principal.3 \
+       krb5_address.3 \
+       krb5_aname_to_localname.3 \
+       krb5_appdefault.3 \
+       krb5_auth_context.3 \
+       krb5_build_principal.3 \
+       krb5_ccache.3 \
+       krb5_config.3 \
+       krb5_context.3 \
+       krb5_create_checksum.3 \
+       krb5_crypto_init.3 \
+       krb5_data.3 \
+       krb5_encrypt.3 \
+       krb5_free_addresses.3 \
+       krb5_free_principal.3 \
+       krb5_get_all_client_addrs.3 \
+       krb5_get_krbhst.3 \
+       krb5_init_context.3 \
+       krb5_keytab.3 \
+       krb5_krbhst_init.3 \
+       krb5_kuserok.3 \
+       krb5_openlog.3 \
+       krb5_parse_name.3 \
+       krb5_principal_get_realm.3 \
+       krb5_set_default_realm.3 \
+       krb5_sname_to_principal.3 \
+       krb5_timeofday.3 \
+       krb5_unparse_name.3 \
+       krb5_verify_user.3 \
+       krb5_warn.3
+MAN+=  krb5.conf.5
+MAN+=  kerberos.8
+
+MLINKS=        krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3 \
+       krb5_425_conv_principal.3 krb5_524_conv_principal.3 \
+       krb5_address.3 krb5_addr2sockaddr.3 \
+       krb5_address.3 krb5_address_compare.3 \
+       krb5_address.3 krb5_address_order.3 \
+       krb5_address.3 krb5_address_search.3 \
+       krb5_address.3 krb5_addresses.3 \
+       krb5_address.3 krb5_anyaddr.3 \
+       krb5_address.3 krb5_append_addresses.3 \
+       krb5_address.3 krb5_copy_address.3 \
+       krb5_address.3 krb5_copy_addresses.3 \
+       krb5_address.3 krb5_free_address.3 \
+       krb5_address.3 krb5_free_addresses.3 \
+       krb5_address.3 krb5_h_addr2addr.3 \
+       krb5_address.3 krb5_h_addr2sockaddr.3 \
+       krb5_address.3 krb5_make_addrport.3 \
+       krb5_address.3 krb5_max_sockaddr_size.3 \
+       krb5_address.3 krb5_parse_address.3 \
+       krb5_address.3 krb5_print_address.3 \
+       krb5_address.3 krb5_sockaddr2address.3 \
+       krb5_address.3 krb5_sockaddr2port.3 \
+       krb5_address.3 krb5_sockaddr_uninteresting.3 \
+       krb5_appdefault.3 krb5_appdefault_boolean.3 \
+       krb5_appdefault.3 krb5_appdefault_string.3 \
+       krb5_appdefault.3 krb5_appdefault_time.3 \
+       krb5_auth_context.3 krb5_auth_con_free.3 \
+       krb5_auth_context.3 krb5_auth_con_genaddrs.3 \
+       krb5_auth_context.3 krb5_auth_con_getaddrs.3 \
+       krb5_auth_context.3 krb5_auth_con_getflags.3 \
+       krb5_auth_context.3 krb5_auth_con_getkey.3 \
+       krb5_auth_context.3 krb5_auth_con_getlocalsubkey.3 \
+       krb5_auth_context.3 krb5_auth_con_getrcache.3 \
+       krb5_auth_context.3 krb5_auth_con_getremotesubkey.3 \
+       krb5_auth_context.3 krb5_auth_con_getuserkey.3 \
+       krb5_auth_context.3 krb5_auth_con_init.3 \
+       krb5_auth_context.3 krb5_auth_con_initivector.3 \
+       krb5_auth_context.3 krb5_auth_con_setaddrs.3 \
+       krb5_auth_context.3 krb5_auth_con_setaddrs_from_fd.3 \
+       krb5_auth_context.3 krb5_auth_con_setflags.3 \
+       krb5_auth_context.3 krb5_auth_con_setivector.3 \
+       krb5_auth_context.3 krb5_auth_con_setkey.3 \
+       krb5_auth_context.3 krb5_auth_con_setlocalsubkey.3 \
+       krb5_auth_context.3 krb5_auth_con_setrcache.3 \
+       krb5_auth_context.3 krb5_auth_con_setremotesubkey.3 \
+       krb5_auth_context.3 krb5_auth_con_setuserkey.3 \
+       krb5_auth_context.3 krb5_auth_getauthenticator.3 \
+       krb5_auth_context.3 krb5_auth_getcksumtype.3 \
+       krb5_auth_context.3 krb5_auth_getkeytype.3 \
+       krb5_auth_context.3 krb5_auth_getlocalseqnumber.3 \
+       krb5_auth_context.3 krb5_auth_getremoteseqnumber.3 \
+       krb5_auth_context.3 krb5_auth_setcksumtype.3 \
+       krb5_auth_context.3 krb5_auth_setkeytype.3 \
+       krb5_auth_context.3 krb5_auth_setlocalseqnumber.3 \
+       krb5_auth_context.3 krb5_auth_setremoteseqnumber.3 \
+       krb5_build_principal.3 krb5_build_principal_ext.3 \
+       krb5_build_principal.3 krb5_build_principal_va.3 \
+       krb5_build_principal.3 krb5_build_principal_va_ext.3 \
+       krb5_build_principal.3 krb5_make_principal.3 \
+       krb5_ccache.3 krb5_cc_close.3 \
+       krb5_ccache.3 krb5_cc_copy_cache.3 \
+       krb5_ccache.3 krb5_cc_cursor.3 \
+       krb5_ccache.3 krb5_cc_default.3 \
+       krb5_ccache.3 krb5_cc_default_name.3 \
+       krb5_ccache.3 krb5_cc_destroy.3 \
+       krb5_ccache.3 krb5_cc_end_seq_get.3 \
+       krb5_ccache.3 krb5_cc_gen_new.3 \
+       krb5_ccache.3 krb5_cc_get_name.3 \
+       krb5_ccache.3 krb5_cc_get_ops.3 \
+       krb5_ccache.3 krb5_cc_get_principal.3 \
+       krb5_ccache.3 krb5_cc_get_type.3 \
+       krb5_ccache.3 krb5_cc_get_version.3 \
+       krb5_ccache.3 krb5_cc_initialize.3 \
+       krb5_ccache.3 krb5_cc_next_cred.3 \
+       krb5_ccache.3 krb5_cc_ops.3 \
+       krb5_ccache.3 krb5_cc_register.3 \
+       krb5_ccache.3 krb5_cc_remove_cred.3 \
+       krb5_ccache.3 krb5_cc_resolve.3 \
+       krb5_ccache.3 krb5_cc_retrieve_cred.3 \
+       krb5_ccache.3 krb5_cc_set_default_name.3 \
+       krb5_ccache.3 krb5_cc_set_flags.3 \
+       krb5_ccache.3 krb5_cc_store_cred.3 \
+       krb5_ccache.3 krb5_fcc_ops.3 \
+       krb5_ccache.3 krb5_mcc_ops.3 \
+       krb5_config.3 krb5_config_get_bool_default.3 \
+       krb5_config.3 krb5_config_get_int_default.3 \
+       krb5_config.3 krb5_config_get_string_default.3 \
+       krb5_config.3 krb5_config_get_time_default.3 \
+       krb5_create_checksum.3 krb5_checksum_is_collision_proof.3 \
+       krb5_create_checksum.3 krb5_checksum_is_keyed.3 \
+       krb5_create_checksum.3 krb5_checksumsize.3 \
+       krb5_create_checksum.3 krb5_verify_checksum.3 \
+       krb5_crypto_init.3 krb5_crypto_destroy.3 \
+       krb5_data.3 krb5_copy_data.3 \
+       krb5_data.3 krb5_data_alloc.3 \
+       krb5_data.3 krb5_data_copy.3 \
+       krb5_data.3 krb5_data_free.3 \
+       krb5_data.3 krb5_data_realloc.3 \
+       krb5_data.3 krb5_data_zero.3 \
+       krb5_data.3 krb5_free_data.3 \
+       krb5_data.3 krb5_free_data_contents.3 \
+       krb5_encrypt.3 krb5_decrypt.3 \
+       krb5_encrypt.3 krb5_decrypt_EncryptedData.3 \
+       krb5_encrypt.3 krb5_encrypt_EncryptedData.3 \
+       krb5_get_all_client_addrs.3 krb5_get_all_server_addrs.3 \
+       krb5_get_krbhst.3 krb5_free_krbhst.3 \
+       krb5_get_krbhst.3 krb5_get_krb524hst.3 \
+       krb5_get_krbhst.3 krb5_get_krb_admin_hst.3 \
+       krb5_get_krbhst.3 krb5_get_krb_changepw_hst.3 \
+       krb5_init_context.3 krb5_free_context.3 \
+       krb5_keytab.3 krb5_keytab_entry.3 \
+       krb5_keytab.3 krb5_kt_add_entry.3 \
+       krb5_keytab.3 krb5_kt_close.3 \
+       krb5_keytab.3 krb5_kt_compare.3 \
+       krb5_keytab.3 krb5_kt_copy_entry_contents.3 \
+       krb5_keytab.3 krb5_kt_cursor.3 \
+       krb5_keytab.3 krb5_kt_default.3 \
+       krb5_keytab.3 krb5_kt_default_name.3 \
+       krb5_keytab.3 krb5_kt_end_seq_get.3 \
+       krb5_keytab.3 krb5_kt_free_entry.3 \
+       krb5_keytab.3 krb5_kt_get_entry.3 \
+       krb5_keytab.3 krb5_kt_get_name.3 \
+       krb5_keytab.3 krb5_kt_get_type.3 \
+       krb5_keytab.3 krb5_kt_next_entry.3 \
+       krb5_keytab.3 krb5_kt_ops.3 \
+       krb5_keytab.3 krb5_kt_read_service_key.3 \
+       krb5_keytab.3 krb5_kt_register.3 \
+       krb5_keytab.3 krb5_kt_remove_entry.3 \
+       krb5_keytab.3 krb5_kt_resolve.3 \
+       krb5_keytab.3 krb5_kt_start_seq_get.3 \
+       krb5_krbhst_init.3 krb5_krbhst_format_string.3 \
+       krb5_krbhst_init.3 krb5_krbhst_free.3 \
+       krb5_krbhst_init.3 krb5_krbhst_get_addrinfo.3 \
+       krb5_krbhst_init.3 krb5_krbhst_next.3 \
+       krb5_krbhst_init.3 krb5_krbhst_next_as_string.3 \
+       krb5_krbhst_init.3 krb5_krbhst_reset.3 \
+       krb5_openlog.3 krb5_addlog_dest.3 \
+       krb5_openlog.3 krb5_addlog_func.3 \
+       krb5_openlog.3 krb5_closelog.3 \
+       krb5_openlog.3 krb5_initlog.3 \
+       krb5_openlog.3 krb5_log.3 \
+       krb5_openlog.3 krb5_log_msg.3 \
+       krb5_openlog.3 krb5_vlog.3 \
+       krb5_openlog.3 krb5_vlog_msg.3 \
+       krb5_principal_get_realm.3 krb5_principal_get_comp_string.3 \
+       krb5_set_default_realm.3 krb5_free_host_realm.3 \
+       krb5_set_default_realm.3 krb5_get_default_realm.3 \
+       krb5_set_default_realm.3 krb5_get_default_realms.3 \
+       krb5_set_default_realm.3 krb5_get_host_realm.3 \
+       krb5_sname_to_principal.3 krb5_sock_to_principal.3 \
+       krb5_timeofday.3 krb5_us_timeofday.3 \
+       krb5_verify_user.3 krb5_verify_opt_init.3 \
+       krb5_verify_user.3 krb5_verify_opt_set_flags.3 \
+       krb5_verify_user.3 krb5_verify_opt_set_keytab.3 \
+       krb5_verify_user.3 krb5_verify_opt_set_secure.3 \
+       krb5_verify_user.3 krb5_verify_opt_set_service.3 \
+       krb5_verify_user.3 krb5_verify_user_lrealm.3 \
+       krb5_verify_user.3 krb5_verify_user_opt.3 \
+       krb5_warn.3 krb5_err.3 \
+       krb5_warn.3 krb5_errx.3 \
+       krb5_warn.3 krb5_set_warn_dest.3 \
+       krb5_warn.3 krb5_verr.3 \
+       krb5_warn.3 krb5_verrx.3 \
+       krb5_warn.3 krb5_vwarn.3 \
+       krb5_warn.3 krb5_vwarnx.3 \
+       krb5_warn.3 krb5_warnx.3
+
+SRCS=  acl.c \
        add_et_list.c \
        addr_families.c \
        aname_to_localname.c \
@@ -24,9 +224,9 @@ SRCS=        \
        codec.c \
        config_file.c \
        config_file_netinfo.c \
-       convert_creds.c \
        constants.c \
        context.c \
+       convert_creds.c \
        copy_host_realm.c \
        crc.c \
        creds.c \
@@ -51,15 +251,21 @@ SRCS=      \
        get_in_tkt_with_keytab.c \
        get_in_tkt_with_skey.c \
        get_port.c \
+       heim_err.c \
+       heim_err.h \
        init_creds.c \
        init_creds_pw.c \
+       k524_err.c \
+       k524_err.h \
        keyblock.c \
        keytab.c \
        keytab_any.c \
        keytab_file.c \
-       keytab_memory.c \
        keytab_keyfile.c \
        keytab_krb4.c \
+       keytab_memory.c \
+       krb5_err.c \
+       krb5_err.h \
        krbhst.c \
        kuserok.c \
        log.c \
@@ -71,9 +277,9 @@ SRCS=        \
        mk_req.c \
        mk_req_ext.c \
        mk_safe.c \
+       n-fold.c \
        net_read.c \
        net_write.c \
-       n-fold.c \
        padata.c \
        principal.c \
        prog_setup.c \
@@ -102,51 +308,12 @@ SRCS=     \
        verify_user.c \
        version.c \
        warn.c \
-       write_message.c \
-       krb5_err.c \
-       k524_err.c \
-       k524_err.h \
-       heim_err.c \
-       heim_err.h
-
-INCS=  krb5.h ${.CURDIR}/../../include/krb5-types.h \
-       krb5-protos.h heim_err.h krb5_err.h k524_err.h
-
-MAN=                                           \
-       krb5.3                                  \
-       krb5_425_conv_principal.3               \
-       krb5_appdefault.3                       \
-       krb5_auth_context.3                     \
-       krb5_build_principal.3                  \
-       krb5_config.3                           \
-       krb5_context.3                          \
-       krb5_create_checksum.3                  \
-       krb5_crypto_init.3                      \
-       krb5_encrypt.3                          \
-       krb5_free_addresses.3                   \
-       krb5_free_principal.3                   \
-       krb5_get_all_client_addrs.3             \
-       krb5_get_krbhst.3                       \
-       krb5_init_context.3                     \
-       krb5_keytab.3                           \
-       krb5_krbhst_init.3                      \
-       krb5_openlog.3                          \
-       krb5_parse_name.3                       \
-       krb5_principal_get_realm.3              \
-       krb5_sname_to_principal.3               \
-       krb5_timeofday.3                        \
-       krb5_unparse_name.3                     \
-       krb5_verify_user.3                      \
-       krb5_warn.3
-
-MAN+=                                          \
-       krb5.conf.5
+       write_message.c
 
-MAN+=                                          \
-       kerberos.8                              \
-       verify_krb5_conf.8
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+DPADD+=        ${LIBUTIL}
+LDADD+=        -lutil
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/krb5
-.PATH:         ${KRB5DIR}/lib/des
+.PATH: ${KRB5DIR}/lib/krb5 ${.CURDIR}/../../include
index fe45c5c..04ad6c5 100644 (file)
@@ -1,70 +1,65 @@
-# $FreeBSD: src/kerberos5/lib/libroken/Makefile,v 1.3.2.7 2002/09/01 04:22:01 nectar Exp $
-# $DragonFly: src/kerberos5/lib/libroken/Makefile,v 1.4 2004/03/26 21:58:13 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libroken/Makefile,v 1.16 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libroken/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
-LIB=           roken
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${INCLUDEOBJDIR} \
-               -I${KRB5DIR}/lib/roken \
-               -I${.OBJDIR}
+LIB=   roken
+INCS=  roken.h roken-common.h
 
-SRCS=          \
-       base64.c                \
-       bswap.c                 \
-       concat.c                \
-       ecalloc.c               \
-       emalloc.c               \
-       environment.c           \
-       eread.c                 \
-       erealloc.c              \
-       esetenv.c               \
-       estrdup.c               \
-       ewrite.c                \
-       getaddrinfo_hostspec.c  \
-       get_default_username.c  \
-       get_window_size.c       \
-       getarg.c                \
-       getnameinfo_verified.c  \
-       hostent_find_fqdn.c     \
-       issuid.c                \
-       k_getpwnam.c            \
-       k_getpwuid.c            \
-       mini_inetd.c            \
-       ndbm_wrap.c             \
-       net_read.c              \
-       net_write.c             \
-       parse_bytes.c           \
-       parse_time.c            \
-       parse_units.c           \
-       resolve.c               \
-       roken_gethostby.c       \
-       rtbl.c                  \
-       rtbl.h                  \
-       signal.c                \
-       simple_exec.c           \
-       snprintf.c              \
-       socket.c                \
-       strcollect.c            \
-       timeval.c               \
-       tm2time.c               \
-       unvis.c                 \
-       verify.c                \
-       vis.c                   \
-       warnerr.c               \
-       write_pid.c             \
-       xdbm.h                  \
-       copyhostent.c           \
-       strlwr.c                \
-       strndup.c               \
-       strnlen.c               \
-       strsep_copy.c           \
-       strupr.c                \
-       roken.h
+SRCS=  base64.c \
+       bswap.c \
+       concat.c \
+       copyhostent.c \
+       ecalloc.c \
+       emalloc.c \
+       environment.c \
+       eread.c \
+       erealloc.c \
+       esetenv.c \
+       estrdup.c \
+       ewrite.c \
+       get_default_username.c \
+       get_window_size.c \
+       getaddrinfo_hostspec.c \
+       getarg.c \
+       getnameinfo_verified.c \
+       hostent_find_fqdn.c \
+       issuid.c \
+       k_getpwnam.c \
+       k_getpwuid.c \
+       mini_inetd.c \
+       ndbm_wrap.c \
+       net_read.c \
+       net_write.c \
+       parse_bytes.c \
+       parse_time.c \
+       parse_units.c \
+       resolve.c \
+       roken.h \
+       roken_gethostby.c \
+       rtbl.c \
+       simple_exec.c \
+       snprintf.c \
+       socket.c \
+       strcollect.c \
+       strlwr.c \
+       strndup.c \
+       strnlen.c \
+       strsep_copy.c \
+       strupr.c \
+       timeval.c \
+       tm2time.c \
+       unvis.c \
+       verify.c \
+       vis.c \
+       warnerr.c \
+       write_pid.c
 
-INCS=  roken.h ${KRB5DIR}/lib/roken/roken-common.h
+CFLAGS+=-I${KRB5DIR}/lib/roken -I.
 
-.include <bsd.lib.mk>
+CLEANFILES= roken.h
 
-.PATH:         ${KRB5DIR}/lib/roken
+roken.h:
+       ${MAKEROKEN} > ${.TARGET}
 
-build-tools: make-roken.nx
+.include <bsd.lib.mk>
 
+.PATH: ${KRB5DIR}/lib/roken
index 00e2e6c..6a0e6db 100644 (file)
@@ -1,17 +1,11 @@
-# $FreeBSD: src/kerberos5/lib/libsl/Makefile,v 1.3.2.1 2002/07/19 18:46:24 ru Exp $
-# $DragonFly: src/kerberos5/lib/libsl/Makefile,v 1.3 2004/03/22 20:58:02 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libsl/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
+# $DragonFly: src/kerberos5/lib/libsl/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
 LIB=   sl
-CFLAGS+=-I${KRB5DIR}/lib/sl \
-       -I${KRB5DIR}/lib/roken \
-       -I${KRB5DIR}/include \
-       -I${.OBJDIR}
-SRCS=  sl.c roken.h
-
-INTERNALLIB= yes
+INTERNALLIB=
+SRCS=  sl.c
+CFLAGS+=-I${KRB5DIR}/lib/sl
 
 .include <bsd.lib.mk>
 
-.PATH: ${KRB5DIR}/lib/sl
-
-build-tools:   make-roken.nx
+.PATH: ${KRB5DIR}/lib/sl
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
deleted file mode 100644 (file)
index ef0d3c4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD: src/kerberos5/lib/libtelnet/Makefile,v 1.14.2.4 2003/04/24 19:13:59 nectar Exp $
-# $DragonFly: src/kerberos5/lib/libtelnet/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
-
-LIB=           telnet
-
-INTERNALLIB=   yes
-
-SRCS=          genget.c getent.c misc.c encrypt.c auth.c \
-               enc_des.c sra.c pk.c kerberos5.c
-
-#WARNS?=               2
-
-CFLAGS+=       -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
-CFLAGS+=       -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
-CFLAGS+=       -DFORWARD -Dnet_write=telnet_net_write
-
-INCS=          ${TELNETDIR}/arpa/telnet.h
-INCSDIR=       ${INCLUDEDIR}/arpa
-
-.include <bsd.lib.mk>
-
-.PATH: ${TELNETDIR}/libtelnet
-
-#
-# Remove obsolete shared libraries, if any.  We don't bother moving them
-# to /usr/lib/compat, since they were only used by telnet, telnetd and
-# tn3270.
-#
-beforeinstall: __remove-stale-libs
-__remove-stale-libs: .PHONY
-.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
-       -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-       rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-.endif
index a480746..c582f3c 100644 (file)
@@ -1,28 +1,16 @@
-# $FreeBSD: src/kerberos5/lib/libvers/Makefile,v 1.3.2.2 2002/07/19 18:46:25 ru Exp $
-# $DragonFly: src/kerberos5/lib/libvers/Makefile,v 1.3 2004/03/22 20:58:08 dillon Exp $
+# $FreeBSD: src/kerberos5/lib/libvers/Makefile,v 1.8 2004/02/05 18:51:50 ru Exp $
+# $DragonFly: src/kerberos5/lib/libvers/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
-LIB=           vers
-INTERNALLIB=   YES
+LIB=   vers
+INTERNALLIB=
+SRCS=  print_version.c print_version.h
+CFLAGS+=-I.
 
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${ROKENOBJDIR} \
-               -I${KRB5DIR}/lib/roken \
-               -I${.OBJDIR}
+CLEANFILES= print_version.h
 
-SRCS=          \
-               print_version.c \
-               print_version.h
+print_version.h:
+       ${MAKEPRINTVERSION} ${.TARGET}
 
 .include <bsd.lib.mk>
 
-.PATH:         ${KRB5DIR}/lib/vers
-
-build-tools:   make-print-version.nx
-
-print_version.h: make-print-version.nx
-       ./make-print-version.nx print_version.h
-
-make-print-version.nx: make-print-version.c
-       ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
-
-CLEANFILES+=   make-print-version.nx print_version.h
+.PATH: ${KRB5DIR}/lib/vers
index 1567d38..73345e0 100644 (file)
@@ -1,6 +1,6 @@
-# $FreeBSD: src/kerberos5/libexec/Makefile,v 1.2.2.1 2002/04/30 14:57:42 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $FreeBSD: src/kerberos5/libexec/Makefile,v 1.6 2004/01/30 11:06:48 mr Exp $
+# $DragonFly: src/kerberos5/libexec/Makefile,v 1.3 2005/01/16 14:25:46 eirikn Exp $
 
-SUBDIR=        ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd telnetd
+SUBDIR=        ipropd-master ipropd-slave hprop hpropd kadmind kdc kpasswdd
 
 .include <bsd.subdir.mk>
index 496b56e..8c01d04 100644 (file)
@@ -1,5 +1,8 @@
-#      $Id$
+# $FreeBSD: src/kerberos5/libexec/Makefile.inc,v 1.2 2004/02/05 18:51:50 ru Exp $
+# $DragonFly: src/kerberos5/libexec/Makefile.inc,v 1.2 2005/01/16 14:25:46 eirikn Exp $
 
 BINDIR=        /usr/libexec
 
+CFLAGS+=-I${.OBJDIR}/../../lib/libroken/
+
 .include "../Makefile.inc"
index f5f9624..9412f9f 100644 (file)
@@ -1,27 +1,16 @@
-# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.3.2.3 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/libexec/hprop/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
+# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
+# $DragonFly: src/kerberos5/libexec/hprop/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
-PROG=          hprop
-SRCS=          hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/kdc \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-               -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN=           hprop.8
+PROG=  hprop
+MAN=   hprop.8
+SRCS=  hprop.c mit_dump.c v4_dump.c
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
index 41a47c5..95888db 100644 (file)
@@ -1,27 +1,16 @@
-# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.3.2.3 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/libexec/hpropd/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
+# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
+# $DragonFly: src/kerberos5/libexec/hpropd/Makefile,v 1.4 2005/01/16 14:25:46 eirikn Exp $
 
-PROG=          hpropd
-SRCS=          hpropd.c hprop.h hdb_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/kdc \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN=           hpropd.8
+PROG=  hpropd
+MAN=   hpropd.8
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
+       ${LDAPCFLAGS}
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
index 664a290..c83f08b 100644 (file)
@@ -1,31 +1,17 @@
-# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.3.2.3 2002/09/23 14:00:44 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $
+# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
+# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
-PROG=          ipropd-master
-SRCS=          ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         \
-               -L${KADM5SOBJDIR} -lkadm5srv \
-               -L${KRB5OBJDIR} -lkrb5 \
-               -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \
-               -lutil
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-               ${LIBUTIL}
-NOMAN=         yes
+PROG=  ipropd-master
+NOMAN=
+SRCS=  ipropd_master.c kadm5_err.h
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+       -I. ${LDAPCFLAGS}
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
index 916e7da..48bc58f 100644 (file)
@@ -1,31 +1,17 @@
-# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.3.2.3 2002/09/23 14:00:48 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $
+# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
+# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
-PROG=          ipropd-slave
-SRCS=          ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         \
-               -L${KADM5SOBJDIR} -lkadm5srv \
-               -L${KRB5OBJDIR} -lkrb5 \
-               -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \
-               -lutil
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-               ${LIBUTIL}
-NOMAN=         yes
+PROG=  ipropd-slave
+NOMAN=
+SRCS=  ipropd_slave.c kadm5_err.h
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+       -I. ${LDAPCFLAGS}
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
deleted file mode 100644 (file)
index db2a9d1..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.4.2.3 2002/09/23 14:00:48 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/k5admind/Attic/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $
-
-PROG=          k5admind
-SRCS=          kadmind.c server.c kadm_conn.c \
-               kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/sl \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/kadmin \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         \
-               -L${KADM5SOBJDIR} -lkadm5srv \
-               -L${KRB5OBJDIR} -lkrb5 \
-               -L${HDBOBJDIR} -lhdb \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \
-               -lutil
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-               ${LIBUTIL}
-NOMAN=         yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h:       kadm5
-       cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h: kadm5
-       cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-       cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-       mkdir ${.TARGET}
-
-CLEANFILES+=   kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=    kadm5
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
deleted file mode 100644 (file)
index 0677241..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.4.2.4 2002/09/01 04:22:02 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/k5passwdd/Attic/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $
-
-PROG=          k5passwdd
-SRCS=          kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
-               kadm5/admin.h kadm5/private.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/kpasswd \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
-               -lutil
-DPADD=         ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-               ${LIBUTIL}
-MAN=           kpasswdd.8
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kpasswd
-
-kadm5/admin.h: kadm5
-       cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/private.h: kadm5
-       cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5:
-       mkdir ${.TARGET}
-
-CLEANFILES+=   kadm5/admin.h kadm5/private.h
-CLEANDIRS+=    kadm5
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
new file mode 100644 (file)
index 0000000..0d0c735
--- /dev/null
@@ -0,0 +1,17 @@
+# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.18 2004/02/05 18:51:50 ru Exp $
+# $DragonFly: src/kerberos5/libexec/kadmind/Makefile,v 1.1 2005/01/16 14:25:46 eirikn Exp $
+
+PROG=  kadmind
+MAN=   kadmind.8
+SRCS=  kadm_conn.c kadmind.c server.c
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+       ${LDAPCFLAGS}
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kadmin
index 73d2918..884d7f5 100644 (file)
@@ -1,37 +1,26 @@
-# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.3.2.4 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $
+# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.17 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.5 2005/01/16 14:25:46 eirikn Exp $
 
-PROG=          kdc
-SRCS=          \
-       config.c        \
-       connect.c       \
-       kdc_locl.h      \
-       kerberos5.c     \
-       log.c           \
-       main.c          \
+PROG=  kdc
+MAN=   kdc.8
+
+SRCS=  524.c \
+       config.c \
+       connect.c \
+       kerberos4.c \
+       kerberos5.c \
+       log.c \
+       main.c \
        misc.c
 
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/kdc \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \
-               -lutil
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-               ${LIBUTIL}
-MAN=           kdc.8
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+       ${LDAPCFLAGS}
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
new file mode 100644 (file)
index 0000000..23b6892
--- /dev/null
@@ -0,0 +1,15 @@
+# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/libexec/kpasswdd/Makefile,v 1.1 2005/01/16 14:25:46 eirikn Exp $
+
+PROG=  kpasswdd
+MAN=   kpasswdd.8
+CFLAGS+=-I${KRB5DIR}/lib/roken ${LDAPCFLAGS}
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kpasswd
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
deleted file mode 100644 (file)
index 235d292..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.15.2.2 2003/04/24 19:14:00 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/telnetd/Attic/Makefile,v 1.4 2005/01/11 13:22:41 joerg Exp $
-
-# Do not define -DKLUDGELINEMODE, as it does not interact well with many
-# telnet implementations.
-
-PROG=          telnetd
-MAN=           telnetd.8
-
-SRCS=          global.c slc.c state.c sys_term.c telnetd.c \
-               termstat.c utility.c authenc.c
-
-CFLAGS+=       -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-               -DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-               -I${TELNETDIR} -DINET6
-CFLAGS+=       -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
-
-WARNS?=                2
-
-DPADD=         ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} \
-               ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
-               ${LIBCRYPT} ${LIBPAM}
-LDADD=         -lutil -ltermcap ${LIBTELNET} -lcrypto \
-               -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
-               -L${ROKENOBJDIR} -lroken -lcom_err \
-               -lcrypt ${MINUSLPAM}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TELNETDIR}/telnetd
diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
new file mode 100644 (file)
index 0000000..a7c5007
--- /dev/null
@@ -0,0 +1,6 @@
+# $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $
+# $DragonFly: src/kerberos5/tools/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+SUBDIR=        make-print-version make-roken asn1_compile
+
+.include <bsd.subdir.mk>
diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc
new file mode 100644 (file)
index 0000000..e0559ee
--- /dev/null
@@ -0,0 +1,6 @@
+# $FreeBSD: src/kerberos5/tools/Makefile.inc,v 1.1 2004/01/31 08:15:55 ru Exp $
+# $DragonFly: src/kerberos5/tools/Makefile.inc,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+realinstall:
+
+.include "../Makefile.inc"
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
new file mode 100644 (file)
index 0000000..9d47b33
--- /dev/null
@@ -0,0 +1,44 @@
+# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.5 2004/12/21 08:47:01 ru Exp $
+# $DragonFly: src/kerberos5/tools/asn1_compile/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  asn1_compile
+NOMAN=
+
+NOINCS=
+
+SRCS=  gen.c \
+       gen_copy.c \
+       gen_decode.c \
+       gen_encode.c \
+       gen_free.c \
+       gen_glue.c \
+       gen_length.c \
+       hash.c \
+       emalloc.c \
+       main.c \
+       symbol.c \
+       getarg.c \
+       warnerr.c \
+       lex.l \
+       parse.y \
+       print_version.c \
+       print_version.h \
+       roken.h \
+       get_window_size.c \
+       strupr.c
+
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
+
+CLEANFILES= print_version.h roken.h
+
+print_version.h:
+       ${MAKEPRINTVERSION} ${.TARGET}
+
+roken.h:
+       ${MAKEROKEN} > ${.TARGET}
+
+.include <bsd.prog.mk>
+
+# There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers,
+# so the order of paths is important here.
+.PATH: ${KRB5DIR}/lib/vers ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/asn1
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
new file mode 100644 (file)
index 0000000..c79e0de
--- /dev/null
@@ -0,0 +1,9 @@
+# $FreeBSD: src/kerberos5/tools/make-print-version/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
+# $DragonFly: src/kerberos5/tools/make-print-version/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  make-print-version
+NOMAN=
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/vers
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
new file mode 100644 (file)
index 0000000..887623f
--- /dev/null
@@ -0,0 +1,12 @@
+# $FreeBSD: src/kerberos5/tools/make-roken/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
+# $DragonFly: src/kerberos5/tools/make-roken/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  make-roken
+NOMAN=
+
+CLEANFILES= make-roken.c
+
+.include <bsd.prog.mk>
+
+make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
+       awk -f ${.ALLSRC} > ${.TARGET}
index f78aa32..8fcb396 100644 (file)
@@ -1,6 +1,7 @@
-# $FreeBSD: src/kerberos5/usr.bin/Makefile,v 1.3.2.3 2002/04/30 14:57:43 nectar Exp $
-# $DragonFly: src/kerberos5/usr.bin/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $FreeBSD: src/kerberos5/usr.bin/Makefile,v 1.11 2004/01/31 08:15:56 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/Makefile,v 1.3 2005/01/16 14:25:47 eirikn Exp $
 
-SUBDIR=        k5admin k5destroy k5init k5list k5passwd k5su krb5-config telnet
+SUBDIR=        kadmin kdestroy kinit klist kpasswd krb5-config ksu \
+       verify_krb5_conf
 
 .include <bsd.subdir.mk>
index ccf6078..e03511b 100644 (file)
@@ -1,6 +1,8 @@
 # $FreeBSD: src/kerberos5/usr.bin/Makefile.inc,v 1.1.1.1 2000/01/15 21:38:04 markm Exp $
-# $DragonFly: src/kerberos5/usr.bin/Makefile.inc,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/Makefile.inc,v 1.3 2005/01/16 14:25:47 eirikn Exp $
 
 BINDIR=        /usr/bin
 
+CFLAGS+=-I${.OBJDIR}/../../lib/libroken/
+
 .include "../Makefile.inc"
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
deleted file mode 100644 (file)
index da63d97..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.4.2.2 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5admin/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
-
-PROG=          k5admin
-SRCS=          \
-       ank.c                                   \
-       cpw.c                                   \
-       del.c                                   \
-       del_enctype.c                           \
-       dump.c                                  \
-       ext.c                                   \
-       get.c                                   \
-       init.c                                  \
-       kadmin.c                                \
-       load.c                                  \
-       mod.c                                   \
-       rename.c                                \
-       util.c                                  \
-       random_password.c                       \
-       kadmin_locl.h                           \
-       krb5_err.h heim_err.h hdb_err.h         \
-       kadm5/private.h                         \
-       kadm5/admin.h                           \
-       kadm5/kadm5_err.h
-
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/lib/sl \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/kadmin \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-               -L${HDBOBJDIR} -lhdb \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
-               -L${SLOBJDIR} -lsl -lreadline
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
-               ${LIBSL} ${LIBREADLINE}
-NOMAN=         yes
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kadmin
-
-kadm5/private.h:       kadm5
-       cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h: kadm5
-       cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-       cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-       mkdir ${.TARGET}
-
-CLEANFILES+=   kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=    kadm5
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
deleted file mode 100644 (file)
index d4d69a2..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.4.2.3 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5destroy/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
-
-PROG=          k5destroy
-SRCS=          kdestroy.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/kafs \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5destroy.1:   kdestroy.1
-       ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
deleted file mode 100644 (file)
index 6542301..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5init/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          k5init
-SRCS=          kinit.c asn1_err.h krb5_err.h heim_err.h \
-                       k524_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/kafs \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5init.1:      kinit.1
-       ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
deleted file mode 100644 (file)
index 133f630..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5list/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          k5list
-SRCS=          klist.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/kafs \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
-
-k5list.1:      klist.1
-       ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
deleted file mode 100644 (file)
index 77b84b9..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5passwd/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          k5passwd
-SRCS=          kpasswd.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/kpasswd \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kpasswd
-
-k5passwd.1:    kpasswd.1
-       ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
deleted file mode 100644 (file)
index 867d6c7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.1.2.6 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5su/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          k5su
-SRCS=          su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/kafs \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/kuser \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-NOMAN=         true
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-.if defined(ENABLE_SUID_K5SU)
-BINMODE=4555
-.endif
-INSTALLFLAGS=-fschg
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
new file mode 100644 (file)
index 0000000..6f1fce6
--- /dev/null
@@ -0,0 +1,36 @@
+# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/kadmin/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  kadmin
+MAN=   kadmin.8
+
+SRCS=  ank.c \
+       cpw.c \
+       del.c \
+       del_enctype.c \
+       dump.c \
+       ext.c \
+       get.c \
+       init.c \
+       kadmin.c \
+       load.c \
+       mod.c \
+       random_password.c \
+       rename.c \
+       util.c
+
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
+       -I${KRB5DIR}/lib/sl ${LDAPCFLAGS}
+DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \
+       ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
+       ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
+       ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
+LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 \
+       ${LIBSL} -lroken ${LIBVERS} -lasn1 \
+       -lcrypto -lcrypt -lcom_err \
+       -lreadline -lncurses ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kadmin
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
new file mode 100644 (file)
index 0000000..719b7f6
--- /dev/null
@@ -0,0 +1,13 @@
+# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  kdestroy
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
new file mode 100644 (file)
index 0000000..fc0cdd8
--- /dev/null
@@ -0,0 +1,13 @@
+# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/kinit/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  kinit
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
new file mode 100644 (file)
index 0000000..0cd0571
--- /dev/null
@@ -0,0 +1,13 @@
+# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/klist/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  klist
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
new file mode 100644 (file)
index 0000000..a89dee0
--- /dev/null
@@ -0,0 +1,13 @@
+# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.14 2004/02/05 18:51:52 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  kpasswd
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kpasswd
index 83af20a..e280909 100644 (file)
@@ -1,25 +1,25 @@
-# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.1.2.8 2002/12/01 17:45:32 nectar Exp $
-# $DragonFly: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.14 2004/04/13 16:41:00 nectar Exp $
+# $DragonFly: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.3 2005/01/16 14:25:47 eirikn Exp $
 
-SCRIPTS=       krb5-config
-MAN=           krb5-config.1
-CLEANFILES=    krb5-config
+SCRIPTS=krb5-config
+MAN=   krb5-config.1
+
+CLEANFILES= krb5-config
 
 krb5-config: krb5-config.in
-       sed     -e "s,@PACKAGE\@,FreeBSD heimdal,g" \
-               -e "s,@VERSION\@,0.5.1,g" \
-               -e "s,@prefix\@,/usr,g" \
-               -e "s,@exec_prefix\@,/usr,g" \
-               -e "s,@libdir\@,${LIBDIR},g" \
-               -e "s,@includedir\@,${INCLUDEDIR},g" \
-               -e "s,@LIB_crypt\@,-lcrypt,g" \
-               -e "s,@LIB_dbopen\@,,g" \
-               -e "s,@LIB_des_appl\@,-lcrypto,g" \
-               -e "s,@LIBS\@,-lcom_err,g" \
-               -e "s,@INCLUDE_des@,,g" \
-               ${.ALLSRC} > ${.TARGET}
-       chmod +x ${.TARGET}
+       sed -e "s,@PACKAGE\@,DragonFly heimdal,g" \
+           -e "s,@VERSION\@,0.6.1,g" \
+           -e "s,@prefix\@,/usr,g" \
+           -e "s,@exec_prefix\@,/usr,g" \
+           -e "s,@libdir\@,${LIBDIR},g" \
+           -e "s,@includedir\@,${INCLUDEDIR},g" \
+           -e "s,@LIB_crypt\@,-lcrypt,g" \
+           -e "s,@LIB_dbopen\@,,g" \
+           -e "s,@LIB_des_appl\@,-lcrypto,g" \
+           -e "s,@LIBS\@,-lcom_err,g" \
+           -e "s,@INCLUDE_des@,,g" \
+           ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/tools
+.PATH: ${KRB5DIR}/tools
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
new file mode 100644 (file)
index 0000000..cb5b1fe
--- /dev/null
@@ -0,0 +1,19 @@
+# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.15 2004/12/21 08:47:02 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/ksu/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  ksu
+.if defined(ENABLE_SUID_K5SU)
+BINMODE=4555
+PRECIOUSPROG=
+.endif
+NOMAN=
+SRCS=  su.c
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
deleted file mode 100644 (file)
index 984b3e8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.16.2.2 2003/04/24 19:14:00 nectar Exp $
-# $DragonFly: src/kerberos5/usr.bin/telnet/Attic/Makefile,v 1.4 2005/01/11 13:22:41 joerg Exp $
-
-PROG=          telnet
-
-SRCS=          authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-               telnet.c terminal.c utilities.c
-
-CFLAGS+=       -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
-               -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-               -I${TELNETDIR} -I${TELNETDIR}/libtelnet/
-
-CFLAGS+=       -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
-
-WARNS?=                2
-
-DPADD=         ${LIBTERMCAP} ${LIBTELNET} \
-               ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
-               ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD=         -ltermcap ${LIBTELNET} \
-               -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
-               -L${ROKENOBJDIR} -lroken \
-               -lcrypto -lcrypt -lipsec ${MINUSLPAM}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TELNETDIR}/telnet
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
new file mode 100644 (file)
index 0000000..368aaa6
--- /dev/null
@@ -0,0 +1,14 @@
+# $FreeBSD: src/kerberos5/usr.bin/verify_krb5_conf/Makefile,v 1.3 2004/02/05 18:51:52 ru Exp $
+# $DragonFly: src/kerberos5/usr.bin/verify_krb5_conf/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  verify_krb5_conf
+MAN=   verify_krb5_conf.8
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/krb5
index b865d98..a7acb15 100644 (file)
@@ -1,6 +1,6 @@
-# $FreeBSD: src/kerberos5/usr.sbin/Makefile,v 1.2 2000/02/28 19:15:28 markm Exp $
-# $DragonFly: src/kerberos5/usr.sbin/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $FreeBSD: src/kerberos5/usr.sbin/Makefile,v 1.3 2003/03/09 21:56:55 markm Exp $
+# $DragonFly: src/kerberos5/usr.sbin/Makefile,v 1.3 2005/01/16 14:25:47 eirikn Exp $
 
-SUBDIR=        k5stash ktutil
+SUBDIR=        kstash ktutil
 
 .include <bsd.subdir.mk>
index 220d53d..41abf84 100644 (file)
@@ -1,6 +1,8 @@
 # $FreeBSD: src/kerberos5/usr.sbin/Makefile.inc,v 1.1.1.1 2000/01/24 19:56:25 markm Exp $
-# $DragonFly: src/kerberos5/usr.sbin/Makefile.inc,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.sbin/Makefile.inc,v 1.3 2005/01/16 14:25:47 eirikn Exp $
 
 BINDIR=        /usr/sbin
 
+CFLAGS+=-I${.OBJDIR}/../../lib/libroken/
+
 .include "../Makefile.inc"
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
deleted file mode 100644 (file)
index e412ed0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD: src/kerberos5/usr.sbin/k5stash/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.sbin/k5stash/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          k5stash
-SRCS=          kstash.c hdb_err.h
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/hdb \
-               -I${KRB5DIR}/kdc \
-               -I${ASN1OBJDIR} \
-               -I${HDBOBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${HDBOBJDIR} -lhdb \
-               -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN=           kstash.8
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
new file mode 100644 (file)
index 0000000..3a10254
--- /dev/null
@@ -0,0 +1,16 @@
+# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.16 2004/02/05 18:51:52 ru Exp $
+# $DragonFly: src/kerberos5/usr.sbin/kstash/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  kstash
+MAN=   kstash.8
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
+       ${LDAPCFLAGS}
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kdc
index 76d8f1a..c2fbc17 100644 (file)
@@ -1,58 +1,27 @@
-# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.3.2.4 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
-
-PROG=          ktutil
-SRCS=          \
-               add.c                           \
-               change.c                        \
-               copy.c                          \
-               get.c                           \
-               ktutil.c                        \
-               list.c                          \
-               purge.c                         \
-               remove.c                        \
-               rename.c \
-               kadm5/private.h \
-               kadm5/admin.h \
-               kadm5/kadm5_err.h \
-               krb5_err.h heim_err.h k524_err.h
-
-CFLAGS+=       -I${KRB5DIR}/include \
-               -I${KRB5DIR}/lib/roken \
-               -I${KRB5DIR}/lib/krb5 \
-               -I${KRB5DIR}/lib/asn1 \
-               -I${KRB5DIR}/lib/sl \
-               -I${KRB5DIR}/lib/kadm5 \
-               -I${KRB5DIR}/admin \
-               -I${ASN1OBJDIR} \
-               -I${.OBJDIR}
-LDADD=         -L${KRB5OBJDIR} -lkrb5 \
-               -L${ROKENOBJDIR} -lroken \
-               -L${VERSOBJDIR} -lvers \
-               ${_krb4libs} \
-               -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
-               -L${KADM5COBJDIR} -lkadm5clnt \
-               -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD=         ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-               ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \
-               ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
-MAN=           ktutil.8
+# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.17 2004/02/05 18:51:52 ru Exp $
+# $DragonFly: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.4 2005/01/16 14:25:47 eirikn Exp $
+
+PROG=  ktutil
+MAN=   ktutil.8
+
+SRCS=  add.c \
+       change.c \
+       copy.c \
+       get.c \
+       ktutil.c \
+       list.c \
+       purge.c \
+       remove.c \
+       rename.c
+
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl
+DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
+       ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
+       ${LIBREADLINE} ${LIBNCURSES}
+LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
+       -lasn1 -lcrypto -lcrypt -lcom_err \
+       -lreadline -lncurses
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/admin
-
-kadm5/private.h:       kadm5
-       cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h: kadm5
-       cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-       cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-       mkdir ${.TARGET}
-
-CLEANFILES+=   kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=    kadm5
+.PATH: ${KRB5DIR}/admin