From owner-p4-projects Thu Aug 8 23:16:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE4B37B400; Thu, 8 Aug 2002 23:14:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3ECB937B405 for ; Thu, 8 Aug 2002 23:14:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3477C43E5E for ; Thu, 8 Aug 2002 23:14:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796EpJU007690 for ; Thu, 8 Aug 2002 23:14:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796EkVs007687 for perforce@freebsd.org; Thu, 8 Aug 2002 23:14:46 -0700 (PDT) Date: Thu, 8 Aug 2002 23:14:46 -0700 (PDT) Message-Id: <200208090614.g796EkVs007687@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15715 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15715 Change 15715 by rwatson@rwatson_tislabs on 2002/08/08 23:14:35 Integ trustedbsd_base into trustedbsd_mac. Bring in various things, including VFS locking cleanups, mac_policy -> mac_syscall, etc. Possible merge targets/problems: additional instances of mac_policy to rename. vn_fullpath() conflicts. VV_flag renaming changes that need to be propagated. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#21 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#2 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/include/fmtmsg.h#1 branch .. //depot/projects/trustedbsd/mac/include/ulimit.h#1 branch .. //depot/projects/trustedbsd/mac/include/wchar.h#4 integrate .. //depot/projects/trustedbsd/mac/include/wctype.h#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5admind/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5passwdd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5admin/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5destroy/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5init/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5list/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5passwd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5su/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/k5stash/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/ktutil/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/compat/compat22/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc.so.3.1.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc.so.3.1.gz.uu#2 delete .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc_r.so.3.0.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc_r.so.3.0.gz.uu#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/err.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/sbrk.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswalnum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmessages.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmonetary.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lnumeric.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/towlower.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctob.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_internal.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#26 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/posix1e.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/calloc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/timelocal.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strsep.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/execve.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#2 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#22 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#6 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#8 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mntopts.h#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_umapfs/mount_umapfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nge.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#10 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#43 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/null/null.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_isa.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/se/se_console.c#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/se/sereg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_pccard.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umodem.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/urio.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wavelan_ieee.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wireg.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/i386/mem.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#25 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#232 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_poll.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_clock.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#25 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_cons.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#76 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mii/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/wi/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_stereg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_interface.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/cdrio.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/linker.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#111 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pioctl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/queue.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#25 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#25 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#40 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/quota/quota.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/quota/quota.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/alpha-fbsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/extern.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/setup.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/sparc64-fbsd.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/truss.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/truss.h#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/edquota/edquota.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mergemaster/mergemaster.sh#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/perform.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/pkg_create.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wicontrol/wicontrol.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#21 (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.302 2002/08/08 15:43:23 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,11 +126,21 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} -TARGET_CPUTYPE?= ${CPUTYPE} +TARGET_CPUTYPE?=${CPUTYPE} .else TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif +.if !empty(TARGET_CPUTYPE) +_TARGET_CPUTYPE=${TARGET_CPUTYPE} +.else +_TARGET_CPUTYPE=dummy +.endif +_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ + CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +.if ${_CPUTYPE} != ${_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 +185,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 +487,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/mac/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/mac/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/mac/bin/chmod/chmod.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__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 #include @@ -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/mac/crypto/openssh/session.c#12 (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/mac/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/mac/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/mac/etc/isdn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.8 2002/07/29 09:40:05 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.9 2002/08/07 16:01:06 ru Exp $ I4BETCPROG= answer \ isdntel.sh \ @@ -23,6 +23,3 @@ for i in ${I4BETCFILE} ; do \ ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done - -# Suck in the ${COPY} definition. -.include ==== //depot/projects/trustedbsd/mac/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/mac/gnu/usr.bin/groff/tmac/koi8-r#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r,v 1.6 2002/01/11 11:42:16 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r,v 1.7 2002/08/07 17:47:24 ru Exp $ .\" .\" %beginstrip% . @@ -119,6 +119,15 @@ .as doc-str-Rv-std0 " а код ошибки сохраняется в глобальной .as doc-str-Rv-std0 " переменной \*[doc-Va-font]errno\f[P]. . +.\" локализация .Ex +.ds doc-str-Ex-std-prefix "Утилита +.ds doc-str-Ex-std-suffix "возвращает\~0 в случае успешного завершения +.as doc-str-Ex-std-suffix " и\~>0 в случае возникновения ошибки. +. +.ds doc-str-Ex-stds-prefix "Утилиты +.ds doc-str-Ex-stds-suffix "возвращают\~0 в случае успешного завершения +.as doc-str-Ex-stds-suffix " и\~>0 в случае возникновения ошибки. +. .\" локализация .Ar .ds doc-str-Ar-default "файл\ .\|.\|. . ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#4 (text+ko) ==== @@ -12,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.10 2002/03/12 20:00:52 charnier Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.11 2002/08/07 17:39:35 ru Exp $ .Dd January 15, 1991 .Dt APROPOS 1 .Os @@ -34,7 +34,7 @@ displays only complete word matches. .Pp .Ar keyword -really is a regular expression, please read +really is an extended regular expression, please read .Xr grep 1 manual page for more information about its format. .Sh DIAGNOSTICS ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#2 (text+ko) ==== @@ -15,7 +15,7 @@ # The University of Texas at Austin # Austin, Texas 78712 # -# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.14 2001/03/30 10:44:29 wosch Exp $ +# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.15 2002/08/07 17:39:35 ru Exp $ PATH=/bin:/usr/bin:$PATH @@ -84,7 +84,7 @@ for manpage do - if grep -hi $grepopt -- "$manpage" $mandir; then : + if grep -Ehi $grepopt -- "$manpage" $mandir; then : else echo "$manpage: nothing appropriate" fi ==== //depot/projects/trustedbsd/mac/include/Makefile#14 (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.175 2002/08/08 04:50:36 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 \ @@ -21,7 +21,8 @@ search.h setjmp.h sgtty.h \ signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h + timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ + wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/trustedbsd/mac/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/mac/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 #include +#include + +#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/mac/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 ==== //depot/projects/trustedbsd/mac/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 ==== //depot/projects/trustedbsd/mac/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 ==== //depot/projects/trustedbsd/mac/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 $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message