Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src Pull up revisions 1.3-1.7 (requested by assar):
details: https://anonhg.NetBSD.org/src/rev/8f28ef46b4ea
branches: netbsd-1-5
changeset: 491153:8f28ef46b4ea
user: he <he%NetBSD.org@localhost>
date: Thu Apr 05 23:25:17 2001 +0000
description:
Pull up revisions 1.3-1.7 (requested by assar):
Upgrade Heimdal to version 0.3e.
diffstat:
lib/libasn1/asn1_compile/Makefile | 21 ++++++++++++++++++---
lib/libkadm5/Makefile | 28 ----------------------------
usr.bin/compile_et/Makefile | 14 ++++++++++----
usr.bin/kdestroy/Makefile | 8 +++++++-
usr.bin/kinit/Makefile | 8 +++++++-
usr.bin/klist/Makefile | 8 +++++++-
usr.bin/kpasswd/Makefile | 8 +++++++-
usr.bin/mk_cmds/Makefile | 14 ++++++++++----
usr.bin/string2key/Makefile | 12 +++++++++---
usr.sbin/kstash/Makefile | 13 ++++++++++---
10 files changed, 85 insertions(+), 49 deletions(-)
diffs (truncated from 309 to 300 lines):
diff -r 3368adab3f31 -r 8f28ef46b4ea lib/libasn1/asn1_compile/Makefile
--- a/lib/libasn1/asn1_compile/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/lib/libasn1/asn1_compile/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:45 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:17 he Exp $
+
+NOMAN= noman
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../../crypto/dist
.PATH: ${DIST}/heimdal/lib/asn1 ${DIST}/heimdal/lib/roken
@@ -16,7 +21,7 @@
BINDIR= /usr/bin
-LIBROKEN!= cd ${.CURDIR}/../../libroken && ${MAKE} print-objdir
+LIBROKEN!= cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
HOST_CPPFLAGS+= -I. \
-I${.CURDIR}/../../../include/heimdal \
@@ -25,6 +30,16 @@
-I${DIST}/heimdal/lib/roken \
-DHAVE_CONFIG_H
-NOMAN= noman
+DPSRCS= print_version.h
+
+make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h
+
+make-print-version: make-print-version.lo
+ ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+
+print_version.h: make-print-version
+ ./make-print-version print_version.h
+
+CLEANFILES+= print_version.h make-print-version make-print-version.lo
.include <bsd.hostprog.mk>
diff -r 3368adab3f31 -r 8f28ef46b4ea lib/libkadm5/Makefile
--- a/lib/libkadm5/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:46 thorpej Exp $
-DIST= ${.CURDIR}/../../crypto/dist
-.PATH: ${DIST}/heimdal/lib/kadm5
-
-WARNS?= 1
-MKLINT= no
-
-all: depend
-
-depend: kadm5_err.c kadm5_err.h
-
-COMPILEET!= cd ${.CURDIR}/../libcom_err/compile_et && make print-objdir
-
-kadm5_err.c kadm5_err.h: kadm5_err.et
- ${COMPILEET}/compile_et ${DIST}/heimdal/lib/kadm5/kadm5_err.et
-
-clean cleandir:
- rm -f kadm5_err.c kadm5_err.h
-
-INCSDIR= /usr/include/krb5
-
-INCS= kadm5_err.h
-
-.include <bsd.own.mk>
-.include <bsd.inc.mk>
-.include <bsd.dep.mk>
-.include <bsd.depall.mk>
-.include <bsd.obj.mk>
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/compile_et/Makefile
--- a/usr.bin/compile_et/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/compile_et/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:18 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:18 he Exp $
+
+NOMAN= noman
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/lib/com_err
@@ -17,11 +22,12 @@
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
-LDADD= -lroken \
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
+LDADD= -L${VERS} -lvers \
+ -lroken \
-lcrypt
-NOMAN= noman
-
CLEANFILES+= lex.c parse.c parse.h
.include <bsd.prog.mk>
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/kdestroy/Makefile
--- a/usr.bin/kdestroy/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/kdestroy/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:18 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:18 he Exp $
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kuser
@@ -18,6 +21,8 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
LDADD= \
-lkafs \
-lkrb5 \
@@ -25,6 +30,7 @@
-lcrypto \
-lasn1 \
-lcom_err \
+ -L${VERS} -lvers \
-lroken \
-lcrypt
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/kinit/Makefile
--- a/usr.bin/kinit/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/kinit/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:18 he Exp $
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kuser
@@ -18,6 +21,8 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
LDADD= \
-lkafs \
-lkrb5 \
@@ -25,6 +30,7 @@
-lcrypto \
-lasn1 \
-lcom_err \
+ -L${VERS} -lvers \
-lroken \
-lcrypt
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/klist/Makefile
--- a/usr.bin/klist/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/klist/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:18 he Exp $
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kuser
@@ -18,6 +21,8 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
LDADD= \
-lkafs \
-lkrb5 \
@@ -25,6 +30,7 @@
-lcrypto \
-lasn1 \
-lcom_err \
+ -L${VERS} -lvers \
-lroken \
-lcrypt
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/kpasswd/Makefile
--- a/usr.bin/kpasswd/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/kpasswd/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:19 he Exp $
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kpasswd
@@ -17,10 +20,13 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
LDADD= -lkrb5 \
-lcrypto \
-lasn1 \
-lcom_err \
+ -L${VERS} -lvers \
-lroken \
-lcrypt
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/mk_cmds/Makefile
--- a/usr.bin/mk_cmds/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/mk_cmds/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:19 he Exp $
+
+NOMAN= noman
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/lib/sl
@@ -17,11 +22,12 @@
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
-LDADD= -lroken \
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
+LDADD= -L${VERS} -lvers \
+ -lroken \
-lcrypt
-NOMAN= noman
-
CLEANFILES+=lex.c parse.c parse.h
.include <bsd.prog.mk>
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.bin/string2key/Makefile
--- a/usr.bin/string2key/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.bin/string2key/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:57:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:19 he Exp $
+
+NOMAN=
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kdc
@@ -19,13 +24,14 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
LDADD= -lkrb5 \
-lcrypto \
-lasn1 \
-lcom_err \
+ -L${VERS} -lvers \
-lroken \
-lcrypt
-NOMAN=
-
.include <bsd.prog.mk>
diff -r 3368adab3f31 -r 8f28ef46b4ea usr.sbin/kstash/Makefile
--- a/usr.sbin/kstash/Makefile Thu Apr 05 23:25:13 2001 +0000
+++ b/usr.sbin/kstash/Makefile Thu Apr 05 23:25:17 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/17 00:04:37 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:20 he Exp $
+
+.include <bsd.own.mk>
+
DIST= ${.CURDIR}/../../crypto/dist
.PATH: ${DIST}/heimdal/kdc
@@ -19,13 +22,17 @@
-I${DESTDIR}/usr/include/openssl \
-DHAVE_CONFIG_H
-LDADD= -lkrb5 \
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
+LDADD= -lhdb \
+ -lkrb5 \
-lcrypto \
-lasn1 \
Home |
Main Index |
Thread Index |
Old Index