PERFORCE change 15618 for review
Robert Watson
rwatson at freebsd.org
Tue Aug 6 17:31:54 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15618
Change 15618 by rwatson at rwatson_tislabs on 2002/08/06 10:31:29
IFC main tree into TrustedBSD base tree to trickle back in
additional MAC changes, etc.
Affected files ...
.. //depot/projects/trustedbsd/base/Makefile.inc1#20 integrate
.. //depot/projects/trustedbsd/base/bin/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#4 integrate
.. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/session.c#11 integrate
.. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate
.. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#3 integrate
.. //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#3 integrate
.. //depot/projects/trustedbsd/base/include/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/include/fmtmsg.h#1 branch
.. //depot/projects/trustedbsd/base/include/wchar.h#4 integrate
.. //depot/projects/trustedbsd/base/include/wctype.h#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/k5stash/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/lib/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat22/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat22/libc.so.3.1.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat22/libc.so.3.1.gz.uu#2 delete
.. //depot/projects/trustedbsd/base/lib/compat/compat22/libc_r.so.3.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat22/libc_r.so.3.0.gz.uu#2 delete
.. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/err.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/fmtmsg.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/gen/fmtmsg.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/iswalnum.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/multibyte.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/towlower.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctob.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/nls/msgcat.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_biba.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_free.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_free.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_get.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_get.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_internal.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_is_present_np.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_is_present_np.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_mls.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_sebsd.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_te.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_text.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_text.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/calloc.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#1 branch
.. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#1 branch
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#9 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#3 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#35 integrate
.. //depot/projects/trustedbsd/base/release/i386/dokern.sh#6 integrate
.. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#8 integrate
.. //depot/projects/trustedbsd/base/sbin/init/init.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mntopts.h#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount_ufs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_hpfs/mount_hpfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_ntfs/mount_ntfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_nullfs/mount_nullfs.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_nwfs/mount_nwfs.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_portalfs/mount_portalfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.c#6 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_udf/mount_udf.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_umapfs/mount_umapfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.c#5 integrate
.. //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#3 integrate
.. //depot/projects/trustedbsd/base/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#11 integrate
.. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#6 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#6 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#8 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_namecache.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/imgact_svr4.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#28 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#15 integrate
.. //depot/projects/trustedbsd/base/sys/conf/majors#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/null/null.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sab/sab82532reg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_isa.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_pci.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbnivar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/se/se_console.c#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/se/sereg.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wavelan_ieee.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wireg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/spectrum24t_cf.h#1 branch
.. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_node.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vnops.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/ecma167-udf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/OLDCARD#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#1 branch
.. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/cputypes.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/modules/mii/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/wi/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_mn.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_interface.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_util.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_subr.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#14 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/sys/linker.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sys/pioctl.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/queue.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_swap.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.holiday#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/setup.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/truss/syscall.h#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/truss.1#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/truss.h#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/cron/lib/misc.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/extract.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/perform.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pkg_create.1#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/file.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/Makefile#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.c#5 integrate
Differences ...
==== //depot/projects/trustedbsd/base/Makefile.inc1#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.300 2002/08/05 08:54:26 ru Exp $
#
# Make command line options:
# -DMAKE_KERBEROS4 to build KerberosIV
@@ -126,11 +126,16 @@
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
-TARGET_CPUTYPE?= ${CPUTYPE}
+TARGET_CPUTYPE?=${CPUTYPE}
.else
TARGET?= ${TARGET_ARCH}
TARGET_CPUTYPE?=
.endif
+_CPUTYPE!= cd ${.CURDIR}; ${MAKE} -m ${.CURDIR}/share/mk \
+ CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE
+.if ${_CPUTYPE} != X${TARGET_CPUTYPE}
+.error CPUTYPE global should be set with ?=.
+.endif
.if make(buildworld)
BUILD_ARCH!= sysctl -n hw.machine_arch
.if ${MACHINE_ARCH} != ${BUILD_ARCH}
@@ -175,6 +180,7 @@
CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
MACHINE_ARCH=${TARGET_ARCH} \
MACHINE=${TARGET} \
+ CPUTYPE=${TARGET_CPUTYPE} \
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
@@ -476,7 +482,7 @@
.endif
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} -DBOOTSTRAPPING -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
+ ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
.if !defined(NO_KERNELDEPEND)
cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend
==== //depot/projects/trustedbsd/base/bin/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $
+# $FreeBSD: src/bin/Makefile,v 1.21 2002/08/02 10:55:51 markm Exp $
SUBDIR= cat \
chio \
@@ -40,7 +40,7 @@
SUBDIR+=csh
.endif
-.if !defined(NO_SENDMAIL) && !defined(NOUUCP)
+.if !defined(NO_SENDMAIL)
SUBDIR+=rmail
.endif
==== //depot/projects/trustedbsd/base/bin/chmod/chmod.1#4 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chmod.1 8.4 (Berkeley) 3/31/94
-.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.29 2002/07/12 01:57:44 keramida Exp $
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $
.\"
.Dd March 31, 1994
.Dt CHMOD 1
@@ -86,7 +86,10 @@
.It Fl v
Cause
.Nm
-to be verbose, showing files as the mode is modified.
+to be verbose, showing filenames as the mode is modified. If the
+.Fl v
+flag is specified more than once, the old and new modes of the file
+will also be printed, in both octal and symbolic notation.
.El
.Pp
The
==== //depot/projects/trustedbsd/base/bin/chmod/chmod.c#5 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.26 2002/07/10 20:36:25 dillon Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.27 2002/08/04 05:29:13 obrien Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -121,7 +121,7 @@
--optind;
goto done;
case 'v':
- vflag = 1;
+ vflag++;
break;
case '?':
default:
@@ -208,8 +208,24 @@
warn("%s", p->fts_path);
rval = 1;
} else {
- if (vflag)
- (void)printf("%s\n", p->fts_accpath);
+ if (vflag) {
+ (void)printf("%s", p->fts_accpath);
+
+ if (vflag > 1) {
+ char m1[12], m2[12];
+
+ strmode(p->fts_statp->st_mode, m1);
+ strmode((p->fts_statp->st_mode &
+ S_IFMT) | newmode, m2);
+
+ (void)printf(": 0%o [%s] -> 0%o [%s]",
+ p->fts_statp->st_mode, m1,
+ (p->fts_statp->st_mode & S_IFMT) |
+ newmode, m2);
+ }
+ (void)printf("\n");
+ }
+
}
}
if (errno)
==== //depot/projects/trustedbsd/base/crypto/openssh/session.c#11 (text+ko) ====
@@ -34,7 +34,7 @@
#include "includes.h"
RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $");
-RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.35 2002/07/26 02:20:00 ache Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.36 2002/08/05 16:06:35 ache Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -1288,6 +1288,9 @@
const char *shell, *shell0, *hostname = NULL;
struct passwd *pw = s->pw;
u_int i;
+#ifdef HAVE_LOGIN_CAP
+ int lc_requirehome;
+#endif
/* remove hostkey from the child's memory */
destroy_sensitive_data();
@@ -1346,6 +1349,10 @@
/* XXX better use close-on-exec? -markus */
channel_close_all();
+#ifdef HAVE_LOGIN_CAP
+ lc_requirehome = login_getcapbool(lc, "requirehome", 0);
+ login_close(lc);
+#endif
/*
* Close any extra file descriptors. Note that there may still be
* descriptors left by system functions. They will be closed later.
@@ -1384,7 +1391,7 @@
fprintf(stderr, "Could not chdir to home directory %s: %s\n",
pw->pw_dir, strerror(errno));
#ifdef HAVE_LOGIN_CAP
- if (login_getcapbool(lc, "requirehome", 0))
+ if (lc_requirehome)
exit(1);
#endif
}
==== //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#3 (text+ko) ====
@@ -124,7 +124,7 @@
(int)(omax+ *pp));
#endif
- if (*plength > (omax - (*pp - p)))
+ if (*plength > (omax - (p - *pp)))
{
ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
/* Set this so that even if things are not long enough
==== //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.3 2002/08/04 19:16:13 jake Exp $
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# This file specifies various information about terminals on the system.
@@ -46,6 +46,8 @@
#ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
+ttya "/usr/libexec/getty local.9600" dialup off secure
+ttyb "/usr/libexec/getty local.9600" dialup off secure
ttyd0 "/usr/libexec/getty std.9600" dialup off secure
ttyd1 "/usr/libexec/getty std.9600" dialup off secure
ttyd2 "/usr/libexec/getty std.9600" dialup off secure
==== //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.3 2002/05/17 11:34:12 brian Exp $
+# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.4 2002/08/03 22:33:34 gshapiro Exp $
#
# If there is a global system configuration file, suck it in.
@@ -45,14 +45,17 @@
echo 'Checking setuid files and devices:'
# XXX Note that there is the possibility of overrunning the args to ls
MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort`
- set ${MP}
- while [ $# -ge 1 ]; do
- mount=$1
- shift
- find $mount -xdev -type f \
- \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \
- \( -perm -u+s -or -perm -g+s \) -print0
- done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP}
+ if [ -n "${MP}" ]
+ then
+ set ${MP}
+ while [ $# -ge 1 ]; do
+ mount=$1
+ shift
+ find $mount -xdev -type f \
+ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \
+ \( -perm -u+s -or -perm -g+s \) -print0
+ done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP}
+ fi
if [ ! -f ${LOG}/setuid.today ]; then
rc=1
==== //depot/projects/trustedbsd/base/include/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.172 2002/08/01 07:18:38 mike Exp $
+# $FreeBSD: src/include/Makefile,v 1.174 2002/08/05 06:49:58 mike Exp $
#
# Doing a make install builds /usr/include
#
@@ -10,7 +10,7 @@
SUBDIR= arpa protocols rpcsvc rpc
INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \
dirent.h \
- dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \
+ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \
fts.h glob.h grp.h \
hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \
langinfo.h \
@@ -39,8 +39,8 @@
fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
- security/lomac \
- ufs/ffs ufs/ufs
+ security/lomac security/mac_biba security/mac_bsdextended \
+ security/mac_mls ufs/ffs ufs/ufs
# For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/*
# are taken care of
==== //depot/projects/trustedbsd/base/include/wchar.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/wchar.h,v 1.5 2002/07/09 05:13:30 obrien Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.10 2002/08/06 06:26:06 tjr Exp $
*/
/*-
@@ -73,6 +73,16 @@
#define NULL 0
#endif
+#ifdef _BSD_MBSTATE_T_
+typedef _BSD_MBSTATE_T_ mbstate_t;
+#undef _BSD_MBSTATE_T_
+#endif
+
+#ifdef _BSD_SIZE_T_
+typedef _BSD_SIZE_T_ size_t;
+#undef _BSD_SIZE_T_
+#endif
+
#ifndef __cplusplus
#ifdef _BSD_WCHAR_T_
typedef _BSD_WCHAR_T_ wchar_t;
@@ -80,9 +90,9 @@
#endif
#endif
-#ifdef _BSD_MBSTATE_T_
-typedef _BSD_MBSTATE_T_ mbstate_t;
-#undef _BSD_MBSTATE_T_
+#ifndef _WCTYPE_T
+typedef unsigned long wctype_t;
+#define _WCTYPE_T
#endif
#ifdef _BSD_WINT_T_
@@ -90,16 +100,12 @@
#undef _BSD_WINT_T_
#endif
-#ifdef _BSD_SIZE_T_
-typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
-#endif
-
#ifndef WEOF
#define WEOF ((wint_t)-1)
#endif
__BEGIN_DECLS
+wint_t btowc(int);
#if 0
/* XXX: not implemented */
size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
@@ -115,6 +121,8 @@
int wcscmp(const wchar_t *, const wchar_t *);
wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
size_t wcscspn(const wchar_t *, const wchar_t *);
+size_t wcslcat(wchar_t *, const wchar_t *, size_t);
+size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
size_t wcslen(const wchar_t *);
wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict,
size_t);
@@ -129,19 +137,17 @@
#endif
size_t wcsspn(const wchar_t *, const wchar_t *);
wchar_t *wcsstr(const wchar_t *, const wchar_t *);
+#if 0
+/* XXX: not implemented */
+int wcswidth(const wchar_t *, size_t);
+int wcwidth(wchar_t);
+#endif
+int wctob(wint_t);
wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
int wmemcmp(const wchar_t *, const wchar_t *, size_t);
wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
wchar_t *wmemset(wchar_t *, wchar_t, size_t);
-
-size_t wcslcat(wchar_t *, const wchar_t *, size_t);
-size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
-#if 0
-/* XXX: not implemented */
-int wcswidth(const wchar_t *, size_t);
-int wcwidth(wchar_t);
-#endif
__END_DECLS
#endif /* !_WCHAR_H_ */
==== //depot/projects/trustedbsd/base/include/wctype.h#3 (text+ko) ====
@@ -25,17 +25,27 @@
*
* citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
* $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD: src/include/wctype.h,v 1.4 2002/03/23 17:24:53 imp Exp $
+ * $FreeBSD: src/include/wctype.h,v 1.9 2002/08/06 05:19:33 tjr Exp $
*/
-#if 0
-/* XXX: not implemented */
#ifndef _WCTYPE_H_
#define _WCTYPE_H_
#include <sys/cdefs.h>
#include <machine/ansi.h>
+#include <ctype.h>
+
+#ifndef _WCTRANS_T
+typedef int wctrans_t;
+#define _WCTRANS_T
+#endif
+
+#ifndef _WCTYPE_T
+typedef unsigned long wctype_t;
+#define _WCTYPE_T
+#endif
+
#ifdef _BSD_WINT_T_
typedef _BSD_WINT_T_ wint_t;
#undef _BSD_WINT_T_
@@ -50,6 +60,7 @@
int iswalpha(wint_t);
int iswblank(wint_t);
int iswcntrl(wint_t);
+int iswctype(wint_t, wctype_t);
int iswdigit(wint_t);
int iswgraph(wint_t);
int iswlower(wint_t);
@@ -58,9 +69,49 @@
int iswspace(wint_t);
int iswupper(wint_t);
int iswxdigit(wint_t);
+wint_t towctrans(wint_t, wctrans_t);
wint_t towlower(wint_t);
wint_t towupper(wint_t);
+wctrans_t
+ wctrans(const char *);
+wctype_t
+ wctype(const char *);
+
+#if __BSD_VISIBLE
+wint_t iswascii(wint_t);
+wint_t iswhexnumber(wint_t);
+wint_t iswideogram(wint_t);
+wint_t iswnumber(wint_t);
+wint_t iswphonogram(wint_t);
+wint_t iswrune(wint_t);
+wint_t iswspecial(wint_t);
+#endif
__END_DECLS
+#define iswalnum(wc) __istype((wc), _CTYPE_A|_CTYPE_D)
+#define iswalpha(wc) __istype((wc), _CTYPE_A)
+#define iswblank(wc) __istype((wc), _CTYPE_B)
+#define iswcntrl(wc) __istype((wc), _CTYPE_C)
+#define iswctype(wc, charclass) __istype((wc), (charclass))
+#define iswdigit(wc) __istype((wc), _CTYPE_D)
+#define iswgraph(wc) __istype((wc), _CTYPE_G)
+#define iswlower(wc) __istype((wc), _CTYPE_L)
+#define iswprint(wc) __istype((wc), _CTYPE_R)
+#define iswpunct(wc) __istype((wc), _CTYPE_P)
+#define iswspace(wc) __istype((wc), _CTYPE_S)
+#define iswupper(wc) __istype((wc), _CTYPE_U)
+#define iswxdigit(wc) __istype((wc), _CTYPE_X)
+#define towlower(wc) __tolower(wc)
+#define towupper(wc) __toupper(wc)
+
+#if __BSD_VISIBLE
+#define iswascii(wc) (((wc) & ~0x7F) == 0)
+#define iswhexnumber(wc) __istype((wc), _CTYPE_X)
+#define iswideogram(wc) __istype((wc), _CTYPE_I)
+#define iswnumber(wc) __istype((wc), _CTYPE_D)
+#define iswphonogram(wc) __istype((wc), _CTYPE_Q)
+#define iswrune(wc) __istype((wc), 0xFFFFFF00L)
+#define iswspecial(wc) __istype((wc), _CTYPE_T)
+#endif
+
#endif /* _WCTYPE_H_ */
-#endif
==== //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.7 2002/04/26 17:55:22 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.8 2002/08/04 22:23:46 fjoe Exp $
PROG= hpropd
SRCS= hpropd.c hprop.h hdb_err.h
@@ -20,9 +20,9 @@
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= hpropd.8
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $
PROG= ipropd-master
SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
@@ -21,9 +21,9 @@
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $
PROG= ipropd-slave
SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
@@ -21,9 +21,9 @@
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.7 2002/04/26 17:55:23 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.8 2002/08/04 22:23:47 fjoe Exp $
PROG= k5admind
SRCS= kadmind.c server.c kadm_conn.c \
@@ -25,10 +25,10 @@
${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.8 2002/04/26 17:55:23 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $
PROG= k5passwdd
SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
@@ -21,9 +21,9 @@
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= kpasswdd.8
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.8 2002/04/26 17:55:23 ru Exp $
+# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $
PROG= kdc
SRCS= \
@@ -29,9 +29,9 @@
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= kdc.8
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.8 2002/07/03 14:31:52 markm Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $
PROG= k5admin
SRCS= \
@@ -43,11 +43,11 @@
${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBSL} ${LIBREADLINE}
MAN= k5admin.8
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.8 2002/04/26 17:55:24 ru Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $
PROG= k5destroy
SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h
@@ -18,9 +18,9 @@
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.8 2002/04/26 17:55:24 ru Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $
PROG= k5init
SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \
@@ -19,9 +19,9 @@
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.8 2002/04/26 17:55:25 ru Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.9 2002/08/04 22:23:48 fjoe Exp $
PROG= k5list
SRCS= klist.c krb5_err.h heim_err.h k524_err.h
@@ -18,9 +18,9 @@
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.8 2002/04/26 17:55:25 ru Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.9 2002/08/04 22:23:48 fjoe Exp $
PROG= k5passwd
SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h
@@ -16,9 +16,9 @@
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.6 2002/05/12 03:17:21 nectar Exp $
+# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.7 2002/08/04 22:23:48 fjoe Exp $
PROG= k5su
SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
@@ -19,9 +19,9 @@
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
${_krb4libs} \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list