Date: Fri, 12 May 2006 00:02:22 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 96984 for review Message-ID: <200605120002.k4C02MYX043897@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96984 Change 96984 by marcel@marcel_nfs on 2006/05/12 00:01:21 IFC @96983 Affected files ... .. //depot/projects/ia64/MAINTAINERS#52 integrate .. //depot/projects/ia64/Makefile#48 integrate .. //depot/projects/ia64/UPDATING#86 integrate .. //depot/projects/ia64/bin/pax/pax.1#10 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.8#5 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#8 integrate .. //depot/projects/ia64/etc/Makefile#55 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#69 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#18 integrate .. //depot/projects/ia64/etc/nsswitch.conf#1 branch .. //depot/projects/ia64/etc/rc.d/jail#19 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#7 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#56 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.c#14 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.3#6 integrate .. //depot/projects/ia64/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#31 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#157 integrate .. //depot/projects/ia64/sbin/adjkerntz/adjkerntz.c#5 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/ia64/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/ia64/sbin/mount/mount.c#25 integrate .. //depot/projects/ia64/share/man/man4/fdc.4#5 integrate .. //depot/projects/ia64/share/man/man5/Makefile#25 integrate .. //depot/projects/ia64/share/man/man5/linsysfs.5#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#71 integrate .. //depot/projects/ia64/share/man/man7/hier.7#31 integrate .. //depot/projects/ia64/share/man/man9/make_dev.9#9 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#30 integrate .. //depot/projects/ia64/share/zoneinfo/africa#6 integrate .. //depot/projects/ia64/share/zoneinfo/antarctica#6 integrate .. //depot/projects/ia64/share/zoneinfo/asia#11 integrate .. //depot/projects/ia64/share/zoneinfo/australasia#10 integrate .. //depot/projects/ia64/share/zoneinfo/backward#8 integrate .. //depot/projects/ia64/share/zoneinfo/etcetera#3 integrate .. //depot/projects/ia64/share/zoneinfo/europe#11 integrate .. //depot/projects/ia64/share/zoneinfo/factory#2 integrate .. //depot/projects/ia64/share/zoneinfo/leapseconds#9 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#11 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#12 integrate .. //depot/projects/ia64/share/zoneinfo/systemv#3 integrate .. //depot/projects/ia64/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#12 integrate .. //depot/projects/ia64/sys/alpha/Makefile#2 delete .. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/ia64/sys/alpha/alpha/autoconf.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#28 delete .. //depot/projects/ia64/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/ia64/sys/alpha/alpha/clock.c#18 delete .. //depot/projects/ia64/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#9 delete .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/ia64/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/ia64/sys/alpha/alpha/db_interface.c#10 delete .. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/divrem.m4#4 delete .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#15 delete .. //depot/projects/ia64/sys/alpha/alpha/exception.s#7 delete .. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/gdb_machdep.c#4 delete .. //depot/projects/ia64/sys/alpha/alpha/genassym.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/ia64/sys/alpha/alpha/in_cksum.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#23 delete .. //depot/projects/ia64/sys/alpha/alpha/locore.s#6 delete .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#53 delete .. //depot/projects/ia64/sys/alpha/alpha/mem.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#24 delete .. //depot/projects/ia64/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#61 delete .. //depot/projects/ia64/sys/alpha/alpha/prom.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#17 delete .. //depot/projects/ia64/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/support.s#12 delete .. //depot/projects/ia64/sys/alpha/alpha/swtch.s#5 delete .. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/trap.c#39 delete .. //depot/projects/ia64/sys/alpha/alpha/uio_machdep.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#38 delete .. //depot/projects/ia64/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/ia64/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/ia64/sys/alpha/conf/DEFAULTS#3 delete .. //depot/projects/ia64/sys/alpha/conf/GENERIC#42 delete .. //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/ia64/sys/alpha/conf/MAC#2 delete .. //depot/projects/ia64/sys/alpha/conf/Makefile#3 delete .. //depot/projects/ia64/sys/alpha/conf/NOTES#11 delete .. //depot/projects/ia64/sys/alpha/include/_bus.h#2 delete .. //depot/projects/ia64/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/ia64/sys/alpha/include/_limits.h#9 delete .. //depot/projects/ia64/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/ia64/sys/alpha/include/_types.h#7 delete .. //depot/projects/ia64/sys/alpha/include/alpha_cpu.h#5 delete .. //depot/projects/ia64/sys/alpha/include/asm.h#7 delete .. //depot/projects/ia64/sys/alpha/include/atomic.h#13 delete .. //depot/projects/ia64/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/ia64/sys/alpha/include/bus.h#20 delete .. //depot/projects/ia64/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/ia64/sys/alpha/include/bwx.h#2 delete .. //depot/projects/ia64/sys/alpha/include/chipset.h#3 delete .. //depot/projects/ia64/sys/alpha/include/clock.h#4 delete .. //depot/projects/ia64/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/ia64/sys/alpha/include/cpu.h#12 delete .. //depot/projects/ia64/sys/alpha/include/cpuconf.h#6 delete .. //depot/projects/ia64/sys/alpha/include/cpufunc.h#6 delete .. //depot/projects/ia64/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/ia64/sys/alpha/include/elf.h#6 delete .. //depot/projects/ia64/sys/alpha/include/endian.h#11 delete .. //depot/projects/ia64/sys/alpha/include/exec.h#4 delete .. //depot/projects/ia64/sys/alpha/include/float.h#6 delete .. //depot/projects/ia64/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/ia64/sys/alpha/include/fpu.h#4 delete .. //depot/projects/ia64/sys/alpha/include/frame.h#3 delete .. //depot/projects/ia64/sys/alpha/include/gdb_machdep.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ieee.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/ia64/sys/alpha/include/in_cksum.h#4 delete .. //depot/projects/ia64/sys/alpha/include/inst.h#2 delete .. //depot/projects/ia64/sys/alpha/include/intr.h#4 delete .. //depot/projects/ia64/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#7 delete .. //depot/projects/ia64/sys/alpha/include/kdb.h#4 delete .. //depot/projects/ia64/sys/alpha/include/limits.h#10 delete .. //depot/projects/ia64/sys/alpha/include/md_var.h#6 delete .. //depot/projects/ia64/sys/alpha/include/memdev.h#2 delete .. //depot/projects/ia64/sys/alpha/include/mutex.h#4 delete .. //depot/projects/ia64/sys/alpha/include/pal.h#3 delete .. //depot/projects/ia64/sys/alpha/include/param.h#14 delete .. //depot/projects/ia64/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/ia64/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/ia64/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/ia64/sys/alpha/include/pcb.h#7 delete .. //depot/projects/ia64/sys/alpha/include/pcpu.h#5 delete .. //depot/projects/ia64/sys/alpha/include/pmap.h#17 delete .. //depot/projects/ia64/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/ia64/sys/alpha/include/proc.h#8 delete .. //depot/projects/ia64/sys/alpha/include/profile.h#6 delete .. //depot/projects/ia64/sys/alpha/include/prom.h#5 delete .. //depot/projects/ia64/sys/alpha/include/pte.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ptrace.h#6 delete .. //depot/projects/ia64/sys/alpha/include/reg.h#5 delete .. //depot/projects/ia64/sys/alpha/include/reloc.h#3 delete .. //depot/projects/ia64/sys/alpha/include/resource.h#3 delete .. //depot/projects/ia64/sys/alpha/include/rpb.h#4 delete .. //depot/projects/ia64/sys/alpha/include/runq.h#4 delete .. //depot/projects/ia64/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/ia64/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/ia64/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/ia64/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/ia64/sys/alpha/include/signal.h#7 delete .. //depot/projects/ia64/sys/alpha/include/smp.h#5 delete .. //depot/projects/ia64/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/ia64/sys/alpha/include/swiz.h#2 delete .. //depot/projects/ia64/sys/alpha/include/sysarch.h#5 delete .. //depot/projects/ia64/sys/alpha/include/timerreg.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/ia64/sys/alpha/include/varargs.h#7 delete .. //depot/projects/ia64/sys/alpha/include/vmparam.h#6 delete .. //depot/projects/ia64/sys/alpha/isa/isa.c#11 delete .. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#10 delete .. //depot/projects/ia64/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/ia64/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/ia64/sys/alpha/linux/Makefile#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux.h#5 delete .. //depot/projects/ia64/sys/alpha/linux/linux_dummy.c#7 delete .. //depot/projects/ia64/sys/alpha/linux/linux_genassym.c#5 delete .. //depot/projects/ia64/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#17 delete .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#16 delete .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#15 delete .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#15 delete .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#21 delete .. //depot/projects/ia64/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#15 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#13 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/ia64/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/ia64/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#16 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_ioctl.c#8 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#31 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#16 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#10 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#23 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_util.h#6 delete .. //depot/projects/ia64/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#9 delete .. //depot/projects/ia64/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/ia64/sys/alpha/pci/apecs.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/ia64/sys/alpha/pci/cia.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/irongate.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/lca.c#7 delete .. //depot/projects/ia64/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/ia64/sys/alpha/pci/lcareg.h#4 delete .. //depot/projects/ia64/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/ia64/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/ia64/sys/alpha/pci/t2.c#11 delete .. //depot/projects/ia64/sys/alpha/pci/t2_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/tsunami.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/ia64/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#10 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbcpu.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#16 delete .. //depot/projects/ia64/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#37 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#52 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/cpu.h#7 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#20 integrate .. //depot/projects/ia64/sys/amd64/include/smp.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/ia64/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/ia64/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/ia64/sys/arm/include/cpu.h#6 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#9 integrate .. //depot/projects/ia64/sys/boot/alpha/Makefile#2 delete .. //depot/projects/ia64/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/ia64/sys/boot/alpha/boot1/Makefile#9 delete .. //depot/projects/ia64/sys/boot/alpha/boot1/boot1.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/cdboot/Makefile#5 delete .. //depot/projects/ia64/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/ia64/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/ia64/sys/boot/alpha/common/conf.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/ia64/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/ia64/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/Makefile#6 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/elf_freebsd.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/ia64/sys/boot/alpha/loader/version#3 delete .. //depot/projects/ia64/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/ia64/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/ia64/sys/boot/arc/Makefile#2 delete .. //depot/projects/ia64/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/ia64/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/ia64/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/ia64/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/Makefile#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/arcdisk.c#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/ia64/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/ia64/sys/boot/arc/lib/elf_freebsd.c#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/ia64/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/ia64/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/ia64/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/ia64/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/ia64/sys/boot/arc/loader/version#2 delete .. //depot/projects/ia64/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#39 integrate .. //depot/projects/ia64/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/ia64/sys/compat/linux/linux_file.c#25 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#37 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.h#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#43 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#18 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#19 delete .. //depot/projects/ia64/sys/conf/NOTES#100 integrate .. //depot/projects/ia64/sys/conf/files#140 integrate .. //depot/projects/ia64/sys/conf/files.alpha#36 delete .. //depot/projects/ia64/sys/conf/files.amd64#36 integrate .. //depot/projects/ia64/sys/conf/files.i386#75 integrate .. //depot/projects/ia64/sys/conf/files.pc98#63 integrate .. //depot/projects/ia64/sys/conf/kern.mk#16 integrate .. //depot/projects/ia64/sys/conf/ldscript.alpha#5 delete .. //depot/projects/ia64/sys/conf/options#93 integrate .. //depot/projects/ia64/sys/conf/options.alpha#13 delete .. //depot/projects/ia64/sys/conf/options.amd64#17 integrate .. //depot/projects/ia64/sys/conf/options.i386#40 integrate .. //depot/projects/ia64/sys/conf/options.pc98#40 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#29 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#67 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#22 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#36 integrate .. //depot/projects/ia64/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#22 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#51 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfereg.h#8 integrate .. //depot/projects/ia64/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/ia64/sys/dev/dec/mcclock.c#5 delete .. //depot/projects/ia64/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/ia64/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#29 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/ia64/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#50 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#56 integrate .. //depot/projects/ia64/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/ia64/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/ia64/sys/dev/tga/tga_pci.c#13 delete .. //depot/projects/ia64/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#11 delete .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/ia64/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#64 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#73 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#17 integrate .. //depot/projects/ia64/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#52 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#92 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#12 integrate .. //depot/projects/ia64/sys/i386/include/cpu.h#11 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#28 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#18 integrate .. //depot/projects/ia64/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/ia64/sys/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/ia64/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#39 integrate .. //depot/projects/ia64/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#21 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#29 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#81 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#90 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_clock.c#7 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#54 integrate .. //depot/projects/ia64/sys/libkern/alpha/bswap16.S#3 delete .. //depot/projects/ia64/sys/libkern/alpha/bswap32.S#3 delete .. //depot/projects/ia64/sys/libkern/alpha/byte_swap_2.S#4 delete .. //depot/projects/ia64/sys/libkern/alpha/byte_swap_4.S#4 delete .. //depot/projects/ia64/sys/modules/Makefile#95 integrate .. //depot/projects/ia64/sys/modules/ath_hal/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/linsysfs/Makefile#1 branch .. //depot/projects/ia64/sys/modules/linux/Makefile#13 integrate .. //depot/projects/ia64/sys/modules/rr232x/Makefile#2 integrate .. //depot/projects/ia64/sys/net/bpf.c#42 integrate .. //depot/projects/ia64/sys/net/if_gre.c#22 integrate .. //depot/projects/ia64/sys/net/route.c#25 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#54 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#61 integrate .. //depot/projects/ia64/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#17 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#27 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#34 integrate .. //depot/projects/ia64/sys/pc98/cbus/cbus.h#2 integrate .. //depot/projects/ia64/sys/pc98/cbus/fdc.c#5 integrate .. //depot/projects/ia64/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#54 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98_machdep.h#5 integrate .. //depot/projects/ia64/sys/powerpc/include/cpu.h#15 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/clock.c#15 integrate .. //depot/projects/ia64/sys/sparc64/include/cpu.h#8 integrate .. //depot/projects/ia64/sys/sys/mount.h#38 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#47 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#49 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#61 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#49 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#21 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#59 integrate .. //depot/projects/ia64/tools/tools/find-sb/find-sb.c#2 integrate .. //depot/projects/ia64/tools/tools/find-sb/mini_ufs.h#1 branch .. //depot/projects/ia64/tools/tools/mfc/mfc.awk#2 integrate .. //depot/projects/ia64/tools/tools/ministat/ministat.c#8 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/README#4 delete .. //depot/projects/ia64/tools/tools/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/ia64/tools/tools/recoverdisk/recoverdisk.c#4 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/releng_6.rc#4 integrate .. //depot/projects/ia64/usr.bin/Makefile#75 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#60 integrate .. //depot/projects/ia64/usr.bin/du/du.1#9 integrate .. //depot/projects/ia64/usr.bin/du/du.c#15 integrate .. //depot/projects/ia64/usr.bin/getent/Makefile#1 branch .. //depot/projects/ia64/usr.bin/getent/getent.1#1 branch .. //depot/projects/ia64/usr.bin/getent/getent.c#1 branch .. //depot/projects/ia64/usr.bin/make/Makefile#21 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#11 integrate .. //depot/projects/ia64/usr.bin/w/w.c#11 integrate .. //depot/projects/ia64/usr.sbin/cached/agents/services.c#2 integrate .. //depot/projects/ia64/usr.sbin/cached/query.c#2 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.c#14 integrate .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#3 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.8#7 integrate .. //depot/projects/ia64/usr.sbin/portsnap/phttpget/phttpget.c#6 integrate .. //depot/projects/ia64/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#37 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#52 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.130 2006/04/01 21:19:15 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -127,7 +127,8 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. -xfs kan,rodrigc Pre-commit review preferred. +xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org + Pre-commit review preferred. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. ==== //depot/projects/ia64/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.328 2006/03/18 14:30:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $ # # The user-driven targets are: # @@ -266,7 +266,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 alpha ia64 amd64 +.for target in i386 i386:pc98 sparc64 ia64 amd64 .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ ==== //depot/projects/ia64/UPDATING#86 (text+ko) ==== @@ -21,6 +21,21 @@ developers choose to disable these features on build machines to maximize performance. +20060428: + The puc(4) driver has been overhauled. The ebus(4) and sbus(4) + attachments have been removed. Make sure to configure scc(4) + on sparc64. Note also that by default puc(4) will use uart(4) + and not sio(4) for serial ports because interrupt handling has + been optimized for multi-port serial cards and only uart(4) + implements the interface to support it. + +20060330: + The scc(4) driver replaces puc(4) for Serial Communications + Controllers (SCCs) like the Siemens SAB82532 and the Zilog + Z8530. On sparc64, it is advised to add scc(4) to the kernel + configuration to make sure that the serial ports remain + functional. + 20060317: Most world/kernel related NO_* build options changed names. New knobs have common prefixes WITHOUT_*/WITH_* (modelled @@ -543,4 +558,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.445 2006/04/07 11:36:25 ru Exp $ +$FreeBSD: src/UPDATING,v 1.446 2006/05/04 03:48:06 marcel Exp $ ==== //depot/projects/ia64/bin/pax/pax.1#10 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.35 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $ .\" .Dd July 3, 2004 .Dt PAX 1 @@ -394,8 +394,9 @@ bytes per write to the archive file. The .Ar blocksize -must be a multiple of 512 bytes with a maximum of 64512 bytes. -Archives larger than 32256 bytes violate the +must be a multiple of 512 bytes with a maximum of 64512 bytes. A +.Ar blocksize +larger than 32256 bytes violates the .Tn POSIX standard and will not be portable to all systems. A ==== //depot/projects/ia64/contrib/traceroute/traceroute.8#5 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.11 2005/04/12 15:16:32 thomas Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.12 2006/05/11 06:30:18 cjc Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dFISdnrvx +.B \-deFISdnrvx ] [ .B \-f .I first_ttl @@ -98,6 +98,11 @@ .PP Other options are: .TP +.B \-e +Firewall evasion mode. +Use fixed destination ports for UDP and TCP probes. +The destination port does NOT increment with each packet sent. +.TP .B \-f Set the initial time-to-live used in the first outgoing probe packet. .TP ==== //depot/projects/ia64/contrib/traceroute/traceroute.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.28 2006/01/10 16:48:52 pav Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.29 2006/05/11 06:30:18 cjc Exp $"; #endif /* @@ -353,6 +353,7 @@ int doipcksum = 1; /* calculate ip checksums by default */ #endif int optlen; /* length of ip options */ +int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ extern int optind; extern int opterr; @@ -521,13 +522,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "dFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { case 'd': options |= SO_DEBUG; break; + case 'e': + fixedPort = 1; + break; + case 'f': case 'M': /* FreeBSD compat. */ first_ttl = str2val(optarg, "first ttl", 1, 255); @@ -1289,8 +1294,8 @@ { struct udphdr *const outudp = (struct udphdr *) outp; - outudp->uh_sport = htons(ident); - outudp->uh_dport = htons(port + outdata->seq); + outudp->uh_sport = htons(ident + (fixedPort ? outdata->seq : 0)); + outudp->uh_dport = htons(port + (fixedPort ? 0 : outdata->seq)); outudp->uh_ulen = htons((u_short)protlen); outudp->uh_sum = 0; if (doipcksum) { @@ -1306,8 +1311,8 @@ { struct udphdr *const udp = (struct udphdr *) data; - return (ntohs(udp->uh_sport) == ident - && ntohs(udp->uh_dport) == port + seq); + return (ntohs(udp->uh_sport) == ident + (fixedPort ? seq : 0) && + ntohs(udp->uh_dport) == port + (fixedPort ? 0 : seq)); } void @@ -1316,8 +1321,9 @@ struct tcphdr *const tcp = (struct tcphdr *) outp; tcp->th_sport = htons(ident); - tcp->th_dport = htons(port + outdata->seq); - tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport; + tcp->th_dport = htons(port + (fixedPort ? 0 : outdata->seq)); + tcp->th_seq = (tcp->th_sport << 16) | (tcp->th_dport + + (fixedPort ? outdata->seq : 0)); tcp->th_ack = 0; tcp->th_off = 5; tcp->th_flags = TH_SYN; @@ -1335,7 +1341,8 @@ struct tcphdr *const tcp = (struct tcphdr *) data; return (ntohs(tcp->th_sport) == ident - && ntohs(tcp->th_dport) == port + seq); + && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq)) + && tcp->th_seq == (ident << 16) | (port + seq); } void ==== //depot/projects/ia64/etc/Makefile#55 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.355 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/Makefile,v 1.356 2006/05/03 15:14:46 ume Exp $ .include <bsd.own.mk> @@ -11,8 +11,8 @@ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ - inetd.conf login.access login.conf \ - mac.conf motd netconfig network.subr networks newsyslog.conf \ + inetd.conf login.access login.conf mac.conf motd \ + netconfig network.subr networks newsyslog.conf nsswitch.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ ==== //depot/projects/ia64/etc/defaults/rc.conf#69 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.282 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.283 2006/05/11 14:23:43 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -555,11 +555,15 @@ # # To use rc's built-in jail infrastructure create entries for # each jail, specified in jail_list, with the following variables. -# NOTE: replace 'example' with the jail's name. +# NOTES: +# - replace 'example' with the jail's name. +# - except rootdir, hostname and ip, all of the following variables may be made +# global jail variables if you don't specify a jail name (ie. jail_interface). # #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname #jail_example_ip="192.168.0.10" # Jail's IP number +#jail_example_interface="" # Interface to create the IP alias on #jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting #jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail ==== //depot/projects/ia64/etc/mtree/BSD.root.dist#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.76 2005/12/29 14:40:19 dfr Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.77 2006/05/10 18:53:15 marcus Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -69,6 +69,8 @@ .. libexec .. + media + .. mnt .. proc mode=0555 ==== //depot/projects/ia64/etc/rc.d/jail#19 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.27 2006/04/08 12:15:35 flz Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.32 2006/05/11 14:23:43 flz Exp $ # # PROVIDE: jail @@ -27,65 +27,76 @@ return fi - eval jail_rootdir=\"\$jail_${_j}_rootdir\" - jail_devdir="${jail_rootdir}/dev" - jail_fdescdir="${jail_devdir}/fd" - jail_procdir="${jail_rootdir}/proc" - eval jail_hostname=\"\$jail_${_j}_hostname\" - eval jail_ip=\"\$jail_${_j}_ip\" - eval jail_interface=\"\${jail_${_j}_interface:-${jail_interface}}\" - eval jail_exec=\"\$jail_${_j}_exec\" - eval jail_exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" - eval jail_exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" - if [ -n "${jail_exec}" ]; then + eval _rootdir=\"\$jail_${_j}_rootdir\" + _devdir="${_rootdir}/dev" + _fdescdir="${_devdir}/fd" + _procdir="${_rootdir}/proc" + eval _hostname=\"\$jail_${_j}_hostname\" + eval _ip=\"\$jail_${_j}_ip\" + eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" + eval _exec=\"\$jail_${_j}_exec\" + eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" + eval _exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" + if [ -n "${_exec}" ]; then # simple/backward-compatible execution - jail_exec_start="${jail_exec}" - jail_exec_stop="" + _exec_start="${_exec}" + _exec_stop="" else # flexible execution - if [ -z "${jail_exec_start}" ]; then - jail_exec_start="/bin/sh /etc/rc" - if [ -z "${jail_exec_stop}" ]; then - jail_exec_stop="/bin/sh /etc/rc.shutdown" + if [ -z "${_exec_start}" ]; then + _exec_start="/bin/sh /etc/rc" + if [ -z "${_exec_stop}" ]; then + _exec_stop="/bin/sh /etc/rc.shutdown" fi fi fi # The default jail ruleset will be used by rc.subr if none is specified. - eval jail_ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" - eval jail_devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" - [ -z "${jail_devfs}" ] && jail_devfs="NO" - eval jail_fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" - [ -z "${jail_fdescfs}" ] && jail_fdescfs="NO" - eval jail_procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" - [ -z "${jail_procfs}" ] && jail_procfs="NO" + eval _ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" + eval _devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" + [ -z "${_devfs}" ] && _devfs="NO" + eval _fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" + [ -z "${_fdescfs}" ] && _fdescfs="NO" + eval _procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" + [ -z "${_procfs}" ] && _procfs="NO" - eval jail_mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" - [ -z "${jail_mount}" ] && jail_mount="NO" + eval _mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" + [ -z "${_mount}" ] && _mount="NO" # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. - eval jail_fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" - [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" - eval jail_flags=\"\${jail_${_j}_flags:-${jail_flags}}\" - [ -z "${jail_flags}" ] && jail_flags="-l -U root" + eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" + [ -z "${_fstab}" ] && _fstab="/etc/fstab.${_j}" + eval _flags=\"\${jail_${_j}_flags:-${jail_flags}}\" + [ -z "${_flags}" ] && _flags="-l -U root" # Debugging aid # - debug "$_j devfs enable: $jail_devfs" - debug "$_j fdescfs enable: $jail_fdescfs" - debug "$_j procfs enable: $jail_procfs" - debug "$_j mount enable: $jail_mount" - debug "$_j hostname: $jail_hostname" - debug "$_j ip: $jail_ip" - debug "$_j interface: $jail_interface" - debug "$_j root: $jail_rootdir" - debug "$_j devdir: $jail_devdir" - debug "$_j fdescdir: $jail_fdescdir" - debug "$_j procdir: $jail_procdir" - debug "$_j ruleset: $jail_ruleset" - debug "$_j fstab: $jail_fstab" - debug "$_j exec start: $jail_exec_start" - debug "$_j exec stop: $jail_exec_stop" - debug "$_j flags: $jail_flags" + debug "$_j devfs enable: $_devfs" + debug "$_j fdescfs enable: $_fdescfs" + debug "$_j procfs enable: $_procfs" + debug "$_j mount enable: $_mount" + debug "$_j hostname: $_hostname" + debug "$_j ip: $_ip" + debug "$_j interface: $_interface" + debug "$_j root: $_rootdir" + debug "$_j devdir: $_devdir" + debug "$_j fdescdir: $_fdescdir" + debug "$_j procdir: $_procdir" + debug "$_j ruleset: $_ruleset" + debug "$_j fstab: $_fstab" + debug "$_j exec start: $_exec_start" + debug "$_j exec stop: $_exec_stop" + debug "$_j flags: $_flags" + + if [ -z "${_hostname}" ]; then + err 3 "$name: No hostname has been defined for ${_j}" + fi + if [ -z "${_rootdir}" ]; then + err 3 "$name: No root directory has been defined for ${_j}" + fi + if [ -z "${_ip}" ]; then + err 3 "$name: No IP address has been defined for ${_j}" + fi + } # set_sysctl rc_knob mib msg @@ -122,24 +133,24 @@ # jail_umount_fs() { - if checkyesno jail_fdescfs; then - if [ -d "${jail_fdescdir}" ] ; then - umount -f ${jail_fdescdir} >/dev/null 2>&1 + if checkyesno _fdescfs; then + if [ -d "${_fdescdir}" ] ; then + umount -f ${_fdescdir} >/dev/null 2>&1 fi fi - if checkyesno jail_devfs; then - if [ -d "${jail_devdir}" ] ; then - umount -f ${jail_devdir} >/dev/null 2>&1 + if checkyesno _devfs; then + if [ -d "${_devdir}" ] ; then + umount -f ${_devdir} >/dev/null 2>&1 fi fi - if checkyesno jail_procfs; then - if [ -d "${jail_procdir}" ] ; then - umount -f ${jail_procdir} >/dev/null 2>&1 + if checkyesno _procfs; then + if [ -d "${_procdir}" ] ; then + umount -f ${_procdir} >/dev/null 2>&1 fi fi - if checkyesno jail_mount; then - [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist" - umount -a -F "${jail_fstab}" >/dev/null 2>&1 + if checkyesno _mount; then + [ -f "${_fstab}" ] || warn "${_fstab} does not exist" + umount -a -F "${_fstab}" >/dev/null 2>&1 fi } @@ -161,29 +172,29 @@ do init_variables $_jail if [ -f /var/run/jail_${_jail}.id ]; then - echo -n " [${jail_hostname} already running (/var/run/jail_${_jail}.id exists)]" + echo -n " [${_hostname} already running (/var/run/jail_${_jail}.id exists)]" continue; fi - if [ -n ${jail_interface} ]; then - ifconfig ${jail_interface} alias ${jail_ip} netmask 255.255.255.255 + if [ -n "${_interface}" ]; then + ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 fi - if checkyesno jail_mount; then - info "Mounting fstab for jail ${_jail} (${jail_fstab})" - if [ ! -f "${jail_fstab}" ]; then - err 3 "$name: ${jail_fstab} does not exist" + if checkyesno _mount; then + info "Mounting fstab for jail ${_jail} (${_fstab})" + if [ ! -f "${_fstab}" ]; then + err 3 "$name: ${_fstab} does not exist" fi - mount -a -F "${jail_fstab}" + mount -a -F "${_fstab}" fi - if checkyesno jail_devfs; then + if checkyesno _devfs; then # If devfs is already mounted here, skip it. - df -t devfs "${jail_devdir}" >/dev/null + df -t devfs "${_devdir}" >/dev/null >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605120002.k4C02MYX043897>