Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src Merge a bunch of things from crypto-us and crypto-intl ...
details: https://anonhg.NetBSD.org/src/rev/692cff5c38f0
branches: netbsd-1-5
changeset: 488180:692cff5c38f0
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Jun 20 06:00:28 2000 +0000
description:
Merge a bunch of things from crypto-us and crypto-intl into basesrc,
adding support for Heimdal/KTH Kerberos where easy to do so. Eliminate
bsd.crypto.mk.
There is still a bunch more work to do, but crypto is now more-or-less
fully merged into the base NetBSD distribution.
diffstat:
distrib/sets/Makefile | 55 ++++++++++++++++++++++
distrib/sets/README | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
distrib/sets/checkflist | 56 ++++++++++++++++++++++
include/Makefile | 33 +++++++++++++
regress/Makefile | 6 ++
share/mk/Makefile | 18 +++++++
6 files changed, 286 insertions(+), 0 deletions(-)
diffs (truncated from 310 to 300 lines):
diff -r 6305dc41ec24 -r 692cff5c38f0 distrib/sets/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/Makefile Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.2.2.2 2000/06/20 06:00:28 thorpej Exp $
+
+# The `all' target must appear before bsd.own.mk is pulled in.
+all:
+ @echo "Please understand what you are doing, first."
+ @false
+
+#
+# DETERMINE WHICH CRYPTO SET TO USE
+#
+
+.include <bsd.own.mk>
+
+#
+# UTILITY TARGETS
+#
+
+check_destdir: .PHONY
+.if !defined(DESTDIR)
+ @echo "DESTDIR must be set"
+ @false
+.else
+ @true
+.endif
+
+check_releasedir: .PHONY
+.if !defined(RELEASEDIR)
+ @echo "RELEASEDIR must be set"
+ @false
+.else
+ @true
+.endif
+
+#
+# SET BUILDING TARGETS
+#
+
+.PRECIOUS: checkflist
+checkflist: check_destdir
+ DESTDIR=${DESTDIR} sh ${.CURDIR}/checkflist
+
+.PRECIOUS: maketars
+maketars: check_destdir check_releasedir
+ sh ${.CURDIR}/maketars -d ${DESTDIR} -t ${RELEASEDIR}/binary/sets
+
+.PRECIOUS: makesums
+makesums: check_releasedir
+ sh ${.CURDIR}/makesums -t ${RELEASEDIR}/binary/sets
+
+#
+# MAIN ENTRY POINTS
+#
+
+sets: maketars makesums
+ @true
diff -r 6305dc41ec24 -r 692cff5c38f0 distrib/sets/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/README Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,118 @@
+# $NetBSD: README,v 1.4.2.2 2000/06/20 06:00:29 thorpej Exp $
+
+To: "NetBSD Port Maintainers"
+Subject: distribution sets, etc...
+Date: Mon, 18 Jul 1994 05:02:11 -0400
+From: "Chris G. Demetriou"
+
+[ this is also going in a README in the 'sets' directory... ]
+
+well, i've finally sat down and started doing distribution set
+stuff in a "nice, machine-independent way." Should have done
+it months ago, but too much other stuff going on then...
+
+anyway, grab ~cgd/sets.tar.gz -- it's three scripts, and a bunch
+of files.
+
+the scripts should be run from the directory where they reside.
+
+makeflist: output the list of files that should be in a
+ distribution, according to the contents of the
+ 'lists' directory.
+
+checkflist: check the file list (as internally generated
+ by makeflist) against the tree living in $DESTDIR.
+ (that tree should be made with 'make distribution'.)
+
+maketars: make tarballs of the various sets in the distribution,
+ based on the contents of the lists, the tree in
+ $DESTDIR, and put the tarballs in $RELEASEDIR.
+ Note that this script _doesn't_ create the 'secr'
+ distribution, because (for now) it requires
+ manual intervention to get the binaries right...
+ (i'll add another script to create that dist, later.)
+
+what's in 'lists':
+
+lists describing file sets. There are two sets of lists per file
+set: machine dependent and machine-independent files. (there's
+also another file in the 'man' dir, which is used by the 'man'
+and 'misc' sets, but that's explained later.)
+
+There is one machine-independent file, named "mi". There are
+N machine-dependent files (one per architecture), named "md.${ARCH}".
+
+the sets are as follows:
+
+ base: the base binary set. excludes everything described
+ below.
+
+ comp: compiler tools. All of the tools relating to C, C++,
+ and FORTRAN (yes, there are two!) that are in the
+ tree. This includes includes, the linker, tool chain,
+ and the .a versions of the libraries. (obviously,
+ base includes ldd, ld.so, and the shared versions.
+ base also includes 'cpp', because that's used by X11.)
+ includes the man pages for all the binaries contained
+ within. Also, includes all library and system call
+ manual pages.
+
+ etc: /etc, and associated files (/var/cron/tabs, /root,
+ etc.). things that shouldn't be blindly reinstalled
+ on an upgrade.
+
+ games: the games and their man pages.
+
+ man: all of the man pages for the system, except those
+ listed elsewhere (e.g. in comp, games, misc, text).
+ Includes machine-dependent man pages for this CPU.
+
+ misc: share/dict, share/doc, and the machine-dependent
+ man pages for other cpu's which happen to always
+ be installed.
+
+ text: text processing tools. groff and all of its friends.
+ includes man pages for all bins contained within.
+
+
+as noted, in addition to the "standard" files in each dir, there's
+a file called 'md_share' in lists/man. it's the list of man pages
+that are installed from /usr/src/share, which are machine-dependent.
+(note that ones that are installed from elsewhere, and thus are
+installed on only one architecture, are listed in the md.${ARCH}
+file.) basically, it's grepped through, to see which of the
+machine-dependent man pages that are always installed should go
+in the 'man' set, and which should go into the 'misc' set.
+
+
+I've made attempts to get the md files for the amiga, i386, hp300,
+pc532, and sparc done. I've not attempted the rest (though there
+are empty files for all architectures except the da30, in the
+various directories). I think i got the amiga, i386, and sparc
+done correctly, but i know that (because of weirdnesses in how
+their last snapshots were built) i didn't get hp300 or pc532
+done right.
+
+what you folks need to do:
+
+run 'checkflist' on a tree that you've created with 'make
+distribution'. send me the output, and i'll take care of putting
+stuff on the right lists for you. In the future, you'll get
+to do it yourselves, as you add programs and include files, but
+i'd prefer to do it the first time (unless you really want to do it
+yourself -- in that case, please ask me to check your suggestions
+re: the appropriate sets for things...) There should be a minimal
+list output by checkflist -- it should all be things that
+_should_ be on your lsits, but aren't, i.e. machine-dependent
+binaries, man pages, and include files.
+
+Also, please look through the lists, and tell me if you think
+i've put anything in the wrong place. i think i've
+taken care of all of the machine-dependence bugaboos, by
+doing it for the N architectures, but i'm not _sure_... 8-)
+
+
+thanks,
+
+chris
+
diff -r 6305dc41ec24 -r 692cff5c38f0 distrib/sets/checkflist
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/checkflist Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,56 @@
+#! /bin/sh --
+#
+# $NetBSD: checkflist,v 1.13.2.2 2000/06/20 06:00:29 thorpej Exp $
+#
+# Verify output of makeflist against contents of $DESTDIR.
+
+[ "$DESTDIR" ] || {
+ echo DESTDIR must be set
+ exit 1
+}
+
+origin=.
+tmpname=/tmp/_CHECK.$$
+
+xargs=""
+dargs=""
+diffargs=""
+
+# handle args
+while : ; do
+ case $1 in
+ -x11)
+ xargs="-x"
+ origin=./usr/X11R6
+ ;;
+ -both)
+ xargs="-b"
+ ;;
+ -u)
+ diffargs="-u"
+ ;;
+ -c)
+ diffargs="-c"
+ ;;
+ -*)
+ cat 1>&2 <<USAGE
+Usage: $0 [-x11|-both] [-secr]
+ -x11 check only x11 lists
+ -both check netbsd + x11 lists
+ -u output differences in "unified diff" style
+ -c output differences in "context diff" style
+USAGE
+ exit 1
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+done
+
+sh makeflist $xargs $dargs > $tmpname
+
+( cd $DESTDIR ; find $origin \( -type d -o -type f -o -type l \) ) | sort | \
+ diff $diffargs $tmpname -
+/bin/rm -f $tmpname
diff -r 6305dc41ec24 -r 692cff5c38f0 include/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/Makefile Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.91.2.2 2000/06/20 06:00:33 thorpej Exp $
+# @(#)Makefile 8.2 (Berkeley) 1/4/94
+
+# Doing a make includes builds /usr/include
+
+# Missing: mp.h
+
+INCS= a.out.h ar.h assert.h bitstring.h bm.h cpio.h ctype.h db.h dirent.h \
+ disktab.h dlfcn.h err.h errno.h fmtmsg.h fnmatch.h fstab.h fts.h \
+ getopt.h glob.h grp.h hesiod.h ieeefp.h ifaddrs.h \
+ iso646.h kvm.h langinfo.h libgen.h \
+ limits.h link.h link_aout.h link_elf.h locale.h \
+ login_cap.h malloc.h math.h md4.h \
+ memory.h mpool.h ndbm.h netconfig.h netdb.h netgroup.h nlist.h \
+ nl_types.h \
+ nsswitch.h paths.h pwd.h ranlib.h re_comp.h regex.h regexp.h \
+ resolv.h rmt.h search.h setjmp.h sgtty.h signal.h stab.h stddef.h \
+ stdio.h stdlib.h string.h strings.h stringlist.h struct.h sysexits.h \
+ tar.h time.h ttyent.h tzfile.h ulimit.h unistd.h util.h utime.h \
+ utmp.h vis.h wchar.h
+INCS+= arpa/ftp.h arpa/inet.h arpa/nameser.h arpa/telnet.h arpa/tftp.h
+INCS+= protocols/dumprestore.h protocols/routed.h protocols/rwhod.h \
+ protocols/talkd.h protocols/timed.h
+INCS+= rpcsvc/yp_prot.h rpcsvc/ypclnt.h
+
+INCSDIR=/usr/include
+
+MKOBJ= no
+
+SUBDIR= rpc
+
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff -r 6305dc41ec24 -r 692cff5c38f0 regress/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/regress/Makefile Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.10.2.2 2000/06/20 06:00:36 thorpej Exp $
+
+# missing: bin libexec sbin usr.sbin share games gnu
+SUBDIR+= include lib sys usr.bin
+
+.include <bsd.subdir.mk>
diff -r 6305dc41ec24 -r 692cff5c38f0 share/mk/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/mk/Makefile Tue Jun 20 06:00:28 2000 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.29.2.2 2000/06/20 06:00:36 thorpej Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/8/93
+
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
+FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.depall.mk bsd.files.mk \
+ bsd.hostprog.mk bsd.inc.mk bsd.info.mk bsd.kernobj.mk bsd.kinc.mk \
Home |
Main Index |
Thread Index |
Old Index