From owner-p4-projects@FreeBSD.ORG Sat Mar 13 11:08:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A019016A4D0; Sat, 13 Mar 2004 11:08:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AC1616A4CE for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EEF543D41 for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DJ8MGe014066 for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DJ8KAb014063 for perforce@freebsd.org; Sat, 13 Mar 2004 11:08:20 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 11:08:20 -0800 (PST) Message-Id: <200403131908.i2DJ8KAb014063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 48899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2004 19:08:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48899 Change 48899 by peter@peter_overcee on 2004/03/13 11:07:19 IFC @48898 Affected files ... .. //depot/projects/hammer/Makefile.inc1#42 integrate .. //depot/projects/hammer/UPDATING#34 integrate .. //depot/projects/hammer/UPDATING.64BTT#3 integrate .. //depot/projects/hammer/bin/dd/Makefile#6 integrate .. //depot/projects/hammer/bin/df/df.c#13 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#7 integrate .. //depot/projects/hammer/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/hammer/etc/Makefile#23 integrate .. //depot/projects/hammer/etc/devd.conf#9 integrate .. //depot/projects/hammer/etc/group#4 integrate .. //depot/projects/hammer/etc/inetd.conf#5 integrate .. //depot/projects/hammer/etc/master.passwd#3 integrate .. //depot/projects/hammer/etc/pf.conf#1 branch .. //depot/projects/hammer/etc/pf.os#1 branch .. //depot/projects/hammer/etc/protocols#3 integrate .. //depot/projects/hammer/etc/rc#12 integrate .. //depot/projects/hammer/etc/rc.d/abi#3 integrate .. //depot/projects/hammer/etc/rc.d/accounting#6 integrate .. //depot/projects/hammer/etc/rc.d/addswap#3 integrate .. //depot/projects/hammer/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/hammer/etc/rc.d/amd#7 integrate .. //depot/projects/hammer/etc/rc.d/apm#5 integrate .. //depot/projects/hammer/etc/rc.d/apmd#8 integrate .. //depot/projects/hammer/etc/rc.d/archdep#6 integrate .. //depot/projects/hammer/etc/rc.d/atm1#5 integrate .. //depot/projects/hammer/etc/rc.d/atm2#2 integrate .. //depot/projects/hammer/etc/rc.d/atm3#3 integrate .. //depot/projects/hammer/etc/rc.d/bgfsck#4 integrate .. //depot/projects/hammer/etc/rc.d/bootparams#4 integrate .. //depot/projects/hammer/etc/rc.d/ccd#3 integrate .. //depot/projects/hammer/etc/rc.d/devd#3 integrate .. //depot/projects/hammer/etc/rc.d/devfs#7 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#10 integrate .. //depot/projects/hammer/etc/rc.d/diskless#9 integrate .. //depot/projects/hammer/etc/rc.d/dmesg#2 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#3 integrate .. //depot/projects/hammer/etc/rc.d/fsck#5 integrate .. //depot/projects/hammer/etc/rc.d/gbde#3 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/hammer/etc/rc.d/ike#2 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#9 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#2 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/hammer/etc/rc.d/ip6fw#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#16 integrate .. //depot/projects/hammer/etc/rc.d/ipfs#4 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#6 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#7 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#10 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#7 integrate .. //depot/projects/hammer/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#8 integrate .. //depot/projects/hammer/etc/rc.d/jail#7 integrate .. //depot/projects/hammer/etc/rc.d/kldxref#3 integrate .. //depot/projects/hammer/etc/rc.d/lomac#3 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#8 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/hammer/etc/rc.d/mountd#6 integrate .. //depot/projects/hammer/etc/rc.d/moused#5 integrate .. //depot/projects/hammer/etc/rc.d/mroute6d#3 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#6 integrate .. //depot/projects/hammer/etc/rc.d/netif#5 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#4 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#6 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#4 integrate .. //depot/projects/hammer/etc/rc.d/nfsd#6 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#6 integrate .. //depot/projects/hammer/etc/rc.d/nfsserver#3 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#5 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#5 integrate .. //depot/projects/hammer/etc/rc.d/pccard#4 integrate .. //depot/projects/hammer/etc/rc.d/pcvt#3 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#2 integrate .. //depot/projects/hammer/etc/rc.d/ppp-user#5 integrate .. //depot/projects/hammer/etc/rc.d/pppoed#2 integrate .. //depot/projects/hammer/etc/rc.d/quota#3 integrate .. //depot/projects/hammer/etc/rc.d/random#5 integrate .. //depot/projects/hammer/etc/rc.d/rarpd#3 integrate .. //depot/projects/hammer/etc/rc.d/root#7 integrate .. //depot/projects/hammer/etc/rc.d/route6d#5 integrate .. //depot/projects/hammer/etc/rc.d/routed#8 integrate .. //depot/projects/hammer/etc/rc.d/routing#4 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#6 integrate .. //depot/projects/hammer/etc/rc.d/savecore#4 integrate .. //depot/projects/hammer/etc/rc.d/serial#4 integrate .. //depot/projects/hammer/etc/rc.d/sppp#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#4 integrate .. //depot/projects/hammer/etc/rc.d/syscons#4 integrate .. //depot/projects/hammer/etc/rc.d/timed#3 integrate .. //depot/projects/hammer/etc/rc.d/usbd#2 integrate .. //depot/projects/hammer/etc/rc.d/vinum#2 integrate .. //depot/projects/hammer/etc/rc.d/watchdogd#2 integrate .. //depot/projects/hammer/lib/Makefile#32 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_gnutar.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#9 integrate .. //depot/projects/hammer/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#5 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#6 integrate .. //depot/projects/hammer/lib/msun/src/math.h#10 integrate .. //depot/projects/hammer/libexec/Makefile#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#58 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#14 integrate .. //depot/projects/hammer/sbin/Makefile#23 integrate .. //depot/projects/hammer/sbin/gconcat/gconcat.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/hammer/sbin/init/init.c#5 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#12 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#9 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#17 integrate .. //depot/projects/hammer/share/man/man4/Makefile#36 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ct.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/hammer/share/man/man4/uscanner.4#8 integrate .. //depot/projects/hammer/share/man/man5/Makefile#8 integrate .. //depot/projects/hammer/share/man/man9/Makefile#30 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#1 branch .. //depot/projects/hammer/share/man/man9/g_attach.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_bio.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_data.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_event.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_geom.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_provider.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/hammer/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#13 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#9 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#14 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#12 integrate .. //depot/projects/hammer/share/termcap/termcap.src#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#42 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#22 integrate .. //depot/projects/hammer/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#14 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efi_console.c#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#35 integrate .. //depot/projects/hammer/sys/conf/files#48 integrate .. //depot/projects/hammer/sys/conf/files.i386#23 integrate .. //depot/projects/hammer/sys/conf/kern.mk#17 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#20 integrate .. //depot/projects/hammer/sys/conf/options#32 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/hammer/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751reg.h#4 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/hammer/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm.c#4 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#4 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_rtables.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_rx.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/hammer/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#29 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#29 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#11 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#17 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/hammer/sys/geom/geom.h#24 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#9 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#25 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#15 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#35 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#5 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#4 integrate .. //depot/projects/hammer/sys/i386/include/bus_at386.h#5 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/hammer/sys/i386/include/critical.h#5 integrate .. //depot/projects/hammer/sys/i386/include/endian.h#6 integrate .. //depot/projects/hammer/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/hammer/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#8 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#6 integrate .. //depot/projects/hammer/sys/i386/include/stdarg.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#15 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#35 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#28 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/libkern/quad.h#4 integrate .. //depot/projects/hammer/sys/modules/Makefile#37 integrate .. //depot/projects/hammer/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#16 integrate .. //depot/projects/hammer/sys/net/if_disc.c#8 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/hammer/sys/net/if_faith.c#9 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/hammer/sys/net/if_loop.c#15 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/hammer/sys/net/if_stf.c#11 integrate .. //depot/projects/hammer/sys/net/if_tap.c#10 integrate .. //depot/projects/hammer/sys/net/if_tapvar.h#3 integrate .. //depot/projects/hammer/sys/net/if_tun.c#12 integrate .. //depot/projects/hammer/sys/net/if_var.h#12 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#8 integrate .. //depot/projects/hammer/sys/netatm/atm_ioctl.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/hammer/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#5 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/hammer/sys/netinet/pim.h#2 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#7 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#10 integrate .. //depot/projects/hammer/sys/pci/if_de.c#11 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#15 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#28 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#16 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#22 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#20 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#16 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#17 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#14 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#15 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#15 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#30 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/sparc64/include/_types.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#14 integrate .. //depot/projects/hammer/sys/sys/assym.h#2 integrate .. //depot/projects/hammer/sys/sys/buf.h#10 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#13 integrate .. //depot/projects/hammer/sys/sys/conf.h#9 integrate .. //depot/projects/hammer/sys/sys/dir.h#2 integrate .. //depot/projects/hammer/sys/sys/ioctl.h#2 integrate .. //depot/projects/hammer/sys/sys/kernel.h#8 integrate .. //depot/projects/hammer/sys/sys/linker_set.h#4 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#12 integrate .. //depot/projects/hammer/sys/sys/param.h#28 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#5 integrate .. //depot/projects/hammer/sys/sys/queue.h#3 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/hammer/sys/sys/syslimits.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#21 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#15 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#15 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#36 integrate .. //depot/projects/hammer/tools/test/ppsapi/ppsapitest.c#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/hammer/usr.bin/doscmd/xms.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/FlexLexer.h#2 integrate .. //depot/projects/hammer/usr.bin/mail/mail.1#4 integrate .. //depot/projects/hammer/usr.bin/make/for.c#5 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#5 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#9 integrate .. //depot/projects/hammer/usr.bin/msgs/msgs.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#7 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcinfo/rpcinfo.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/hammer/usr.bin/systat/extern.h#4 integrate .. //depot/projects/hammer/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/main.c#2 integrate .. //depot/projects/hammer/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#12 integrate .. //depot/projects/hammer/usr.sbin/Makefile#43 integrate .. //depot/projects/hammer/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.c#4 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#7 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#1 branch .. //depot/projects/hammer/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/nologin/nologin.c#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/hammer/usr.sbin/pw/edgroup.c#2 integrate .. //depot/projects/hammer/usr.sbin/pw/fileupd.c#2 integrate .. //depot/projects/hammer/usr.sbin/rtadvd/rrenum.c#3 integrate .. //depot/projects/hammer/usr.sbin/setkey/token.l#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dhcp.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#13 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#21 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/variable.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.410 2004/03/05 18:16:28 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -407,17 +407,29 @@ # # Checks to be sure system is ready for installworld # +CHECK_UIDS= +CHECK_GIDS= +.if !defined(NO_SENDMAIL) +CHECK_UIDS+= smmsp +CHECK_GIDS+= smmsp +.endif +.if !defined(NO_PF) +CHECK_UIDS+= proxy +CHECK_GIDS+= proxy authpf +.endif installcheck: ${SPECIAL_INSTALLCHECKS} -.if !defined(NO_SENDMAIL) - @if ! `id -u smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \ +.for uid in ${CHECK_UIDS} + @if ! `id -u ${uid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ false; \ fi - @if ! `id -g smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \ +.endfor +.for gid in ${CHECK_GIDS} + @if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \ false; \ fi -.endif +.endfor # # distributeworld @@ -569,6 +581,15 @@ @echo "ERROR: No kernel \"${KERNCONF}\" to install." false .endif + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; \ + ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} ==== //depot/projects/hammer/UPDATING#34 (text+ko) ==== @@ -17,7 +17,25 @@ developers choose to disable these features on build machines to maximize performance. -20040303: +20040310: + The FreeBSD/sparc64 platform is changing time_t from 32-bits to + 64-bits. This is a very major incompatible change, so people + using FreeBSD/sparc64 *must* read the UPDATING.64BTT file for + detailed instructions on how to make this upgrade. People + upgrading FreeBSD on other platforms can ignore this event. + +20040308: + The packet filter (pf) is now installed with the base system. Make + sure to run mergemaster -p before installworld to create required + user accounts. If you do not want to build pf with your system you + can use the NO_PF knob in make.conf. + Also note that pf requires "options PFIL_HOOKS" in the kernel. The + pf system consists of the following three devices: + device pf # required + device pflog # optional + device pfsync # optional + +20040303: If you are having trouble with the libc_r -> libpthread transition (see the 20040130 entry), place the following lines at the top of /etc/libmap.conf: @@ -1530,4 +1548,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ +$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $ ==== //depot/projects/hammer/UPDATING.64BTT#3 (text+ko) ==== @@ -1,6 +1,6 @@ # -------+---------+---------+---------+---------+---------+---------+---------+ - The FreeBSD/sparc64 port is going to change time_t from 32-bits to 64-bits. + The FreeBSD/sparc64 port has now changed time_t from 32-bits to 64-bits. This file explains the exact steps that users should follow to update their sparc64 systems for this change. People running FreeBSD on other types of hardware, such as CPU's from Intel or AMD, can ignore this file. For now, @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -------+---------+---------+---------+---------+---------+---------+---------+ -# $FreeBSD: src/UPDATING.64BTT,v 1.3 2004/03/05 23:10:49 gad Exp $ +# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $ # -------+---------+---------+---------+---------+---------+---------+---------+ If you are in too much of a hurry to read this file, then this is not the @@ -43,7 +43,16 @@ Do not start this update unless you have the extra time. -* READ THIS ENTIRE DOCUMENT at least once before starting the upgrade. * +As of March 10th, the official value for time_t on sparc64 has changed to +be 64-bits. If you really must build system with 32-bit time_t's, then it +would be best to stick with a snapshot of current from before March 10th. +With src snapshots after that point, there will soon be ports which assume +you have a 64-bit time_t based on the value of __FreeBSD_version. + +If you are ready to upgrade, then *READ THIS ENTIRE DOCUMENT* at least +once before starting the upgrade. + +# -------+---------+---------+---------+---------+---------+---------+---------+ This is a major change. This change will *not* be backwards-compatible. Any programs which call system-routines for handling time-values will @@ -60,8 +69,12 @@ problems, but if you ignore these steps you are very likely to run into some very painful and time-consuming headaches when upgrading. -Step Pre-1: Update to a recent snapshot of -current, keeping it as - a system with 32-bit time_t. +Step Pre-1: Update to a recent snapshot of -current, and first build + that as a system with 32-bit time_t. To do this, edit + the file /usr/src/sys/sparc64/include/_types.h + find the line: + typedef __int64_t __time_t; /* time()... */ + and change '__int64_t' to '__int32_t' Step Pre-2: Install that system, using whatever steps you normally use, and make sure that installation seems to work okay. Step Pre-3: While still running that 32-bit time_t system, it would @@ -78,17 +91,17 @@ The 'dhclient' in the base system is known to be unreliable on a system which is upgraded to 64-bit time_t's. It may work for you, but it probably will not. - As of March 3rd 2004, we have no fix for that. + As of March 10th 2004, we have no fix for that. However, the net/isc-dhcp3-client port does seem to work. IF your machine needs DHCP, then you should probably install that port and make sure you can get it working *before* you make the change to use 64-bit time_t's. - +After you have built and installed that src-snapshot with 32-bit time_t's, edit the file /usr/src/sys/sparc64/include/_types.h find the line: typedef __int32_t __time_t; /* time()... */ - and change '__int32_t' to '__int64_t' + and change '__int32_t' back to '__int64_t' For best results, do NOT make any other changes. Do NOT cvsup the source tree trying to pick up any other changes. At this point you @@ -104,8 +117,9 @@ I am not suggesting that you have to do two whole buildworld/ installworld cycles in a single day. You could easily wait a few days, or even a week between them. What I am suggesting is that - you should not 'cvsup' your sources inbetween the two buildworlds. - + you should not 'cvsup' your sources inbetween the two buildworlds. + +And then follow these steps to build and install the 64-bit time_t system: cd /usr/src #- 1. make cleanworld #- 2. or 'rm -Rf /usr/obj/usr/src/*' @@ -299,9 +313,9 @@ and log back in after recompiling that shell. portupgrade -Rr -f ezm3 cvsup-without-gui #- Ports 3 (maybe). If you want to rebuild a 64-bit time_t version of cvsup. - Note: ezm3 (modula-3) needs a patch to work correctly after - the change to 64-BTT. That fix has not been commited to the - port yet [as of Mar 3rd], but it should be commited soon. + Note: ezm3 (modula-3) needs a patch to work correctly after the + change to 64-BTT. That fix has not been commited to the port + yet [as of Mar 10th], but hopefully it will be commited soon. There are pre-built packages available for ezm3 and cvsup-without-gui on the new 64-bTT systems. This ezm3 package *does* include the necessarily @@ -325,10 +339,11 @@ "Now look over all the other ports you have installed, and re-compile everything that probably needs to be recompiled". -If you are going to do it piecemeal, the next ports to force-recompile -would probably be languages like perl and python, if you have them -installed. Or you might want to play it safe at this point, and simply -recompile *every* port that you have installed. +If you are going to do it piecemeal, the next ports to force-rebuild would +probably be languages like perl and python, if you have them installed. +After that, force-rebuild the ports like autoconf and automake, if you +have them installed. Or you might want to play it safe at this point, +and simply recompile *every* port that you have installed. A different tactic to use for ports is to remove *all* ports before you do the installkernel/installworld step (while you're still on a 32-bTT @@ -342,20 +357,5 @@ the mailing list freebsd-sparc64@FreeBSD.org . # -------+---------+---------+---------+---------+---------+---------+---------+ - - - For people who are helping out by testing these instructions, note - that once you make this change, you must remember to KEEP changing - __time_t in _types.h after every time you 'cvs update' or cvsup - your /usr/src tree. If you forget, and end up building a world - with 32-bit time_t's, you will probably have a very very bad day. - Once this change is committed for real (which is scheduled for - March 10th), you will not need to care about this issue as much. - - Also, a change has been committed to /usr/src/Makefile.inc1 which - does try to protect you from making this mistake. - - -# -------+---------+---------+---------+---------+---------+---------+---------+ # Notice that the following command can be useful in some settings: grep '#\- ' UPDATING.64BTT ==== //depot/projects/hammer/bin/dd/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -8,7 +8,6 @@ .include -CLEANFILES+= a.out # # Test the character conversion functions. We have to be explicit about # which LC_LANG we use because the definition of upper and lower case @@ -24,3 +23,4 @@ /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \ diff -IFreeBSD - ${.CURDIR}/ref.${conv} .endfor + @rm -f a.out ==== //depot/projects/hammer/bin/df/df.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.55 2004/03/05 08:10:16 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.56 2004/03/09 10:02:44 le Exp $"); #include #include @@ -400,7 +400,8 @@ */ #define fsbtoblk(num, fsbs, bs) \ (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs))) + (num) / (intmax_t)((bs) / (fsbs)) : \ + (num) * (intmax_t)((fsbs) / (bs))) /* * Print out status about a file system. ==== //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#28 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#29 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -137,45 +137,52 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define ENTERI(i) do { \ - if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ - openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + int _i = (i); \ + if (_i > 0 && _i < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[_i]); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _i); \ } while (0) #define ENTERN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _n); \ } while (0) #define ENTERS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", _s); \ } while (0) #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ - openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ + int _c = (c); \ + if (_c >= 0 && _c < PAM_NUM_ERRORS) \ + openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[_c]); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ - return (c); \ + openpam_log(PAM_LOG_DEBUG, "returning %d!", _c); \ + return (_c); \ } while (0) #define RETURNN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "returning %d", _n); \ + return (_n); \ } while (0) #define RETURNP(p) do { \ - if ((p) == NULL) \ + const void *_p = (p); \ + if (_p == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %p", (p)); \ + openpam_log(PAM_LOG_DEBUG, "returning %p", _p); \ return (p); \ } while (0) #define RETURNS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning '%s'", (s)); \ - return (s); \ + openpam_log(PAM_LOG_DEBUG, "returning '%s'", _s); \ + return (_s); \ } while (0) #else #define ENTER() ==== //depot/projects/hammer/contrib/pf/pfctl/parse.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.2 2004/02/28 18:41:43 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -2737,7 +2737,7 @@ memcpy(&r.rpool.key, $8.key, sizeof(struct pf_poolhashkey)); - if ($9 != NULL) { + if ($9 != 0) { if (r.action != PF_NAT) { yyerror("the 'static-port' option is " "only valid with nat rules"); ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -165,7 +165,7 @@ print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw, struct node_queue_opt *qopts) { - if (a->qname[0] != NULL) { + if (a->qname[0] != '\0') { print_queue(a, level, bw, 0, qopts); return; } ==== //depot/projects/hammer/etc/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.324 2004/01/22 08:18:37 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - phones profile protocols \ + pf.conf pf.os phones profile protocols \ rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ ==== //depot/projects/hammer/etc/devd.conf#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.11 2004/02/03 04:18:55 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -31,7 +31,7 @@ # # For ethernet like devices, the default is to run dhclient. Due to -# a historical accident, the name of this script it called pccard_ether +# a historical accident, this script is called pccard_ether. # attach 0 { device-name "$ethernet-nic-regex"; ==== //depot/projects/hammer/etc/group#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/group,v 1.30 2004/03/10 15:04:29 mlaier Exp $ # wheel:*:0:root daemon:*:1: @@ -17,6 +17,8 @@ mailnull:*:26: guest:*:31: bind:*:53: +proxy:*:62: +authpf:*:63: uucp:*:66: dialer:*:68: network:*:69: ==== //depot/projects/hammer/etc/inetd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.63 2003/06/09 21:04:30 markm Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.67 2004/03/11 22:15:28 des Exp $ # # Internet server configuration database # @@ -26,8 +26,8 @@ # # ntalk is required for the 'talk' utility to work correctly #ntalk dgram udp wait tty:tty /usr/libexec/ntalkd ntalkd -#tftp dgram udp wait root /usr/libexec/tftpd tftpd -s /tftpboot -#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -s /tftpboot +#tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /tftpboot +#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -s /tftpboot #bootps dgram udp wait root /usr/libexec/bootpd bootpd # # "Small servers" -- used to be standard on, but we're more conservative @@ -117,3 +117,9 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat +# +# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf +# N.B.: inetd binds to * in the default installation so you should add +# an appropriate block rule to your pf.conf +# +#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/hammer/etc/master.passwd#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.35 2004/03/08 22:03:27 mlaier Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -14,6 +14,7 @@ smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin ==== //depot/projects/hammer/etc/protocols#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Internet protocols # -# $FreeBSD: src/etc/protocols,v 1.18 2002/12/13 09:18:09 fenner Exp $ +# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # See also http://www.iana.org/assignments/protocol-numbers @@ -65,7 +65,7 @@ mobile 55 MOBILE # IP Mobility tlsp 56 TLSP # Transport Layer Security Protocol skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 ipv6-opts 60 IPV6-OPTS # destination options for ipv6 # 61 # any host internal protocol ==== //depot/projects/hammer/etc/rc#12 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.330 2004/02/27 10:44:33 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.331 2004/03/08 12:02:07 pjd Exp $ # # System startup script run by init on autoboot @@ -66,9 +66,9 @@ fi os=`eval ${CMD_OSTYPE}` -skip="nostart" -[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail" -files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null` +skip="-s nostart" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" +files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} ==== //depot/projects/hammer/etc/rc.d/abi#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/accounting#6 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.7 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/addswap#3 (text+ko) ==== @@ -2,13 +2,13 @@ # >>> TRUNCATED FOR MAIL (1000 lines) <<<