From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:54:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BCEA37B401; Mon, 28 Apr 2003 15:54:44 -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 CD96637B405 for ; Mon, 28 Apr 2003 15:54:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B36743F75 for ; Mon, 28 Apr 2003 15:54:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3SMsd0U066098 for ; Mon, 28 Apr 2003 15:54:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMsawE066052 for perforce@freebsd.org; Mon, 28 Apr 2003 15:54:36 -0700 (PDT) Date: Mon, 28 Apr 2003 15:54:36 -0700 (PDT) Message-Id: <200304282254.h3SMsawE066052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 29987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2003 22:54:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=29987 Change 29987 by peter@peter_overcee on 2003/04/28 15:54:01 IFC @29986 Affected files ... .. //depot/projects/hammer/MAINTAINERS#7 integrate .. //depot/projects/hammer/UPDATING#8 integrate .. //depot/projects/hammer/bin/ls/ls.c#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#8 integrate .. //depot/projects/hammer/etc/etc.i386/rc.i386#2 integrate .. //depot/projects/hammer/etc/ftpusers#2 integrate .. //depot/projects/hammer/etc/group#3 integrate .. //depot/projects/hammer/etc/mail/aliases#4 integrate .. //depot/projects/hammer/etc/master.passwd#2 integrate .. //depot/projects/hammer/etc/rc#9 integrate .. //depot/projects/hammer/etc/rc.d/archdep#3 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#3 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/hammer/lib/Makefile#5 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/rfork_thread.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#2 integrate .. //depot/projects/hammer/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#3 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/hammer/lib/libstand/bzlib_private.h.diff#2 integrate .. //depot/projects/hammer/lib/libutil/login_class.3#3 integrate .. //depot/projects/hammer/libexec/Makefile#7 integrate .. //depot/projects/hammer/libexec/xtend/Makefile#2 delete .. //depot/projects/hammer/libexec/xtend/packet.c#2 delete .. //depot/projects/hammer/libexec/xtend/paths.h#2 delete .. //depot/projects/hammer/libexec/xtend/status.c#2 delete .. //depot/projects/hammer/libexec/xtend/user.c#2 delete .. //depot/projects/hammer/libexec/xtend/xten.h#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.8#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.c#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.h#2 delete .. //depot/projects/hammer/release/Makefile#14 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#3 integrate .. //depot/projects/hammer/sbin/devd/devd.h#3 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#1 branch .. //depot/projects/hammer/sbin/fsck/fsck.c#5 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/hammer/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#5 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#4 integrate .. //depot/projects/hammer/sbin/sysctl/pathconf.c#2 delete .. //depot/projects/hammer/share/examples/pppd/ppp.deny.sample#2 integrate .. //depot/projects/hammer/share/man/man4/asr.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/tw.4#2 delete .. //depot/projects/hammer/share/man/man4/md.4#3 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#3 integrate .. //depot/projects/hammer/share/man/man7/firewall.7#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#8 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/hammer/share/zoneinfo/antarctica#2 integrate .. //depot/projects/hammer/share/zoneinfo/asia#3 integrate .. //depot/projects/hammer/share/zoneinfo/australasia#3 integrate .. //depot/projects/hammer/share/zoneinfo/europe#2 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#2 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#3 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#4 integrate .. //depot/projects/hammer/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#7 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/hammer/sys/conf/files.i386#12 integrate .. //depot/projects/hammer/sys/conf/files.pc98#12 integrate .. //depot/projects/hammer/sys/conf/options#14 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_init.h#3 delete .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lists.h#3 delete .. //depot/projects/hammer/sys/dev/drm/drm_lock.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#6 integrate .. //depot/projects/hammer/sys/dev/en/midwayreg.h#2 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#2 integrate .. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#8 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.c#4 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.h#4 integrate .. //depot/projects/hammer/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pst/pst-raid.c#7 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#13 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#3 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/tw.c#4 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_proto.h#6 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_syscall.h#6 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysent.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_context.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#20 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/hammer/sys/modules/Makefile#14 integrate .. //depot/projects/hammer/sys/modules/en/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_ieee80211subr.c#2 integrate .. //depot/projects/hammer/sys/net/if_media.c#2 integrate .. //depot/projects/hammer/sys/net/if_media.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#12 integrate .. //depot/projects/hammer/sys/pci/if_en_pci.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/sparc64/include/asm.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/asmacros.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/limits.h#3 integrate .. //depot/projects/hammer/sys/sys/soundcard.h#3 integrate .. //depot/projects/hammer/sys/sys/ucontext.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#12 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#9 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#8 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#9 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#4 integrate .. //depot/projects/hammer/usr.bin/login/login.c#5 integrate .. //depot/projects/hammer/usr.sbin/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/chown/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.8#3 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.c#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcrom.c#3 delete .. //depot/projects/hammer/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#6 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/hammer/usr.sbin/quot/quot.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.umntall/rpc.umntall.c#2 integrate .. //depot/projects/hammer/usr.sbin/xten/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/xten/README#2 delete .. //depot/projects/hammer/usr.sbin/xten/xten.1#2 delete .. //depot/projects/hammer/usr.sbin/xten/xten.c#2 delete Differences ... ==== //depot/projects/hammer/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.59 2003/04/18 21:17:46 nectar Exp $ +$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ subsystem login notes ----------------------------- @@ -71,7 +71,6 @@ natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, help with work. ==== //depot/projects/hammer/UPDATING#8 (text+ko) ==== @@ -17,6 +17,37 @@ developers choose to disable these features on build machines to maximize performance. +20030427: + The old rc system will soon be going away. If you have specified + rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and + test with the new rc system. Please report any problems to + freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + +20030423: + A bug has been fixed in /dev/devctl which would cause devd + to hang on boot, were it not for a workaround in devd. The + work around in devd will be removed around 20030507. You + have until then to upgrade your kernel before updating + userland. In general, you should have a userland and + kernel that's in sync with each other. However, given the + effects of this bug (hang on boot when starting devd), some + allowances are made. + +20030329: + Alphas with libc from between 20030312 and 20030329 exhibit + floating point exceptions (FPEs), most notably in awk(1) + while upgrading the system through a buildworld. + + So, to successfully upgrade your Alpha, you must either + downgrade your libc.so to a pre-20030312 version, or update + /usr/share/mk/bsd.cpu.mk to revision 1.26 which adds -mieee + to CFLAGS, then forcibly rebuild and install libc: + + cd /usr/src/lib/libc && \ + make cleandir && make obj && \ + make -DNOMAN -DNOPROFILE all && \ + make -DNOMAN -DNOPROFILE install + 20030208: sendmail 8.12.7 has been imported. It has one important change for IPv6 users. The default submit.mc now uses @@ -1234,4 +1265,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.245 2003/04/23 14:28:13 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ ==== //depot/projects/hammer/bin/ls/ls.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.72 2002/12/18 21:05:15 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); #include #include @@ -732,7 +732,7 @@ mac_free(label); label_out: if (labelstr == NULL) - labelstr = strdup(""); + labelstr = strdup("-"); labelstrlen = strlen(labelstr); if (labelstrlen > maxlabelstr) maxlabelstr = labelstrlen; ==== //depot/projects/hammer/etc/defaults/rc.conf#8 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.172 2003/04/16 16:29:51 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -162,8 +162,6 @@ rarpd_flags="" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd -xtend_enable="NO" # Run the X-10 power controller daemon. -xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. pppoed_provider="*" # Provider and ppp(8) config file entry. pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled). ==== //depot/projects/hammer/etc/etc.i386/rc.i386#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.58 2001/01/09 22:28:17 jhb Exp $ +# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.59 2003/04/27 05:49:53 imp Exp $ # Do i386 specific processing # @@ -45,10 +45,4 @@ ;; esac -case ${xtend_enable} in -[Yy][Ee][Ss]) - echo -n ' xtend'; /usr/libexec/xtend - ;; -esac - echo '.' ==== //depot/projects/hammer/etc/ftpusers#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.10 2002/06/28 15:46:26 maxim Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -15,7 +15,6 @@ sshd bind uucp -xten pop www nobody ==== //depot/projects/hammer/etc/group#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.27 2002/10/14 20:55:49 rwatson Exp $ +# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ # wheel:*:0:root daemon:*:1: @@ -18,7 +18,6 @@ guest:*:31: bind:*:53: uucp:*:66: -xten:*:67: dialer:*:68: network:*:69: www:*:80: ==== //depot/projects/hammer/etc/mail/aliases#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -41,7 +41,6 @@ tty: root usenet: news uucp: root -xten: root # Well-known aliases -- these should be filled in! # manager: ==== //depot/projects/hammer/etc/master.passwd#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.33 2002/06/23 20:46:44 des Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -15,7 +15,6 @@ mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin ==== //depot/projects/hammer/etc/rc#9 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.327 2003/04/23 15:38:02 matusita Exp $ +# $FreeBSD: src/etc/rc,v 1.328 2003/04/27 07:08:07 dougb Exp $ # # System startup script run by init on autoboot @@ -83,6 +83,15 @@ rc_ng=YES else rc_ng=NO + echo -n  ; sleep 1 ; echo -n  ; sleep 1 ; echo -n  + echo '' + echo '**** The old versions of the rc scripts are deprecated, and' + echo ' will soon be removed. Make sure to update /etc and' + echo ' check that rc_ng is YES in /etc/defaults/rc.conf.' + echo ' Please report any rc problems to freebsd-rc@yahoogroups.com' + echo ' and/or freebsd-current@freebsd.org.' + echo '' + sleep 3 fi case ${rc_ng} in ==== //depot/projects/hammer/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.3 2003/04/27 05:49:53 imp Exp $ # # PROVIDE: archdep @@ -53,22 +53,11 @@ fi } -# X-10 Daemon -# -x10_daemon() -{ - if checkyesno xtend_enable; then - echo -n ' xtend' - /usr/libexec/xtend - fi -} - _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in i386) ibcs2_compat - x10_daemon ;; alpha) osf1_compat ==== //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.3 2003/02/19 04:28:12 kan Exp $ +// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $ // Predefined symbols and macros -*- C++ -*- @@ -101,7 +101,7 @@ #define _GLIBCPP_USE_LONG_LONG 1 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed. -/* #undef _GLIBCPP_USE_C99 */ +#define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. /* #undef _GLIBCPP_USE_WCHAR_T */ @@ -649,10 +649,10 @@ /* #undef _GLIBCPP_HAVE_SQRTL */ /* Define if you have the strtof function. */ -/* #undef _GLIBCPP_HAVE_STRTOF */ +#define _GLIBCPP_HAVE_STRTOF 1 /* Define if you have the strtold function. */ -/* #undef _GLIBCPP_HAVE_STRTOLD */ +#define _GLIBCPP_HAVE_STRTOLD 1 /* Define if you have the swprintf function. */ #define _GLIBCPP_HAVE_SWPRINTF 1 @@ -748,7 +748,7 @@ #define _GLIBCPP_HAVE_WCSTOD 1 /* Define if you have the wcstof function. */ -/* #undef _GLIBCPP_HAVE_WCSTOF */ +#define _GLIBCPP_HAVE_WCSTOF 1 /* Define if you have the wcstok function. */ #define _GLIBCPP_HAVE_WCSTOK 1 @@ -832,7 +832,7 @@ #define _GLIBCPP_HAVE_SYS_RESOURCE_H 1 /* Define if you have the header file. */ -/* #undef _GLIBCPP_HAVE_SYS_STAT_H */ +#define _GLIBCPP_HAVE_SYS_STAT_H 1 /* Define if you have the header file. */ #define _GLIBCPP_HAVE_SYS_TYPES_H 1 ==== //depot/projects/hammer/gnu/lib/libstdc++/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.4 2003/02/19 04:28:12 kan Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -13,7 +13,7 @@ #define _GLIBCPP_USE_LONG_LONG 1 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed. -/* #undef _GLIBCPP_USE_C99 */ +#define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. /* #undef _GLIBCPP_USE_WCHAR_T */ @@ -561,10 +561,10 @@ /* #undef HAVE_SQRTL */ /* Define if you have the strtof function. */ -/* #undef HAVE_STRTOF */ +#define HAVE_STRTOF 1 /* Define if you have the strtold function. */ -/* #undef HAVE_STRTOLD */ +#define HAVE_STRTOLD 1 /* Define if you have the swprintf function. */ #define HAVE_SWPRINTF 1 @@ -660,7 +660,7 @@ #define HAVE_WCSTOD 1 /* Define if you have the wcstof function. */ -/* #undef HAVE_WCSTOF */ +#define HAVE_WCSTOF 1 /* Define if you have the wcstok function. */ #define HAVE_WCSTOK 1 ==== //depot/projects/hammer/gnu/usr.bin/Makefile#4 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.74 2003/02/24 02:40:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.75 2003/04/27 20:14:05 obrien Exp $ -.if ${MACHINE_ARCH} != "powerpc" -_gperf=gperf -.endif - SUBDIR= bc binutils cc cpio dc dialog diff diff3 \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo .if !defined(NO_CXX) +.if ${MACHINE_ARCH} != "powerpc" +_gperf=gperf +.endif SUBDIR+=groff .endif ==== //depot/projects/hammer/lib/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.150 2003/03/08 11:01:31 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -27,7 +27,7 @@ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ - libnetgraph libopie libpam libpanel libpcap \ + libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz @@ -60,6 +60,9 @@ _libncp= libncp _libsmb= libsmb _libvgl= libvgl +.if !defined(NOLIBPTHREAD) +_libpthread= libpthread +.endif .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/hammer/lib/libc/gen/getgrent.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.28 2003/04/22 22:19:05 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $"); #include "namespace.h" #include @@ -819,9 +819,31 @@ static int compat_setgrent(void *retval, void *mdata, va_list ap) { + static const ns_src compatsrc[] = { +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif + { NULL, 0 } + }; + ns_dtab dtab[] = { +#ifdef HESIOD + { NSSRC_DNS, dns_setgrent, NULL }, +#endif +#ifdef YP + { NSSRC_NIS, nis_setgrent, NULL }, +#endif + { NULL, NULL, NULL } + }; struct compat_state *st; int rv, stayopen; +#define set_setent(x, y) do { \ + int i; \ + \ + for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \ + x[i].mdata = (void *)y; \ +} while (0) + rv = compat_getstate(&st); if (rv != 0) return (NS_UNAVAIL); @@ -832,12 +854,18 @@ rewind(st->fp); else if (stayopen) st->fp = fopen(_PATH_GROUP, "r"); + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent", + compatsrc, 0); break; case ENDGRENT: if (st->fp != NULL) { fclose(st->fp); st->fp = NULL; } + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent", + compatsrc, 0); break; default: break; @@ -846,6 +874,7 @@ free(st->name); st->name = NULL; return (NS_UNAVAIL); +#undef set_setent } ==== //depot/projects/hammer/lib/libc/gen/getpwent.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.77 2003/04/21 13:57:58 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.79 2003/04/25 18:25:19 nectar Exp $"); #include "namespace.h" #include @@ -1321,6 +1321,7 @@ for (i = 0; i < sizeof(dtab)/sizeof(dtab[0]) - 1; i++) dtab[i].mdata = (void *)lookup_how; more: + pwd_init(pwd); switch (lookup_how) { case nss_lt_all: rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, @@ -1391,9 +1392,31 @@ static int compat_setpwent(void *retval, void *mdata, va_list ap) { + static const ns_src compatsrc[] = { +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif + { NULL, 0 } + }; + ns_dtab dtab[] = { +#ifdef YP + { NSSRC_NIS, nis_setpwent, NULL }, +#endif +#ifdef HESIOD + { NSSRC_DNS, dns_setpwent, NULL }, +#endif + { NULL, NULL, NULL } + }; struct compat_state *st; int rv, stayopen; +#define set_setent(x, y) do { \ + int i; \ + \ + for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \ + x[i].mdata = (void *)y; \ +} while (0) + rv = compat_getstate(&st); if (rv != 0) return (NS_UNAVAIL); @@ -1404,17 +1427,24 @@ if (stayopen) st->db = pwdbopen(&st->version); st->stayopen = stayopen; + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent", + compatsrc, 0); break; case ENDPWENT: if (st->db != NULL) { (void)st->db->close(st->db); st->db = NULL; } + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent", + compatsrc, 0); break; default: break; } return (NS_UNAVAIL); +#undef set_setent } ==== //depot/projects/hammer/lib/libc/gen/rfork_thread.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.6 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $ .\" .Dd July 29, 2000 .Dt RFORK_THREAD 3 @@ -35,7 +35,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg" .Sh DESCRIPTION The ==== //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.2 2003/04/20 04:43:56 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.3 2003/04/26 03:32:18 rwatson Exp $ .\" .Dd April 19, 2003 .Dt MAC.CONF 5 @@ -74,6 +74,7 @@ default_ifnet_labels ?biba,?mls,?sebsd default_process_labels ?biba,?mls,partition,?sebsd .Ed +.Pp In this example, userland applications will attempt to retrieve Biba, MLS, and SEBSD labels for all object classes; for processes, they will additionally attempt to retrieve a Partition identifier. ==== //depot/projects/hammer/lib/libc/sys/rfork.2#3 (text+ko) ==== @@ -3,7 +3,7 @@ .\" describe the actual BSD implementation. Permission for .\" use of this page comes from Rob Pike . .\" -.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.30 2003/02/23 01:47:48 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.31 2003/04/27 21:01:34 robert Exp $ .\" .Dd January 31, 2003 .Dt RFORK 2 @@ -15,7 +15,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork "int flags" .Sh DESCRIPTION Forking, vforking or rforking are the only ways new processes are created. ==== //depot/projects/hammer/lib/libc/sys/vfork.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.21 2002/12/27 12:15:29 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.22 2003/04/27 21:01:34 robert Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -42,7 +42,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn vfork void .Sh DESCRIPTION The ==== //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.13 2003/03/24 15:58:53 charnier Exp $ +.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.14 2003/04/26 15:00:57 trhodes Exp $ .\" .Dd June 4, 1993 .Dt KVM_GETPROCS 3 @@ -50,6 +50,7 @@ .In kvm.h .In sys/param.h .In sys/sysctl.h +.In sys/user.h .\" .Fa kvm_t *kd .Ft struct kinfo_proc * .Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt" ==== //depot/projects/hammer/lib/libpthread/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.40 2003/04/23 21:48:29 deischen Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.41 2003/04/25 01:31:56 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,7 +7,7 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=pthread +LIB=kse SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -20,17 +20,12 @@ CFLAGS+=-D_LOCK_DEBUG #CFLAGS+= -g -#.if ${MACHINE_ARCH} == "i386" -#CFLAGS+=-DGS_HACK -#.endif - # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -Wall AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes -#.include "${.CURDIR}/man/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.46 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.47 2003/04/28 21:35:06 deischen Exp $ */ #include #include @@ -258,7 +258,7 @@ thr_sig_find(struct kse *curkse, int sig, siginfo_t *info) { int handler_installed; - struct pthread *pthread, *pthread_next; + struct pthread *pthread; struct pthread *suspended_thread, *signaled_thread; DBG_MSG("Looking for thread to handle signal %d\n", sig); @@ -285,14 +285,7 @@ signaled_thread = NULL; KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); - for (pthread = TAILQ_FIRST(&_thread_list); - pthread != NULL; pthread = pthread_next) { - /* - * Grab the next thread before possibly destroying - * the link entry. - */ - pthread_next = TAILQ_NEXT(pthread, pqe); - + TAILQ_FOREACH(pthread, &_thread_list, tle) { if ((pthread->state == PS_SIGWAIT) && sigismember(pthread->data.sigwait, sig)) { /* Take the scheduling lock. */ ==== //depot/projects/hammer/lib/libstand/bzlib_private.h.diff#2 (text+ko) ==== @@ -1,7 +1,16 @@ -$FreeBSD: src/lib/libstand/bzlib_private.h.diff,v 1.1 2002/02/01 16:33:40 sobomax Exp $ +$FreeBSD: src/lib/libstand/bzlib_private.h.diff,v 1.2 2003/04/25 06:44:56 ru Exp $ ---- bzlib_private.h 2002/02/01 15:41:26 1.1 -+++ bzlib_private.h 2002/02/01 15:41:46 +--- bzlib_private.h 1 Feb 2002 16:26:19 -0000 1.1.1.2 ++++ bzlib_private.h 25 Apr 2003 03:55:07 -0000 +@@ -62,7 +62,7 @@ + #ifndef _BZLIB_PRIVATE_H + #define _BZLIB_PRIVATE_H + +-#include ++#include "stand.h" + + #ifndef BZ_NO_STDIO + #include @@ -70,7 +70,7 @@ #include #endif ==== //depot/projects/hammer/lib/libutil/login_class.3#3 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.14 2003/03/24 15:55:03 charnier Exp $ +.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.16 2003/04/26 15:18:27 trhodes Exp $ .\" .Dd December 28, 1996 .Os @@ -112,6 +112,7 @@ maxproc RLIMIT_NPROC >>> TRUNCATED FOR MAIL (1000 lines) <<<