Date: Mon, 28 Jun 2004 21:17:59 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 56024 for review Message-ID: <200406282117.i5SLHx9o064314@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=56024 Change 56024 by peter@peter_overcee on 2004/06/28 21:17:55 IFC @56022 Affected files ... .. //depot/projects/hammer/UPDATING#42 integrate .. //depot/projects/hammer/bin/ps/print.c#13 integrate .. //depot/projects/hammer/bin/ps/ps.c#17 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mh#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/CHANGES#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/COPYRIGHT#3 delete .. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/LICENSE#1 branch .. //depot/projects/hammer/contrib/isc-dhcp/Makefile#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/Makefile.conf#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/README#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient-script.8#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.8#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#8 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.conf.5#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.leases.5#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/scripts/freebsd#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/alloc.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/bpf.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/comapi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/conflex.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/ctrace.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dhcp-eval.5#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dhcp-options.5#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/discover.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dispatch.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dlpi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dns.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/ethernet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/execute.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/fddi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/icmp.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/inet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/iscprint.c#1 branch .. //depot/projects/hammer/contrib/isc-dhcp/common/lpf.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/memory.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/nit.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/options.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/packet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/parse.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/print.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/raw.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/resolv.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/socket.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tables.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tr.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tree.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/upf.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/callback.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/cltest.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.3#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/omshell.1#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/omshell.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/remote.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/base64.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/dst_api.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/dst_support.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/hmac_link.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/md5_dgst.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/md5_locl.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/prandom.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/arpa/nameser.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/cdefs.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/ctrace.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhcp.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhcpd.h#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhctoken.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/failover.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/inet.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/int.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/lang.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/list.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/result.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/types.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/minires.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/res_update.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/resolv.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/netinet/udp.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/alloc.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/buffer.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/convert.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/hash.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/omapip.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/omapip_p.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/trace.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/osdep.h#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/statement.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/tree.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_date.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_name.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_parse.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_samedomain.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_sign.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_verify.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_comp.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_findzonecut.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_init.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_mkquery.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_mkupdate.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_query.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_send.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_sendsigned.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_update.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/alloc.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/array.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/auth.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/buffer.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/connection.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/convert.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/dispatch.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/errwarn.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/generic.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/handle.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/hash.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/listener.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/message.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/mrtrace.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/omapi.3#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/protocol.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/result.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/support.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/toisc.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/trace.c#2 integrate .. //depot/projects/hammer/etc/rc.shutdown#5 integrate .. //depot/projects/hammer/etc/rc.subr#17 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/doc/inc-hist.diff#2 delete .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/doc/inc-hist.diff#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#10 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#9 integrate .. //depot/projects/hammer/lib/libpthread_dbg/Makefile#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.c#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.h#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg_int.h#2 delete .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_atfork.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#6 integrate .. //depot/projects/hammer/libexec/getty/subr.c#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#10 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.8#3 integrate .. //depot/projects/hammer/share/man/man4/ng_ksocket.4#3 integrate .. //depot/projects/hammer/share/man/man4/pty.4#3 integrate .. //depot/projects/hammer/share/man/man9/style.9#15 integrate .. //depot/projects/hammer/share/misc/pci_vendors#10 integrate .. //depot/projects/hammer/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#49 integrate .. //depot/projects/hammer/sys/conf/files#67 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#23 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#26 integrate .. //depot/projects/hammer/sys/conf/options#42 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#39 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#22 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#12 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#9 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#13 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#11 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#24 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#33 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#17 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#19 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#9 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#10 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#15 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#15 integrate .. //depot/projects/hammer/sys/dev/si/si.c#11 integrate .. //depot/projects/hammer/sys/dev/si/si.h#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#36 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#11 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#12 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#7 integrate .. //depot/projects/hammer/sys/dev/sx/sx.h#2 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#12 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/hammer/sys/dev/usb/devlist2h.awk#3 delete .. //depot/projects/hammer/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/urio.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#37 delete .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#37 delete .. //depot/projects/hammer/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#10 integrate .. //depot/projects/hammer/sys/dev/zs/zs_macio.c#4 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#25 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#23 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/hammer/sys/i386/include/float.h#6 integrate .. //depot/projects/hammer/sys/i386/include/proc.h#6 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#55 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/hammer/sys/kern/tty.c#20 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/hammer/sys/modules/ar/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/aue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/axe/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/kue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/rue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sr/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ubsa/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ucom/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/udav/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ufm/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uftdi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ukbd/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umass/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umct/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ums/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uplcom/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/urio/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uvisor/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uvscom/Makefile#4 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/hammer/sys/net/if_loop.c#19 integrate .. //depot/projects/hammer/sys/net/if_sl.c#13 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#14 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#7 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#13 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#7 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_UI.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_lmi.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#25 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#35 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#20 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#35 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#21 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#28 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#28 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#27 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#22 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#20 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#38 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#6 integrate .. //depot/projects/hammer/sys/powerpc/psim/iobus.c#4 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#15 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_private.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#15 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#8 integrate .. //depot/projects/hammer/sys/sys/linedisc.h#3 integrate .. //depot/projects/hammer/sys/sys/proc.h#54 integrate .. //depot/projects/hammer/sys/sys/procfs.h#2 integrate .. //depot/projects/hammer/sys/sys/serial.h#2 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#20 integrate .. //depot/projects/hammer/sys/sys/tty.h#11 integrate .. //depot/projects/hammer/sys/sys/ttycom.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#39 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/hammer/tools/tools/pciid/mk_pci_vendors.pl#3 integrate .. //depot/projects/hammer/usr.bin/cut/cut.1#4 integrate .. //depot/projects/hammer/usr.bin/cut/cut.c#3 integrate .. //depot/projects/hammer/usr.bin/indent/args.c#5 integrate .. //depot/projects/hammer/usr.bin/indent/indent.c#6 integrate .. //depot/projects/hammer/usr.bin/indent/indent_globs.h#5 integrate .. //depot/projects/hammer/usr.bin/indent/io.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#8 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#13 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/hammer/usr.bin/tar/matching.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#7 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#9 integrate .. //depot/projects/hammer/usr.bin/tr/tr.1#5 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#6 integrate Differences ... ==== //depot/projects/hammer/UPDATING#42 (text+ko) ==== @@ -1530,16 +1530,16 @@ <maybe fix /etc/fstab> [7] make buildworld [9] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - cp src/sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] + cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - cd src/sys/boot ; make install [6] + cd sys/boot ; make STRIP="" install [6] [1] <reboot in single user> [3] - /etc/rc.d/preseedrandom [10] + /usr/src/etc/rc.d/preseedrandom [10] mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] + mergemaster -i [4] <reboot> Make sure that you've read the UPDATING file to understand the @@ -1609,7 +1609,13 @@ that is hard to boot to recover. [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. + cvs prune empty directories. Also, if CPUTYPE is defined in your + /etc/make.conf, make sure to use the "?=" instead of the "=" assignment + operator, so that buildworld can override the CPUTYPE if it needs to. + In case you would like to avoid installing new packages of everything, + you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x + compatibility libraries are build which should allow you to continue + using your existing software for a while. [10] In order to create temporary files, /dev/random must be initialized by feeding data into it. /etc/rc.d/preseedrandom @@ -1647,4 +1653,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.317 2004/06/23 01:32:28 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $ ==== //depot/projects/hammer/bin/ps/print.c#13 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -668,6 +668,9 @@ class = lpri->pri_class; level = lpri->pri_level; switch (class) { + case PRI_ITHD: + snprintf(str, sizeof(str), "intr:%u", level); + break; case PRI_REALTIME: snprintf(str, sizeof(str), "real:%u", level); break; ==== //depot/projects/hammer/bin/ps/ps.c#17 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -715,9 +715,10 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; ttypath = NULL; + pathbuf2[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -732,28 +733,35 @@ strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); ttypath = pathbuf; - if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; - if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* Check to see if /dev/tty${elem} exists */ + strlcpy(pathbuf2, _PATH_TTY, sizeof(pathbuf2)); + strlcat(pathbuf2, elem, sizeof(pathbuf2)); + if (stat(pathbuf2, &sb) == 0 && S_ISCHR(sb.st_mode)) { /* No need to repeat stat() && S_ISCHR() checks */ ttypath = NULL; break; } - /* /dev/${elem} does not exist, so try /dev/tty${elem} */ - strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); - strlcat(pathbuf, elem, sizeof(pathbuf)); break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); + if (pathbuf2[0] != '\0') + warn("%s and %s", pathbuf2, ttypath); + else + warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); + if (pathbuf2[0] != '\0') + warnx("%s and %s: Not a terminal", pathbuf2, + ttypath); + else + warnx("%s: Not a terminal", ttypath); optfatal = 1; return (0); } ==== //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mh#2 (text+ko) ==== @@ -1,3 +1,3 @@ -NATDEPFILES= fbsd-proc.o fbsd-thread.o fork-child.o gcore.o \ +NATDEPFILES= fbsd-proc.o fork-child.o gcore.o \ ia64-fbsd-nat.o infptrace.o inftarg.o NAT_FILE= nm-fbsd.h ==== //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=8 -$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.19 2004/01/19 22:07:59 mbr Exp $ +$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.21 2004/06/26 23:19:40 mbr Exp $ -ISC DHCP client 3.0.1rc12 +ISC DHCP client 3.0.1rc14 originals can be found at: ftp://ftp.isc.org/isc/dhcp/ @@ -27,8 +27,8 @@ Imported by: - cvs import -m 'Import ISC DHCP 3.0.1 RC11 client.' \ - src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc12 + cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \ + src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14 To make local changes to isc-dhcp, simply patch and commit to the main @@ -65,6 +65,8 @@ - Remove dhcpd from SEE ALSO section. common/dispatch.c r1.2 - interface polling + common/parse.c + r1.2 - 64bit time_t fix includes/dhcpd.h r1.5 - interface polling r1.4 - interface polling ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile#3 (text+ko) ==== @@ -1,42 +1,32 @@ # Makefile # -# Copyright (c) 2002 Internet Software Consortium. -# All rights reserved. +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of Internet Software Consortium nor the names -# of its contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# <info@isc.org> +# http://www.isc.org/ # -# This software has been written for the Internet Software Consortium +# This software has been written for Internet Systems Consortium # by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -# To learn more about the Internet Software Consortium, see +# To learn more about Internet Systems Consortium, see # ``http://www.isc.org/''. To learn more about Vixie Enterprises, # see ``http://www.vix.com''. To learn more about Nominum, Inc., see # ``http://www.nominum.com''. -# all: @sysname=`./configure --print-sysname`; \ ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile.conf#3 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.conf # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# <info@isc.org> +# http://www.isc.org/ ## Defaults... SCRIPT = none ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile.dist#3 (text+ko) ==== @@ -1,21 +1,26 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# <info@isc.org> +# http://www.isc.org/ + SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl ==== //depot/projects/hammer/contrib/isc-dhcp/README#5 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - April 28, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 README FILE @@ -97,18 +96,16 @@ RELEASE STATUS -This is the twelfth release candidate of version 3.0.1 of the ISC DHCP -Distribution. Development of this release is approaching the point at -which it will be frozen, and no significant new features will be -added. +This is fourteenth release candidate of version 3.0.1 of the ISC DHCP +Distribution. In this release, the server and relay agent are currently fully functional on NetBSD, Linux systems with kernel version 2.2 or later, -FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The -software will also run on HP-UX, but only supports a single network -interface. Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but -are not in wide use, with all that implies. We are not aware of an -easy way to get this software running on HP-UX. +FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The software +will also run on HP-UX, but only supports a single network interface. +Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but are not in +wide use, with all that implies. We are not aware of an easy way to +get this software running on HP-UX. The DHCP client currently only knows how to configure the network on NetBSD, FreeBSD, OpenBSD, BSD/os, Linux, Solaris and NextStep. The @@ -143,14 +140,14 @@ To build the DHCP Distribution, unpack the compressed tar file using the tar utility and the gzip command - type something like: - zcat dhcp-3.0.1rc11.tar.gz |tar xvf - + zcat dhcp-3.0.1rc14.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. CONFIGURING IT -Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just +Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just created and configure the source tree by typing: ./configure @@ -466,14 +463,14 @@ client is different (not necessarily better or worse) than that of the ISC client, but in most cases it will be a lot easier for you to just use that. Please do not ask for help in using the Solaris DHCP client -on Internet Software Consortium mailing lists - that's why you're +on Internet Systems Consortium mailing lists - that's why you're paying Sun the big bucks. If you're having a problem with the Solaris client interoperating with the ISC dhcp server, that's another matter, but please check with Sun first. SUPPORT -The Internet Software Consortium DHCP server is not a commercial +The Internet Systems Consortium DHCP server is not a commercial product, and is not supported by the ISC. However, it has attracted a fairly sizable following on the Internet, which means that there are a lot of knowledgable users who may be able to help you if you get @@ -508,8 +505,8 @@ release and see if the bug is still in that version of the software, and if it's not, _then_ report it. It's okay to report bugs in the latest patchlevel of a major version that's not the most recent major -version, though - for example, if you're running 2.0, you don't have -to upgrade to 3.0 before you can report bugs. +version, though - for example, if you're running 3.0pl2, you don't have +to upgrade to a 3.0.1rc (release candidate) before you can report bugs. PLEASE DO NOT REPORT BUGS IF YOU ARE RUNNING A VERSION OF THE ISC DHCP DISTRIBUTION THAT YOU DIDN'T GET FROM THE ISC! Free operating @@ -639,7 +636,7 @@ dhcpcd, this is _not_ the ISC DHCP client, and we probably can't help you with it. -Please see http://www.isc.org/services/public/lists/dhcp-lists.html -for details on how to subscribe to the ISC DHCP mailing lists. +Please see http://www.isc.org/sw/dhcp/ for details on how to subscribe +to the ISC DHCP mailing lists. ==== //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#5 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - June, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 Release Notes @@ -23,11 +22,9 @@ - Many bug fixes, performance enhancements, and minor new DHCP protocol features. -This is a release candidate for a minor bug fix release to follow ISC -DHCP 3.0. The main bug fixed here is a bug in the subclass allocation -code that could result in a memory smash. Any users of the ISC DHCP server -who are using subclasses should seriously consider upgrading to 3.0.1 -either now or when the final 3.0.1 release comes out. +The main bug fixed here is a bug in the subclass allocation code that +could result in a memory smash. Any users of the ISC DHCP server who +are using subclasses should seriously consider upgrading to 3.0.1. If you are running 3.0 beta 1 and are doing dynamic DNS updates, the lease file is no longer forward-compatible to 3.0 final. A script @@ -46,6 +43,55 @@ thanks to all of these good people here, both for working on the code and for prodding me into improving it. + Changes since 3.0.1rc13 + +! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed + in logging messages with excessively long hostnames provided by the + clients. It is highly probable that these could have been used by + attackers to gain arbitrary root access on systems using ISC DHCP 3.0.1 + release candidates 12 or 13. Special thanks to Gregory Duchemin for + both finding and solving the problem. + +! CAN-2004-0461 - CERT VU#654390: Once the above was closed, an opening + in log_*() functions was evidented, on some specific platforms where + vsnprintf() was not believed to be available and calls were wrapped to + sprintf() instead. Again, credit goes to Gregory Duchemin for finding + the problem. Calls to snprintf() are now linked to a distribution-local + snprintf implementation, only in those cases where the architecture is + not known to provide one (see includes/cf/[arch].h). If you experience + linking problems with snprintf/vsnprintf or 'isc_print_' functions, this + is where to look. This vulnerability did not exist in any previously + published version of ISC DHCP. + +- Compilation on hpux 11.11 was repaired. + +- 'The cross-compile bug fix' was backed out. + + Changes since 3.0.1rc12 + +- Fixed a bug in omapi lease lookup function, to form the hardware + address for the hash lookup correctly, thanks to a patch from + Richard Hirst. + +- Fixed a bug where dhcrelay was sending relayed responses back to the + broadcast address, but with the source's unicast mac address. Should + now conform to rfc2131 section 4.1. + +- Cross-compile bug fix; use $(AR) instead of ar. Thanks to Morten Brorup. + +- Fixed a crash bug in dhclient where dhcpd servers that do not provide + renewal times results in an FPE. As a side effect, dhclient can now + properly handle 0xFFFFFFFF (-1) expiry times supplied by servers. Thanks + to a patch from Burt Silverman. + +- The 'ping timeout' debugs from rc12 were removed to -DDEBUG only, + and reformatted to correct a compilation error on solaris platforms. + +- A patch was applied which fixes a case where leases read from the + leases database do not properly over-ride previously read leases. + +- dhcpctl.3 manpage was tweaked. + Changes since 3.0.1rc11 - A patch from Steve Campbell was applied with minor modifications to @@ -93,6 +139,9 @@ appear in a lease file. An option that might have been named "#144" is now "unknown-144". +- Another patch from Bill Stephens which allows the ping-check timeout to + be configured as 'ping-timeout'. Defaults to 1. + Changes since 3.0.1rc10 - Potential buffer overflows in minires repaired. ==== //depot/projects/hammer/contrib/isc-dhcp/client/Makefile.dist#3 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1996-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# <info@isc.org> +# http://www.isc.org/ CATMANPAGES = dhclient.cat8 dhclient.conf.cat5 dhclient-script.cat8 \ dhclient.leases.cat5 ==== //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#5 (text+ko) ==== @@ -3,39 +3,30 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406282117.i5SLHx9o064314>