PERFORCE change 33950 for review
Peter Wemm
peter at FreeBSD.org
Tue Jul 1 15:02:56 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=33950
Change 33950 by peter at peter_daintree on 2003/07/01 15:02:30
IFC @33948
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#20 integrate
.. //depot/projects/hammer/bin/cp/cp.c#8 integrate
.. //depot/projects/hammer/bin/csh/Makefile#4 integrate
.. //depot/projects/hammer/bin/ed/Makefile#5 integrate
.. //depot/projects/hammer/bin/pwd/pwd.c#3 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/FreeBSD-patchset#2 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#2 integrate
.. //depot/projects/hammer/etc/mtree/BSD.root.dist#3 integrate
.. //depot/projects/hammer/etc/periodic/security/500.ipfwdenied#4 integrate
.. //depot/projects/hammer/etc/periodic/security/510.ipfdenied#2 integrate
.. //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#4 integrate
.. //depot/projects/hammer/etc/periodic/security/600.ip6fwdenied#4 integrate
.. //depot/projects/hammer/etc/periodic/security/650.ip6fwlimit#4 integrate
.. //depot/projects/hammer/etc/periodic/security/security.functions#3 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#11 integrate
.. //depot/projects/hammer/etc/rc.d/NETWORKING#5 integrate
.. //depot/projects/hammer/etc/rc.d/atm2.sh#4 integrate
.. //depot/projects/hammer/etc/rc.d/dhclient#4 integrate
.. //depot/projects/hammer/etc/rc.d/initdiskless#6 integrate
.. //depot/projects/hammer/etc/rc.d/ip6fw#3 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#6 integrate
.. //depot/projects/hammer/etc/rc.d/motd#4 integrate
.. //depot/projects/hammer/etc/rc.d/mrouted#4 integrate
.. //depot/projects/hammer/etc/rc.d/netif#2 integrate
.. //depot/projects/hammer/etc/rc.d/netoptions#2 integrate
.. //depot/projects/hammer/etc/rc.d/network2#3 integrate
.. //depot/projects/hammer/etc/rc.d/network3#4 integrate
.. //depot/projects/hammer/etc/rc.d/network_ipv6#5 integrate
.. //depot/projects/hammer/etc/rc.d/routed#5 integrate
.. //depot/projects/hammer/etc/rc.d/routing#2 integrate
.. //depot/projects/hammer/gnu/lib/libg2c/Makefile#3 integrate
.. //depot/projects/hammer/gnu/lib/libgcc/Makefile#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/doc/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/f77doc/Makefile#2 integrate
.. //depot/projects/hammer/include/Makefile#13 integrate
.. //depot/projects/hammer/include/paths.h#6 integrate
.. //depot/projects/hammer/include/unistd.h#9 integrate
.. //depot/projects/hammer/lib/csu/amd64/Makefile#5 integrate
.. //depot/projects/hammer/lib/libc/Makefile#7 integrate
.. //depot/projects/hammer/lib/libc/gen/exec.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/exec.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/fmtcheck.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/setproctitle.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/scanf.3#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#6 integrate
.. //depot/projects/hammer/lib/libc/stdlib/alloca.3#4 integrate
.. //depot/projects/hammer/lib/libc/string/strmode.3#2 integrate
.. //depot/projects/hammer/lib/libc/sys/mount.2#3 integrate
.. //depot/projects/hammer/lib/libc_r/Makefile#3 integrate
.. //depot/projects/hammer/lib/libcompat/Makefile#3 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#9 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#2 integrate
.. //depot/projects/hammer/lib/libpthread/support/thr_support.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#10 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#10 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#14 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_rtld.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_stack.c#3 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#6 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#4 integrate
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#4 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_gc.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_join.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#26 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#8 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/hw.ent#3 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#1 branch
.. //depot/projects/hammer/rescue/Makefile#1 branch
.. //depot/projects/hammer/rescue/README#1 branch
.. //depot/projects/hammer/rescue/librescue/Makefile#1 branch
.. //depot/projects/hammer/rescue/rescue/Makefile#1 branch
.. //depot/projects/hammer/sbin/dhclient/Makefile#3 integrate
.. //depot/projects/hammer/sbin/dhclient/client/Makefile#2 integrate
.. //depot/projects/hammer/sbin/fsck/fsck.c#6 integrate
.. //depot/projects/hammer/sbin/fsck/pathnames.h#2 delete
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#6 integrate
.. //depot/projects/hammer/sbin/mdmfs/pathnames.h#3 delete
.. //depot/projects/hammer/sbin/mount/mount.c#5 integrate
.. //depot/projects/hammer/sbin/mount/pathnames.h#2 integrate
.. //depot/projects/hammer/sbin/umount/umount.c#5 integrate
.. //depot/projects/hammer/share/man/man4/aac.4#3 integrate
.. //depot/projects/hammer/share/man/man4/aha.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ahb.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ahc.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ath.4#3 integrate
.. //depot/projects/hammer/share/man/man4/atkbd.4#2 integrate
.. //depot/projects/hammer/share/man/man4/awi.4#3 integrate
.. //depot/projects/hammer/share/man/man4/bktr.4#2 integrate
.. //depot/projects/hammer/share/man/man4/blackhole.4#3 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#2 integrate
.. //depot/projects/hammer/share/man/man4/bt.4#2 integrate
.. //depot/projects/hammer/share/man/man4/cd.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ch.4#2 integrate
.. //depot/projects/hammer/share/man/man4/da.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ddb.4#2 integrate
.. //depot/projects/hammer/share/man/man4/divert.4#2 integrate
.. //depot/projects/hammer/share/man/man4/fpa.4#2 integrate
.. //depot/projects/hammer/share/man/man4/icmp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ifmib.4#3 integrate
.. //depot/projects/hammer/share/man/man4/inet.4#4 integrate
.. //depot/projects/hammer/share/man/man4/intro.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ip6.4#2 integrate
.. //depot/projects/hammer/share/man/man4/kld.4#4 integrate
.. //depot/projects/hammer/share/man/man4/lp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/lpt.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/pae.4#4 integrate
.. //depot/projects/hammer/share/man/man4/matcd.4#2 integrate
.. //depot/projects/hammer/share/man/man4/mem.4#2 integrate
.. //depot/projects/hammer/share/man/man4/mtio.4#2 integrate
.. //depot/projects/hammer/share/man/man4/natm.4#3 integrate
.. //depot/projects/hammer/share/man/man4/netgraph.4#3 integrate
.. //depot/projects/hammer/share/man/man4/netintro.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_ksocket.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_l2cap.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ng_ppp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_pppoe.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_socket.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_vjc.4#2 integrate
.. //depot/projects/hammer/share/man/man4/pass.4#2 integrate
.. //depot/projects/hammer/share/man/man4/pci.4#3 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#4 integrate
.. //depot/projects/hammer/share/man/man4/polling.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ppi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ppp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/psm.4#3 integrate
.. //depot/projects/hammer/share/man/man4/pt.4#2 integrate
.. //depot/projects/hammer/share/man/man4/pty.4#2 integrate
.. //depot/projects/hammer/share/man/man4/route.4#2 integrate
.. //depot/projects/hammer/share/man/man4/sa.4#2 integrate
.. //depot/projects/hammer/share/man/man4/sbp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/scsi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/si.4#2 integrate
.. //depot/projects/hammer/share/man/man4/sio.4#4 integrate
.. //depot/projects/hammer/share/man/man4/sl.4#2 integrate
.. //depot/projects/hammer/share/man/man4/smp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/syncer.4#3 integrate
.. //depot/projects/hammer/share/man/man4/sysmouse.4#2 integrate
.. //depot/projects/hammer/share/man/man4/termios.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ti.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ttcp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/tty.4#2 integrate
.. //depot/projects/hammer/share/man/man4/udp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/urio.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uscanner.4#4 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#14 integrate
.. //depot/projects/hammer/share/man/man5/style.Makefile.5#2 integrate
.. //depot/projects/hammer/share/man/man8/diskless.8#4 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#3 integrate
.. //depot/projects/hammer/share/mk/bsd.dep.mk#4 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#8 integrate
.. //depot/projects/hammer/share/mk/bsd.prog.mk#5 integrate
.. //depot/projects/hammer/share/mk/sys.mk#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#10 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#13 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#12 integrate
.. //depot/projects/hammer/sys/alpha/alpha/support.s#3 integrate
.. //depot/projects/hammer/sys/alpha/include/bus.h#9 integrate
.. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#3 integrate
.. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#4 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#6 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#44 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#21 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#21 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_dma.h#8 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#7 integrate
.. //depot/projects/hammer/sys/boot/ficl/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#6 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/lib/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/i386/kgzldr/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/lib/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#5 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#11 integrate
.. //depot/projects/hammer/sys/conf/NOTES#20 integrate
.. //depot/projects/hammer/sys/conf/files#21 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#4 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#10 integrate
.. //depot/projects/hammer/sys/conf/options.i386#10 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#10 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#4 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#10 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#4 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/advansys/advansys.c#7 integrate
.. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/advansys/adwcam.c#7 integrate
.. //depot/projects/hammer/sys/dev/aha/aha.c#7 integrate
.. //depot/projects/hammer/sys/dev/aha/aha_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/aha/aha_mca.c#4 integrate
.. //depot/projects/hammer/sys/dev/ahb/ahb.c#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#9 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#8 integrate
.. //depot/projects/hammer/sys/dev/amd/amd.c#6 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#9 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#7 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/hammer/sys/dev/awi/awi.c#6 integrate
.. //depot/projects/hammer/sys/dev/awi/awi_wep.c#4 integrate
.. //depot/projects/hammer/sys/dev/awi/awi_wicfg.c#2 integrate
.. //depot/projects/hammer/sys/dev/awi/awivar.h#2 integrate
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#5 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt.c#8 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#5 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#4 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#8 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#10 integrate
.. //depot/projects/hammer/sys/dev/ct/ct_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#4 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#8 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#13 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#12 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#14 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#8 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdma.c#2 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwmem.c#7 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci.c#11 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#16 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#19 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem.c#6 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#5 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme.c#4 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/ida/ida.c#7 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#4 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.c#5 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/ips/ips.c#4 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_commands.c#4 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_disk.c#3 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#3 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#4 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#4 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx.c#4 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_if.m#3 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_private.h#5 integrate
.. //depot/projects/hammer/sys/dev/ray/if_ray.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/solo.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#8 integrate
.. //depot/projects/hammer/sys/dev/trm/trm.c#8 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#6 integrate
.. //depot/projects/hammer/sys/dev/tx/if_tx.c#7 integrate
.. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/umct.c#1 branch
.. //depot/projects/hammer/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#13 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#13 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#4 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#8 integrate
.. //depot/projects/hammer/sys/dev/wds/wd7000.c#4 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#13 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#10 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wivar.h#6 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/genassym.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#17 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/swtch.s#5 integrate
.. //depot/projects/hammer/sys/i386/include/bus_dma.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/md_var.h#6 integrate
.. //depot/projects/hammer/sys/i386/include/pcpu.h#3 integrate
.. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#9 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#20 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#11 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#8 integrate
.. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#2 integrate
.. //depot/projects/hammer/sys/isa/psm.c#8 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#30 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#8 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#14 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#14 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#14 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#12 integrate
.. //depot/projects/hammer/sys/modules/Makefile#21 integrate
.. //depot/projects/hammer/sys/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/umct/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if_ieee80211.h#3 delete
.. //depot/projects/hammer/sys/net/if_ieee80211subr.c#3 delete
.. //depot/projects/hammer/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#9 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#11 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.c#3 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_output.c#4 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#3 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/hammer/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/hammer/sys/opencrypto/crypto.c#7 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.h#5 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#4 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#15 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#13 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#10 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/include/bus.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/gracklevar.h#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpicvar.h#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/macio.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#8 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#16 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#10 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#13 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus.h#11 integrate
.. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/isa/isa.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#2 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/pci/apb.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.h#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#10 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#20 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/sparcbus_if.m#3 delete
.. //depot/projects/hammer/sys/sys/kse.h#11 integrate
.. //depot/projects/hammer/sys/sys/mount.h#8 integrate
.. //depot/projects/hammer/sys/sys/param.h#15 integrate
.. //depot/projects/hammer/sys/sys/proc.h#27 integrate
.. //depot/projects/hammer/sys/sys/smp.h#2 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#14 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#14 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#14 integrate
.. //depot/projects/hammer/sys/vm/pmap.h#10 integrate
.. //depot/projects/hammer/sys/vm/vm_kern.c#6 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#15 integrate
.. //depot/projects/hammer/sys/vm/vm_map.h#5 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#12 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#18 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#1 branch
.. //depot/projects/hammer/tools/tools/README#4 integrate
.. //depot/projects/hammer/tools/tools/ath/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/ath/athstats.c#1 branch
.. //depot/projects/hammer/usr.bin/ee/ee.c#2 integrate
.. //depot/projects/hammer/usr.bin/elfdump/elfdump.1#2 integrate
.. //depot/projects/hammer/usr.bin/elfdump/elfdump.c#2 integrate
.. //depot/projects/hammer/usr.bin/finger/finger.1#3 integrate
.. //depot/projects/hammer/usr.bin/finger/finger.c#4 integrate
.. //depot/projects/hammer/usr.bin/uname/uname.c#7 integrate
.. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#6 integrate
.. //depot/projects/hammer/usr.bin/units/units.lib#2 integrate
.. //depot/projects/hammer/usr.bin/w/w.c#3 integrate
.. //depot/projects/hammer/usr.bin/whois/whois.c#7 integrate
.. //depot/projects/hammer/usr.sbin/ppp/radius.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/radius.h#3 integrate
.. //depot/projects/hammer/usr.sbin/raycontrol/raycontrol.c#4 integrate
.. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#6 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.368 2003/06/22 10:01:03 simokawa Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.372 2003/07/01 12:57:53 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -66,6 +66,9 @@
.if exists(${.CURDIR}/libexec)
SUBDIR+= libexec
.endif
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE)
+SUBDIR+= rescue
+.endif
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
@@ -94,7 +97,7 @@
# rebuilt before you do them.
.if defined(LOCAL_DIRS)
.for _DIR in ${LOCAL_DIRS}
-.if exists(${.CURDIR}/${_DIR}) & exists(${.CURDIR}/${_DIR}/Makefile)
+.if exists(${.CURDIR}/${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile)
SUBDIR+= ${_DIR}
.endif
.endfor
@@ -664,16 +667,31 @@
_yacc= usr.bin/yacc
.endif
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \
+ ${BOOTSTRAPPING} < 501100
+_crunchgen= usr.sbin/crunch/crunchgen
+.endif
+
.if ${BOOTSTRAPPING} < 500019
_kbdcontrol= usr.sbin/kbdcontrol
.endif
bootstrap-tools:
-.for _tool in ${_strfile} usr.bin/colldef \
- usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
- ${_xargs} usr.bin/xinstall ${_yacc} \
- usr.sbin/config ${_kbdcontrol} \
- ${_gperf} ${_groff} gnu/usr.bin/texinfo
+.for _tool in \
+ ${_strfile} \
+ ${_gperf} \
+ ${_groff} \
+ gnu/usr.bin/texinfo \
+ usr.bin/colldef \
+ usr.bin/makewhatis \
+ usr.bin/rpcgen \
+ ${_uudecode} \
+ ${_xargs} \
+ usr.bin/xinstall \
+ ${_yacc} \
+ usr.sbin/config \
+ ${_crunchgen} \
+ ${_kbdcontrol}
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -704,9 +722,18 @@
.endif
build-tools:
-.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \
- ${_libkrb5} lib/libncurses ${_share} \
- ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall
+.for _tool in \
+ bin/csh \
+ bin/sh \
+ gnu/usr.bin/cc/cc_tools \
+ ${_fortran} \
+ ${_libkrb5} \
+ lib/libncurses \
+ ${_share} \
+ ${_aicasm} \
+ usr.bin/awk \
+ usr.bin/file \
+ usr.sbin/sysinstall
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -716,32 +743,40 @@
#
# cross-tools: Build cross-building tools
#
-.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH}
-_elf2exe= usr.sbin/elf2exe
+.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
+ ${BOOTSTRAPPING} < 500037
+_elf2aout= usr.bin/elf2aout
.endif
.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH}
-_btxld= usr.sbin/btxld
-.if defined(RELEASEDIR)
-_kgzip= usr.sbin/kgzip
+_btxld= usr.sbin/btxld
.endif
+
+.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \
+ defined(RELEASEDIR)) && \
+ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
+_crunchide= usr.sbin/crunch/crunchide
.endif
-.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
- ${BOOTSTRAPPING} < 500037
-_elf2aout= usr.bin/elf2aout
+.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH}
+_elf2exe= usr.sbin/elf2exe
.endif
-.if defined(RELEASEDIR)
-_crunchide= usr.sbin/crunch/crunchide
+.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
+ defined(RELEASEDIR)
+_kgzip= usr.sbin/kgzip
.endif
-_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint
-
cross-tools:
-.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \
- gnu/usr.bin/binutils ${_crunchide} \
- gnu/usr.bin/cc ${_xlint} ${_kgzip}
+.for _tool in \
+ gnu/usr.bin/binutils \
+ gnu/usr.bin/cc \
+ ${_elf2aout} \
+ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
+ ${_btxld} \
+ ${_crunchide} \
+ ${_elf2exe} \
+ ${_kgzip}
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
==== //depot/projects/hammer/bin/cp/cp.c#8 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $");
/*
* Cp copies source files to target files.
@@ -366,7 +366,7 @@
* normally want to preserve them on directories.
*/
if (pflag) {
- if (setfile(curr->fts_statp, 0))
+ if (setfile(curr->fts_statp, -1))
rval = 1;
} else {
mode = curr->fts_statp->st_mode;
==== //depot/projects/hammer/bin/csh/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/csh/Makefile,v 1.32 2003/06/13 07:04:01 markm Exp $
+# $FreeBSD: src/bin/csh/Makefile,v 1.33 2003/06/29 18:46:17 gordon Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -10,7 +10,11 @@
.PATH: ${TCSHDIR}
PROG= csh
+.if defined(RESCUE)
+DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG}"'
+.else
DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"'
+.endif
CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS}
WARNS= 2
SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
==== //depot/projects/hammer/bin/ed/Makefile#5 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.25 2003/06/13 07:04:01 markm Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION=crypto
CFLAGS+=-DDES
WARNS= 2
==== //depot/projects/hammer/bin/pwd/pwd.c#3 (text+ko) ====
@@ -43,7 +43,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.22 2003/06/30 17:05:40 kan Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -108,7 +108,7 @@
static char *
getcwd_logical(void)
{
- struct stat log, phy;
+ struct stat lg, phy;
char *pwd;
/*
@@ -116,9 +116,9 @@
* the current working directory.
*/
if ((pwd = getenv("PWD")) != NULL && *pwd == '/') {
- if (stat(pwd, &log) == -1 || stat(".", &phy) == -1)
+ if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1)
return (NULL);
- if (log.st_dev == phy.st_dev && log.st_ino == phy.st_ino)
+ if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino)
return (pwd);
}
==== //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#3 (text+ko) ====
@@ -40,7 +40,7 @@
* see ``http://www.vix.com''. To learn more about Nominum, Inc., see
* ``http://www.nominum.com''.
*
- * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.5 2002/09/30 08:45:34 murray Exp $
+ * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.6 2003/06/29 18:46:17 gordon Exp $
*/
#include <syslog.h>
@@ -103,6 +103,10 @@
#define SOCKLEN_T int
#endif
+#ifdef RESCUE
+#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script"
+#endif
+
#if defined (USE_DEFAULT_NETWORK)
# define USE_BPF
#endif
@@ -113,6 +117,9 @@
#endif /* HAVE_DEV_RANDOM */
const char *cmds[] = {
+#ifndef RESCUE
+ /* rescue environment can't rely on these ... */
+ /* Actually, /sbin/dhclient shouldn't use these, either. */
"/bin/ps -axlw 2>&1",
"/usr/sbin/arp -an 2>&1",
"/usr/bin/netstat -an 2>&1",
@@ -123,10 +130,12 @@
"/usr/sbin/iostat 2>&1",
"/usr/bin/vmstat 2>&1",
"/usr/bin/w 2>&1",
+#endif
NULL
};
const char *dirs[] = {
+#ifndef RESCUE
"/tmp",
"/usr/tmp",
".",
@@ -136,13 +145,16 @@
"/var/mail",
"/home",
"/usr/home",
+#endif
NULL
};
const char *files[] = {
+#ifndef RESCUE
"/var/log/messages",
"/var/log/wtmp",
"/var/log/lastlog",
+#endif
NULL
};
#endif /* NEED_PRAND_CONF */
==== //depot/projects/hammer/contrib/lukemftp/FreeBSD-patchset#2 (text+ko) ====
@@ -41,7 +41,7 @@
#include "progressbar.h"
+
-+#define SECSPERHOUR 60
++#define SECSPERHOUR (60 * 60)
+#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)
==== //depot/projects/hammer/contrib/lukemftp/src/ftp.1#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $
+.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1030,7 +1030,7 @@
Answer
.Sq yes ,
and transfer the file.
-.It Cm ?
+.It Cm \&?
Display a help message.
.El
.Pp
@@ -1433,7 +1433,7 @@
.It Ic xferbuf Ar size
Set the size of the socket send and receive buffers to
.Ar size .
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
A synonym for
.Ic help .
.El
==== //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#2 (text+ko) ====
@@ -62,7 +62,7 @@
#include "progressbar.h"
-#define SECSPERHOUR 60
+#define SECSPERHOUR (60 * 60)
#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)
==== //depot/projects/hammer/etc/mtree/BSD.root.dist#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.62 2003/03/11 11:14:34 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.63 2003/06/29 18:35:36 gordon Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -63,6 +63,8 @@
..
proc mode=0555
..
+ rescue
+ ..
root
..
sbin
==== //depot/projects/hammer/etc/periodic/security/500.ipfwdenied#4 (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/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ipfwdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then
check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:"
fi
==== //depot/projects/hammer/etc/periodic/security/510.ipfdenied#2 (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/510.ipfdenied,v 1.1 2002/10/25 15:16:54 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ipfdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ipfstat -nhio 2>/dev/null | grep block > ${TMP}; then
check_diff new_only ipf ${TMP} "${host} ipf denied packets:"
fi
==== //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#4 (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/550.ipfwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $
#
# Show ipfw rules which have reached the log limit
@@ -42,7 +42,7 @@
case "$daily_status_security_ipfwlimit_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null`
if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then
ipfw -a l | grep " log " | \
==== //depot/projects/hammer/etc/periodic/security/600.ip6fwdenied#4 (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/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ip6fwdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then
check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:"
fi
==== //depot/projects/hammer/etc/periodic/security/650.ip6fwlimit#4 (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/650.ip6fwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $
+# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $
#
# Show ip6fw rules which have reached the log limit
@@ -42,7 +42,7 @@
case "$daily_status_security_ip6fwlimit_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null`
if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then
ip6fw -a l | grep " log " | \
==== //depot/projects/hammer/etc/periodic/security/security.functions#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/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $
#
#
@@ -52,7 +52,7 @@
msg="$1"; shift
if [ "${tmpf}" = "-" ]; then
- tmpf=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ tmpf=`mktemp -t security`
cat > ${tmpf}
fi
==== //depot/projects/hammer/etc/rc.d/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.20 2003/06/29 05:15:57 mtm Exp $
.include <bsd.own.mk>
@@ -12,10 +12,10 @@
ldconfig local localdaemons lomac lpd \
motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs \
- named netif network1 network2 network3 \
+ named netif netoptions network1 network2 network3 \
network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \
- rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \
+ rarpd rcconf.sh root route6d routed routing rpcbind rtadvd rwho savecore \
securelevel sendmail serial sppp sshd swap1 syscons sysctl \
syslogd timed ttys usbd vinum virecover watchdogd ypbind \
yppasswdd ypserv ypset ypupdated ypxfrd
==== //depot/projects/hammer/etc/rc.d/NETWORKING#5 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.5 2003/04/18 17:55:05 mtm Exp $
+# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.6 2003/06/29 05:15:57 mtm Exp $
#
# PROVIDE: NETWORKING NETWORK
-# REQUIRE: network dhclient altqd netif network2 network_ipv6 isdnd ppp-user
+# REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user
# REQUIRE: routed mrouted route6d mroute6d
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list