svn commit: r198395 - in projects/clangbsd: . bin/cat bin/csh bin/sh bin/uuidgen cddl/contrib/opensolaris contrib/gcc/config/i386 contrib/llvm contrib/llvm/tools/clang contrib/tcsh etc etc/defaults...

Roman Divacky rdivacky at FreeBSD.org
Fri Oct 23 14:06:27 UTC 2009 

Author: rdivacky
Date: Fri Oct 23 14:06:25 2009
New Revision: 198395
URL: http://svn.freebsd.org/changeset/base/198395

Log:
  Update FreeBSD sources to r198394.

Added:
  projects/clangbsd/share/man/man9/BUS_DESCRIBE_INTR.9
     - copied unchanged from r198394, head/share/man/man9/BUS_DESCRIBE_INTR.9
  projects/clangbsd/sys/cam/ata/ata_pmp.c
     - copied unchanged from r198394, head/sys/cam/ata/ata_pmp.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmextern.c
     - copied unchanged from r198394, head/sys/contrib/dev/acpica/common/dmextern.c
  projects/clangbsd/sys/dev/usb/controller/ehcireg.h
     - copied unchanged from r198394, head/sys/dev/usb/controller/ehcireg.h
  projects/clangbsd/sys/dev/usb/controller/ohcireg.h
     - copied unchanged from r198394, head/sys/dev/usb/controller/ohcireg.h
  projects/clangbsd/sys/dev/usb/controller/uhcireg.h
     - copied unchanged from r198394, head/sys/dev/usb/controller/uhcireg.h
Deleted:
  projects/clangbsd/sys/compat/x86bios/x86bios_alloc.c
  projects/clangbsd/sys/contrib/x86emu/x86emu_util.c
  projects/clangbsd/sys/dev/usb/serial/uch341.c
  projects/clangbsd/sys/modules/usb/uch341/
Modified:
  projects/clangbsd/   (props changed)
  projects/clangbsd/Makefile.inc1
  projects/clangbsd/bin/cat/Makefile
  projects/clangbsd/bin/csh/iconv_stub.c
  projects/clangbsd/bin/sh/parser.c
  projects/clangbsd/bin/uuidgen/Makefile
  projects/clangbsd/cddl/contrib/opensolaris/   (props changed)
  projects/clangbsd/contrib/gcc/config/i386/i386.c
  projects/clangbsd/contrib/llvm/   (props changed)
  projects/clangbsd/contrib/llvm/tools/clang/   (props changed)
  projects/clangbsd/contrib/tcsh/   (props changed)
  projects/clangbsd/etc/defaults/rc.conf
  projects/clangbsd/etc/gettytab
  projects/clangbsd/etc/rc.d/faith
  projects/clangbsd/etc/rc.d/netoptions
  projects/clangbsd/etc/rc.d/stf
  projects/clangbsd/etc/rc.subr
  projects/clangbsd/lib/libfetch/common.c
  projects/clangbsd/lib/libusb/libusb20_ugen20.c
  projects/clangbsd/release/doc/README
  projects/clangbsd/release/doc/en_US.ISO8859-1/errata/article.sgml
  projects/clangbsd/release/doc/share/mk/doc.relnotes.mk
  projects/clangbsd/release/doc/share/sgml/release.dsl
  projects/clangbsd/release/doc/share/sgml/release.ent
  projects/clangbsd/release/scripts/package-split.py
  projects/clangbsd/sbin/Makefile.inc
  projects/clangbsd/sbin/adjkerntz/Makefile
  projects/clangbsd/sbin/atacontrol/Makefile
  projects/clangbsd/sbin/atm/atmconfig/Makefile
  projects/clangbsd/sbin/badsect/Makefile
  projects/clangbsd/sbin/bsdlabel/Makefile
  projects/clangbsd/sbin/camcontrol/Makefile
  projects/clangbsd/sbin/ccdconfig/Makefile
  projects/clangbsd/sbin/clri/Makefile
  projects/clangbsd/sbin/comcontrol/Makefile
  projects/clangbsd/sbin/conscontrol/Makefile
  projects/clangbsd/sbin/dhclient/Makefile
  projects/clangbsd/sbin/dhclient/bpf.c
  projects/clangbsd/sbin/dhclient/dhcpd.h
  projects/clangbsd/sbin/dhclient/packet.c
  projects/clangbsd/sbin/dmesg/Makefile
  projects/clangbsd/sbin/dump/Makefile
  projects/clangbsd/sbin/dumpfs/Makefile
  projects/clangbsd/sbin/dumpfs/dumpfs.c
  projects/clangbsd/sbin/dumpon/Makefile
  projects/clangbsd/sbin/geom/Makefile
  projects/clangbsd/sbin/geom/Makefile.inc
  projects/clangbsd/sbin/geom/class/part/gpart.8
  projects/clangbsd/sbin/ggate/Makefile.inc
  projects/clangbsd/sbin/growfs/Makefile
  projects/clangbsd/sbin/gvinum/Makefile
  projects/clangbsd/sbin/init/Makefile
  projects/clangbsd/sbin/ipf/Makefile.inc
  projects/clangbsd/sbin/iscontrol/Makefile
  projects/clangbsd/sbin/kldunload/Makefile
  projects/clangbsd/sbin/ldconfig/Makefile
  projects/clangbsd/sbin/md5/Makefile
  projects/clangbsd/sbin/mdconfig/Makefile
  projects/clangbsd/sbin/mdmfs/Makefile
  projects/clangbsd/sbin/mksnap_ffs/Makefile
  projects/clangbsd/sbin/mount/Makefile
  projects/clangbsd/sbin/mount_autofs/Makefile
  projects/clangbsd/sbin/mount_cd9660/Makefile
  projects/clangbsd/sbin/mount_ext2fs/Makefile
  projects/clangbsd/sbin/mount_msdosfs/Makefile
  projects/clangbsd/sbin/mount_nullfs/Makefile
  projects/clangbsd/sbin/mount_reiserfs/Makefile
  projects/clangbsd/sbin/mount_unionfs/Makefile
  projects/clangbsd/sbin/newfs_msdos/Makefile
  projects/clangbsd/sbin/nfsiod/Makefile
  projects/clangbsd/sbin/pfctl/Makefile
  projects/clangbsd/sbin/rcorder/Makefile
  projects/clangbsd/sbin/reboot/Makefile
  projects/clangbsd/sbin/recoverdisk/Makefile
  projects/clangbsd/sbin/routed/Makefile
  projects/clangbsd/sbin/savecore/Makefile
  projects/clangbsd/sbin/sconfig/Makefile
  projects/clangbsd/sbin/shutdown/Makefile
  projects/clangbsd/sbin/spppcontrol/Makefile
  projects/clangbsd/sbin/swapon/Makefile
  projects/clangbsd/sbin/sysctl/sysctl.c
  projects/clangbsd/sbin/tunefs/Makefile
  projects/clangbsd/sbin/tunefs/tunefs.8
  projects/clangbsd/share/man/man4/Makefile
  projects/clangbsd/share/man/man4/atapicam.4
  projects/clangbsd/share/man/man4/hifn.4
  projects/clangbsd/share/man/man4/ichwd.4
  projects/clangbsd/share/man/man4/mac_mls.4
  projects/clangbsd/share/man/man4/malo.4
  projects/clangbsd/share/man/man4/sbp_targ.4
  projects/clangbsd/share/man/man4/targ.4
  projects/clangbsd/share/man/man4/umass.4
  projects/clangbsd/share/man/man4/urtw.4
  projects/clangbsd/share/man/man9/Makefile
  projects/clangbsd/share/misc/bsd-family-tree
  projects/clangbsd/share/misc/committers-src.dot
  projects/clangbsd/share/mk/bsd.sys.mk
  projects/clangbsd/share/mk/sys.mk
  projects/clangbsd/share/zoneinfo/   (props changed)
  projects/clangbsd/share/zoneinfo/Makefile
  projects/clangbsd/share/zoneinfo/asia
  projects/clangbsd/share/zoneinfo/australasia
  projects/clangbsd/sys/amd64/amd64/intr_machdep.c
  projects/clangbsd/sys/amd64/amd64/nexus.c
  projects/clangbsd/sys/amd64/amd64/pmap.c
  projects/clangbsd/sys/amd64/include/intr_machdep.h
  projects/clangbsd/sys/arm/arm/pmap.c
  projects/clangbsd/sys/cam/ata/ata_da.c
  projects/clangbsd/sys/cam/ata/ata_xpt.c
  projects/clangbsd/sys/cam/cam.h
  projects/clangbsd/sys/cam/cam_periph.c
  projects/clangbsd/sys/cam/cam_queue.c
  projects/clangbsd/sys/cam/cam_xpt.c
  projects/clangbsd/sys/cam/cam_xpt_internal.h
  projects/clangbsd/sys/cam/scsi/scsi_all.c
  projects/clangbsd/sys/cam/scsi/scsi_cd.c
  projects/clangbsd/sys/cam/scsi/scsi_ch.c
  projects/clangbsd/sys/cam/scsi/scsi_da.c
  projects/clangbsd/sys/cam/scsi/scsi_low.c
  projects/clangbsd/sys/cam/scsi/scsi_pt.c
  projects/clangbsd/sys/cam/scsi/scsi_sa.c
  projects/clangbsd/sys/cam/scsi/scsi_targ_bh.c
  projects/clangbsd/sys/cam/scsi/scsi_target.c
  projects/clangbsd/sys/cam/scsi/scsi_xpt.c
  projects/clangbsd/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clangbsd/sys/compat/x86bios/x86bios.c
  projects/clangbsd/sys/compat/x86bios/x86bios.h
  projects/clangbsd/sys/conf/NOTES
  projects/clangbsd/sys/conf/files
  projects/clangbsd/sys/conf/files.amd64
  projects/clangbsd/sys/conf/files.i386
  projects/clangbsd/sys/conf/options
  projects/clangbsd/sys/contrib/dev/acpica/   (props changed)
  projects/clangbsd/sys/contrib/dev/acpica/changes.txt
  projects/clangbsd/sys/contrib/dev/acpica/common/adfile.c
  projects/clangbsd/sys/contrib/dev/acpica/common/adisasm.c
  projects/clangbsd/sys/contrib/dev/acpica/common/adwalk.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmtable.c
  projects/clangbsd/sys/contrib/dev/acpica/common/getopt.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslload.c
  projects/clangbsd/sys/contrib/dev/acpica/debugger/dbcmds.c
  projects/clangbsd/sys/contrib/dev/acpica/debugger/dbinput.c
  projects/clangbsd/sys/contrib/dev/acpica/disassembler/dmutils.c
  projects/clangbsd/sys/contrib/dev/acpica/disassembler/dmwalk.c
  projects/clangbsd/sys/contrib/dev/acpica/dispatcher/dswload.c
  projects/clangbsd/sys/contrib/dev/acpica/events/evregion.c
  projects/clangbsd/sys/contrib/dev/acpica/include/acapps.h
  projects/clangbsd/sys/contrib/dev/acpica/include/acdebug.h
  projects/clangbsd/sys/contrib/dev/acpica/include/acdisasm.h
  projects/clangbsd/sys/contrib/dev/acpica/include/acglobal.h
  projects/clangbsd/sys/contrib/dev/acpica/include/aclocal.h
  projects/clangbsd/sys/contrib/dev/acpica/include/acpixf.h
  projects/clangbsd/sys/contrib/dev/acpica/namespace/nsrepair.c
  projects/clangbsd/sys/contrib/dev/acpica/utilities/utglobal.c
  projects/clangbsd/sys/dev/ahci/ahci.c
  projects/clangbsd/sys/dev/ahci/ahci.h
  projects/clangbsd/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/clangbsd/sys/dev/atkbdc/atkbd.c
  projects/clangbsd/sys/dev/bce/if_bce.c
  projects/clangbsd/sys/dev/bce/if_bcereg.h
  projects/clangbsd/sys/dev/bge/if_bge.c
  projects/clangbsd/sys/dev/dpms/dpms.c
  projects/clangbsd/sys/dev/drm/mach64_state.c
  projects/clangbsd/sys/dev/fb/vesa.c
  projects/clangbsd/sys/dev/gem/if_gem_pci.c
  projects/clangbsd/sys/dev/hwpmc/hwpmc_mod.c
  projects/clangbsd/sys/dev/ips/ips_disk.c
  projects/clangbsd/sys/dev/mpt/mpt.c
  projects/clangbsd/sys/dev/mpt/mpt.h
  projects/clangbsd/sys/dev/mpt/mpt_cam.c
  projects/clangbsd/sys/dev/mpt/mpt_raid.c
  projects/clangbsd/sys/dev/mwl/if_mwl_pci.c
  projects/clangbsd/sys/dev/mxge/if_mxge.c
  projects/clangbsd/sys/dev/mxge/if_mxge_var.h
  projects/clangbsd/sys/dev/pci/pci.c
  projects/clangbsd/sys/dev/pci/vga_pci.c
  projects/clangbsd/sys/dev/ppbus/lpt.c
  projects/clangbsd/sys/dev/ppbus/pcfclock.c
  projects/clangbsd/sys/dev/siis/siis.c
  projects/clangbsd/sys/dev/usb/controller/ehci.c
  projects/clangbsd/sys/dev/usb/controller/ehci.h
  projects/clangbsd/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/clangbsd/sys/dev/usb/controller/ehci_mbus.c
  projects/clangbsd/sys/dev/usb/controller/ehci_pci.c
  projects/clangbsd/sys/dev/usb/controller/ohci.c
  projects/clangbsd/sys/dev/usb/controller/ohci.h
  projects/clangbsd/sys/dev/usb/controller/ohci_atmelarm.c
  projects/clangbsd/sys/dev/usb/controller/ohci_pci.c
  projects/clangbsd/sys/dev/usb/controller/uhci.c
  projects/clangbsd/sys/dev/usb/controller/uhci.h
  projects/clangbsd/sys/dev/usb/controller/uhci_pci.c
  projects/clangbsd/sys/dev/usb/input/ukbd.c
  projects/clangbsd/sys/dev/usb/input/ums.c
  projects/clangbsd/sys/dev/usb/net/if_cdce.c
  projects/clangbsd/sys/dev/usb/serial/uchcom.c
  projects/clangbsd/sys/dev/usb/storage/umass.c
  projects/clangbsd/sys/dev/usb/usbdevs
  projects/clangbsd/sys/dev/usb/wlan/if_rum.c
  projects/clangbsd/sys/dev/usb/wlan/if_uath.c
  projects/clangbsd/sys/dev/usb/wlan/if_upgt.c
  projects/clangbsd/sys/dev/usb/wlan/if_ural.c
  projects/clangbsd/sys/dev/usb/wlan/if_urtw.c
  projects/clangbsd/sys/dev/usb/wlan/if_urtwreg.h
  projects/clangbsd/sys/dev/usb/wlan/if_urtwvar.h
  projects/clangbsd/sys/dev/usb/wlan/if_zyd.c
  projects/clangbsd/sys/dev/xen/xenpci/   (props changed)
  projects/clangbsd/sys/fs/nfsclient/nfs_clport.c
  projects/clangbsd/sys/fs/nfsclient/nfs_clstate.c
  projects/clangbsd/sys/fs/nfsclient/nfs_clsubs.c
  projects/clangbsd/sys/geom/part/g_part_gpt.c
  projects/clangbsd/sys/i386/conf/NOTES
  projects/clangbsd/sys/i386/i386/intr_machdep.c
  projects/clangbsd/sys/i386/i386/nexus.c
  projects/clangbsd/sys/i386/i386/pmap.c
  projects/clangbsd/sys/i386/include/intr_machdep.h
  projects/clangbsd/sys/i386/xen/pmap.c
  projects/clangbsd/sys/ia64/ia64/pmap.c
  projects/clangbsd/sys/ia64/include/asm.h
  projects/clangbsd/sys/kern/bus_if.m
  projects/clangbsd/sys/kern/imgact_elf.c
  projects/clangbsd/sys/kern/init_main.c
  projects/clangbsd/sys/kern/kern_intr.c
  projects/clangbsd/sys/kern/sched_ule.c
  projects/clangbsd/sys/kern/stack_protector.c
  projects/clangbsd/sys/kern/subr_bus.c
  projects/clangbsd/sys/kern/sys_process.c
  projects/clangbsd/sys/kern/tty.c
  projects/clangbsd/sys/kern/tty_ttydisc.c
  projects/clangbsd/sys/mips/mips/pmap.c
  projects/clangbsd/sys/modules/Makefile
  projects/clangbsd/sys/modules/cam/Makefile
  projects/clangbsd/sys/modules/dpms/Makefile
  projects/clangbsd/sys/modules/usb/Makefile
  projects/clangbsd/sys/modules/usb/ucom/Makefile
  projects/clangbsd/sys/modules/vesa/Makefile
  projects/clangbsd/sys/modules/x86bios/Makefile
  projects/clangbsd/sys/net/flowtable.c
  projects/clangbsd/sys/net/if_gif.c
  projects/clangbsd/sys/net/pfil.c
  projects/clangbsd/sys/net/pfil.h
  projects/clangbsd/sys/net80211/ieee80211_hwmp.c
  projects/clangbsd/sys/net80211/ieee80211_mesh.c
  projects/clangbsd/sys/net80211/ieee80211_mesh.h
  projects/clangbsd/sys/net80211/ieee80211_output.c
  projects/clangbsd/sys/net80211/ieee80211_proto.h
  projects/clangbsd/sys/netinet/if_ether.c
  projects/clangbsd/sys/netinet/in.c
  projects/clangbsd/sys/netinet/ip_input.c
  projects/clangbsd/sys/nfsclient/nfs_vnops.c
  projects/clangbsd/sys/powerpc/aim/mmu_oea.c
  projects/clangbsd/sys/powerpc/aim/mmu_oea64.c
  projects/clangbsd/sys/powerpc/aim/mp_cpudep.c
  projects/clangbsd/sys/powerpc/aim/platform_chrp.c
  projects/clangbsd/sys/powerpc/booke/mp_cpudep.c
  projects/clangbsd/sys/powerpc/booke/pmap.c
  projects/clangbsd/sys/powerpc/include/pcpu.h
  projects/clangbsd/sys/powerpc/include/pmap.h
  projects/clangbsd/sys/powerpc/include/smp.h
  projects/clangbsd/sys/powerpc/include/spr.h
  projects/clangbsd/sys/powerpc/powerpc/cpu.c
  projects/clangbsd/sys/powerpc/powerpc/mmu_if.m
  projects/clangbsd/sys/powerpc/powerpc/mp_machdep.c
  projects/clangbsd/sys/powerpc/powerpc/pmap_dispatch.c
  projects/clangbsd/sys/powerpc/powerpc/uio_machdep.c
  projects/clangbsd/sys/sparc64/include/elf.h
  projects/clangbsd/sys/sparc64/sparc64/pmap.c
  projects/clangbsd/sys/sun4v/include/elf.h
  projects/clangbsd/sys/sun4v/sun4v/pmap.c
  projects/clangbsd/sys/sys/bus.h
  projects/clangbsd/sys/sys/interrupt.h
  projects/clangbsd/sys/sys/kernel.h
  projects/clangbsd/sys/sys/ttyqueue.h
  projects/clangbsd/sys/tools/fw_stub.awk
  projects/clangbsd/sys/tools/makeobjops.awk
  projects/clangbsd/sys/vm/pmap.h
  projects/clangbsd/sys/vm/swap_pager.c
  projects/clangbsd/sys/vm/vm_extern.h
  projects/clangbsd/sys/vm/vm_glue.c
  projects/clangbsd/tools/regression/fstest/tests/rename/21.t
  projects/clangbsd/tools/regression/lib/libutil/test-flopen.c
  projects/clangbsd/tools/tools/netrate/netsend/netsend.c
  projects/clangbsd/usr.bin/make/job.c
  projects/clangbsd/usr.bin/make/main.c
  projects/clangbsd/usr.bin/netstat/route.c
  projects/clangbsd/usr.bin/touch/touch.c
  projects/clangbsd/usr.sbin/acpi/iasl/Makefile
  projects/clangbsd/usr.sbin/jail/jail.8
  projects/clangbsd/usr.sbin/mfiutil/mfiutil.8   (props changed)
  projects/clangbsd/usr.sbin/sysinstall/tcpip.c
  projects/clangbsd/usr.sbin/tzsetup/tzsetup.8
  projects/clangbsd/usr.sbin/tzsetup/tzsetup.c

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/Makefile.inc1	Fri Oct 23 14:06:25 2009	(r198395)
@@ -931,6 +931,10 @@ _ar=		usr.bin/ar
 _mklocale=	usr.bin/mklocale
 .endif
 
+.if ${BOOTSTRAPPING} < 900002
+_sed=		usr.bin/sed
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -964,6 +968,7 @@ bootstrap-tools:
     usr.bin/makewhatis \
     ${_mklocale} \
     usr.bin/rpcgen \
+    ${_sed} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
@@ -1048,7 +1053,6 @@ cross-tools:
     ${_clang} \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
-    usr.bin/sed \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \

Modified: projects/clangbsd/bin/cat/Makefile
==============================================================================
--- projects/clangbsd/bin/cat/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/bin/cat/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	cat
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/bin/csh/iconv_stub.c
==============================================================================
--- projects/clangbsd/bin/csh/iconv_stub.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/bin/csh/iconv_stub.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -61,9 +61,20 @@ dl_iconv_open(const char *tocode, const 
 		if (iconvlib == NULL)
 			return (iconv_t)-1;
 		iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN);
+		if (iconv_open == NULL)
+			goto dlfunc_err;
 		dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE);
+		if (dl_iconv == NULL)
+			goto dlfunc_err;
 		dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib,
 		    ICONV_CLOSE);
+		if (dl_iconv_close == NULL)
+			goto dlfunc_err;
 	}
 	return iconv_open(tocode, fromcode);
+
+dlfunc_err:
+	dlclose(iconvlib);
+	iconvlib = NULL;
+	return (iconv_t)-1;
 }

Modified: projects/clangbsd/bin/sh/parser.c
==============================================================================
--- projects/clangbsd/bin/sh/parser.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/bin/sh/parser.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1308,11 +1308,16 @@ parsebackq: {
 	struct jmploc *const savehandler = handler;
 	int savelen;
 	int saveprompt;
+	const int bq_startlinno = plinno;
 
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
 		handler = savehandler;
+		if (exception == EXERROR) {
+			startlinno = bq_startlinno;
+			synerror("Error in command substitution");
+		}
 		longjmp(handler->loc, 1);
 	}
 	INTOFF;

Modified: projects/clangbsd/bin/uuidgen/Makefile
==============================================================================
--- projects/clangbsd/bin/uuidgen/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/bin/uuidgen/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	uuidgen
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/contrib/gcc/config/i386/i386.c
==============================================================================
--- projects/clangbsd/contrib/gcc/config/i386/i386.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/contrib/gcc/config/i386/i386.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1614,7 +1614,7 @@ override_options (void)
 	     "-mtune=generic instead as appropriate.");
 
   if (!ix86_arch_string)
-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
+    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
   if (!strcmp (ix86_arch_string, "generic"))
     error ("generic CPU can be used only for -mtune= switch");
   if (!strncmp (ix86_arch_string, "generic", 7))

Modified: projects/clangbsd/etc/defaults/rc.conf
==============================================================================
--- projects/clangbsd/etc/defaults/rc.conf	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/defaults/rc.conf	Fri Oct 23 14:06:25 2009	(r198395)
@@ -600,6 +600,7 @@ harvest_ethernet="YES"	# Entropy device 
 harvest_p_to_p="YES"	# Entropy device harvests point-to-point randomness
 dmesg_enable="YES"	# Save dmesg(8) to /var/run/dmesg.boot
 watchdogd_enable="NO"	# Start the software watchdog daemon
+watchdogd_flags=""	# Flags to watchdogd (if enabled)
 devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
 							    # devfs(8) rules.
 devfs_system_ruleset=""	# The name (NOT number) of a ruleset to apply to /dev

Modified: projects/clangbsd/etc/gettytab
==============================================================================
--- projects/clangbsd/etc/gettytab	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/gettytab	Fri Oct 23 14:06:25 2009	(r198395)
@@ -162,7 +162,7 @@ X|Xwindow|X window system:\
 	:fd@:nd@:cd@:rw:sp#9600:
 
 P|Pc|Pc console:\
-	:ht:np:sp#115200:
+	:ht:np:sp#9600:
 
 #
 # Wierdo special case for fast crt's with hardcopy devices

Modified: projects/clangbsd/etc/rc.d/faith
==============================================================================
--- projects/clangbsd/etc/rc.d/faith	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/rc.d/faith	Fri Oct 23 14:06:25 2009	(r198395)
@@ -3,7 +3,7 @@
 #
 
 # PROVIDE: faith
-# REQUIRE: netif routing
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/clangbsd/etc/rc.d/netoptions
==============================================================================
--- projects/clangbsd/etc/rc.d/netoptions	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/rc.d/netoptions	Fri Oct 23 14:06:25 2009	(r198395)
@@ -53,7 +53,7 @@ netoptions_inet()
 		${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null
 	else
 		netoptions_init
-		echo -n ' rfc1323 extensions=${tcp_extensions}'
+		echo -n " rfc1323 extensions=${tcp_extensions}"
 		${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null
 	fi
 
@@ -61,13 +61,13 @@ netoptions_inet()
 		${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null
 	else
 		netoptions_init
-		echo -n ' TCP keepalive=${tcp_keepalive}'
+		echo -n " TCP keepalive=${tcp_keepalive}"
 		${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null
 	fi
 
 	if checkyesno tcp_drop_synfin; then
 		netoptions_init
-		echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}'
+		echo -n " drop SYN+FIN packets=${tcp_drop_synfin}"
 		${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null
 	else
 		${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null

Modified: projects/clangbsd/etc/rc.d/stf
==============================================================================
--- projects/clangbsd/etc/rc.d/stf	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/rc.d/stf	Fri Oct 23 14:06:25 2009	(r198395)
@@ -3,7 +3,7 @@
 #
 
 # PROVIDE: stf
-# REQUIRE: netif routing
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/clangbsd/etc/rc.subr
==============================================================================
--- projects/clangbsd/etc/rc.subr	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/etc/rc.subr	Fri Oct 23 14:06:25 2009	(r198395)
@@ -593,7 +593,7 @@ run_rc_command()
 		rc_fast=yes
 		rc_quiet=yes
 		;;
-	force*)				# "force prefix; always run
+	force*)				# "force" prefix; always run
 		rc_force=yes
 		_rc_prefix=force
 		rc_arg=${rc_arg#${_rc_prefix}}
@@ -616,7 +616,7 @@ run_rc_command()
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:+${_override_command:-$command}}
+	command=${_override_command:-$command}
 
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=

Modified: projects/clangbsd/lib/libfetch/common.c
==============================================================================
--- projects/clangbsd/lib/libfetch/common.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/lib/libfetch/common.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -772,7 +772,7 @@ fetch_no_proxy_match(const char *host)
 				break;
 
 		d_len = q - p;
-		if (d_len > 0 && h_len > d_len &&
+		if (d_len > 0 && h_len >= d_len &&
 		    strncasecmp(host + h_len - d_len,
 			p, d_len) == 0) {
 			/* domain name matches */

Modified: projects/clangbsd/lib/libusb/libusb20_ugen20.c
==============================================================================
--- projects/clangbsd/lib/libusb/libusb20_ugen20.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/lib/libusb/libusb20_ugen20.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -800,7 +800,11 @@ ugen20_tr_submit(struct libusb20_transfe
 	if (xfer->flags & LIBUSB20_TRANSFER_DO_CLEAR_STALL) {
 		fsep->flags |= USB_FS_FLAG_CLEAR_STALL;
 	}
-	fsep->timeout = xfer->timeout;
+	/* NOTE: The "fsep->timeout" variable is 16-bit. */
+	if (xfer->timeout > 65535)
+		fsep->timeout = 65535;
+	else
+		fsep->timeout = xfer->timeout;
 
 	temp.ep_index = xfer->trIndex;
 

Modified: projects/clangbsd/release/doc/README
==============================================================================
--- projects/clangbsd/release/doc/README	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/doc/README	Fri Oct 23 14:06:25 2009	(r198395)
@@ -99,9 +99,10 @@ element will be included.  For example:
 
 	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are i386, sparc64, and
-ia64.  An element may appear for multiple architectures by specifying
-a comma-separated list of architectures (i.e. arch="sparc64,ia64").
+The currently-supported architectures are amd64, arm, i386, ia64,
+pc98, powerpc, and sparc64.  An element may appear for multiple
+architectures by specifying a comma-separated list of architectures
+(i.e. arch="sparc64,ia64").
 
 When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory

Modified: projects/clangbsd/release/doc/en_US.ISO8859-1/errata/article.sgml
==============================================================================
--- projects/clangbsd/release/doc/en_US.ISO8859-1/errata/article.sgml	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/doc/en_US.ISO8859-1/errata/article.sgml	Fri Oct 23 14:06:25 2009	(r198395)
@@ -16,7 +16,6 @@
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
 
 <article>

Modified: projects/clangbsd/release/doc/share/mk/doc.relnotes.mk
==============================================================================
--- projects/clangbsd/release/doc/share/mk/doc.relnotes.mk	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/doc/share/mk/doc.relnotes.mk	Fri Oct 23 14:06:25 2009	(r198395)
@@ -11,23 +11,6 @@ DSLHTML?=	${RELN_ROOT}/share/sgml/defaul
 DSLPRINT?=	${RELN_ROOT}/share/sgml/default.dsl
 
 #
-# Tweakable Makefile variables
-#
-# INCLUDE_HISTORIC	Used by relnotes document only.  When set,
-#			causes all release notes entries to be printed,
-#			even those marked as "historic".  If not set
-#			(the default), only print "non-historic"
-#			release note entries.  To designate a release
-#			note entry as "historic", add a role="historic"
-#			attribute to the applicable element(s).
-#
-.if defined(INCLUDE_HISTORIC)
-JADEFLAGS+=	-iinclude.historic
-.else
-JADEFLAGS+=	-ino.include.historic
-.endif
-
-#
 # Automatic device list generation:
 #
 .if exists(${RELN_ROOT}/../man4)

Modified: projects/clangbsd/release/doc/share/sgml/release.dsl
==============================================================================
--- projects/clangbsd/release/doc/share/sgml/release.dsl	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/doc/share/sgml/release.dsl	Fri Oct 23 14:06:25 2009	(r198395)
@@ -3,8 +3,6 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
 <!ENTITY % output.print 	"IGNORE">
-<!ENTITY % include.historic	"IGNORE">
-<!ENTITY % no.include.historic	"IGNORE">
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
 <!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release.ent;
@@ -14,14 +12,6 @@
   <style-specification use="docbook">
     <style-specification-body>
 
-; Configure behavior of this stylesheet
-<![ %include.historic; [
-      (define %include-historic% #t)
-]]>
-<![ %no.include.historic; [
-      (define %include-historic% #f)
-]]>
-
 ; String manipulation functions
 (define (split-string-to-list STR)
   ;; return list of STR separated with char #\ or #\,
@@ -54,36 +44,6 @@
      ((equal? STR (car s)) #t)
      (else (loop (cdr s))))))
 
-; Deal with conditional inclusion of text via entities.
-(default
-  (let* ((role (attribute-string (normalize "role")))
-	 (for-arch (entity-text "arch")))
-    (cond
-
-     ;; If role=historic, and we're not printing historic things, then
-     ;; don't output this element.
-     ((and (equal? role "historic")
-          (not %include-historic%))
-      (empty-sosofo))
-
-     ;; None of the above
-     (else (next-match)))))
-
-(mode qandatoc
-  (default
-    (let* ((role (attribute-string (normalize "role")))
-	   (for-arch (entity-text "arch")))
-      (cond
-
-       ;; If role=historic, and we're not printing historic things, then
-       ;; don't output this element.
-       ((and (equal? role "historic")
-	     (not %include-historic%))
-	(empty-sosofo))
-
-       ;; None of the above
-       (else (next-match))))))
-
 ; We might have some sect1 level elements where the modification times
 ; are significant.  An example of this is the "What's New" section in
 ; the release notes.  We enable the printing of pubdate entry in
@@ -198,7 +158,6 @@
                  (u (string-append "&release.man.url;?query="
                          (data r) "&" "sektion=" (data m))))
             (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" ))
               (("xorg")    (string-append u "&" "manpath=Xorg+&release.manpath.xorg;" ))
               (("netbsd")  (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;"))
               (("ports")   (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;"))

Modified: projects/clangbsd/release/doc/share/sgml/release.ent
==============================================================================
--- projects/clangbsd/release/doc/share/sgml/release.ent	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/doc/share/sgml/release.ent	Fri Oct 23 14:06:25 2009	(r198395)
@@ -6,23 +6,23 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "8.0-CURRENT">
+<!ENTITY release.current "9.0-CURRENT">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
-<!ENTITY release.prev "7.0-RELEASE">
+<!ENTITY release.prev "8.0-RELEASE">
 
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "7.0-RELEASE">
+<!ENTITY release.prev.stable "8.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "8.0-RELEASE">
+<!ENTITY release.next "9.0-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "8-CURRENT">
+<!ENTITY release.branch "9-CURRENT">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
@@ -36,11 +36,10 @@
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xfree86       "4.5.0">
-<!ENTITY release.manpath.xorg          "7.2">
-<!ENTITY release.manpath.netbsd        "3.0">
+<!ENTITY release.manpath.xorg          "7.4">
+<!ENTITY release.manpath.netbsd        "5.0.1">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "8-current">
+<!ENTITY release.manpath.freebsd       "9-current">
 
 <!-- Text constants which probably don't need to be changed.-->
 

Modified: projects/clangbsd/release/scripts/package-split.py
==============================================================================
--- projects/clangbsd/release/scripts/package-split.py	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/release/scripts/package-split.py	Fri Oct 23 14:06:25 2009	(r198395)
@@ -51,50 +51,53 @@ def disc1_packages():
 	    'misc/freebsd-doc-zh_tw']
 
     if doing_dvd:
-	pkgs.extend(['lang/perl5.8',
-	    'x11/xorg',
-	    'devel/imake',
-	    'emulators/linux_base-fc4',
-	    'x11/gnome2',
-	    'x11/kde4',
-	    'x11-wm/afterstep',
-	    'x11-wm/windowmaker',
-	    'x11-wm/fvwm2',
-	    'archivers/unzip',
+	pkgs.extend(['archivers/unzip',
 	    'astro/xearth',
 	    'devel/gmake',
+	    'devel/imake',
 	    'editors/emacs',
 	    'editors/vim-lite',
+	    'emulators/linux_base-f10',
 	    'emulators/mtools',
 	    'graphics/png',
 	    'graphics/xv',
 	    'irc/xchat',
+	    'lang/perl5.8',
+	    'mail/alpine',
 	    'mail/exim',
 	    'mail/fetchmail',
 	    'mail/mutt',
-	    'mail/alpine',
 	    'mail/popd',
-	    'mail/xfmail',
 	    'mail/postfix',
+	    'mail/xfmail',
 	    'net/cvsup-without-gui',
 	    'net/rsync',
 	    'net/samba3',
 	    'news/slrn',
 	    'news/tin',
+	    'ports-mgmt/p5-FreeBSD-Portindex',
+	    'ports-mgmt/portaudit',
+	    'ports-mgmt/portmaster',
 	    'ports-mgmt/portupgrade',
 	    'print/a2ps-letter',
 	    'print/apsfilter',
 	    'print/ghostscript7-nox11',
-	    'print/gv',
 	    'print/psutils-letter',
+	    'print/gv',
 	    'shells/bash',
 	    'shells/pdksh',
 	    'shells/zsh',
 	    'security/sudo',
+	    'sysutils/screen',
 	    'www/links',
 	    'www/lynx',
+	    'x11/gnome2',
+	    'x11/kde4',
 	    'x11/rxvt',
-	    'ports-mgmt/portaudit'])
+	    'x11/xorg',
+	    'x11-wm/afterstep',
+	    'x11-wm/fvwm2',
+	    'x11-wm/windowmaker'])
     return pkgs
 
 # The list of desired packages

Modified: projects/clangbsd/sbin/Makefile.inc
==============================================================================
--- projects/clangbsd/sbin/Makefile.inc	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/Makefile.inc	Fri Oct 23 14:06:25 2009	(r198395)
@@ -4,7 +4,7 @@
 .include <bsd.own.mk>
 
 BINDIR?=	/sbin
-WARNS?=	2
+WARNS?=	6
 
 .if ${MK_DYNAMICROOT} == "no"
 NO_SHARED?=	YES

Modified: projects/clangbsd/sbin/adjkerntz/Makefile
==============================================================================
--- projects/clangbsd/sbin/adjkerntz/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/adjkerntz/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -2,5 +2,6 @@
 
 PROG=   adjkerntz
 MAN=	adjkerntz.8
+WARNS?=	2
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/atacontrol/Makefile
==============================================================================
--- projects/clangbsd/sbin/atacontrol/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/atacontrol/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -2,6 +2,5 @@
 
 PROG=	atacontrol
 MAN=	atacontrol.8
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/atm/atmconfig/Makefile
==============================================================================
--- projects/clangbsd/sbin/atm/atmconfig/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/atm/atmconfig/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -29,8 +29,6 @@ CLEANFILES+= oid.h
 
 .if ${MACHINE_ARCH} == "arm"
 WARNS?= 3
-.else
-WARNS?=	6
 .endif
 
 FILES=	atmconfig.help atmconfig_device.help

Modified: projects/clangbsd/sbin/badsect/Makefile
==============================================================================
--- projects/clangbsd/sbin/badsect/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/badsect/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -5,5 +5,6 @@ PROG=	badsect
 DPADD=	${LIBUFS}
 LDADD=	-lufs
 MAN=	badsect.8
+WARNS?=	2
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/bsdlabel/Makefile
==============================================================================
--- projects/clangbsd/sbin/bsdlabel/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/bsdlabel/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -13,6 +13,7 @@ LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disk
 MLINKS=	bsdlabel.8 disklabel.8
 .endif
 
+WARNS?=	2
 DPADD=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
 LDADD=	-lgeom -lbsdxml -lsbuf
 

Modified: projects/clangbsd/sbin/camcontrol/Makefile
==============================================================================
--- projects/clangbsd/sbin/camcontrol/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/camcontrol/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -9,8 +9,6 @@ CFLAGS+= -DMINIMALISTIC
 .endif
 .if ${MACHINE_ARCH} == "arm"
 WARNS?= 3
-.else
-WARNS?=	6
 .endif
 DPADD=	${LIBCAM} ${LIBSBUF} ${LIBUTIL}
 LDADD=	-lcam -lsbuf -lutil

Modified: projects/clangbsd/sbin/ccdconfig/Makefile
==============================================================================
--- projects/clangbsd/sbin/ccdconfig/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/ccdconfig/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	ccdconfig
-WARNS?=	6
 MAN=	ccdconfig.8
 
 DPADD=	${LIBGEOM}

Modified: projects/clangbsd/sbin/clri/Makefile
==============================================================================
--- projects/clangbsd/sbin/clri/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/clri/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -3,5 +3,6 @@
 
 PROG=	clri
 MAN=	clri.8
+WARNS?=	2
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/comcontrol/Makefile
==============================================================================
--- projects/clangbsd/sbin/comcontrol/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/comcontrol/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -3,6 +3,5 @@
 
 PROG=	comcontrol
 MAN=	comcontrol.8
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/conscontrol/Makefile
==============================================================================
--- projects/clangbsd/sbin/conscontrol/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/conscontrol/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -2,5 +2,6 @@
 
 PROG=	conscontrol
 MAN=	conscontrol.8
+WARNS?=	2
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/dhclient/Makefile
==============================================================================
--- projects/clangbsd/sbin/dhclient/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dhclient/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -40,4 +40,6 @@ SCRIPTS=dhclient-script
 MAN=	dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp-options.5 \
 	dhclient-script.8
 
+WARNS?=	2
+
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/dhclient/bpf.c
==============================================================================
--- projects/clangbsd/sbin/dhclient/bpf.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dhclient/bpf.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -90,11 +90,23 @@ if_register_bpf(struct interface_info *i
 void
 if_register_send(struct interface_info *info)
 {
+	int sock, on = 1;
+
 	/*
 	 * If we're using the bpf API for sending and receiving, we
 	 * don't need to register this interface twice.
 	 */
 	info->wfdesc = info->rfdesc;
+
+	/*
+	 * Use raw socket for unicast send.
+	 */
+	if ((sock = socket(AF_INET, SOCK_RAW, IPPROTO_UDP)) == -1)
+		error("socket(SOCK_RAW): %m");
+	if (setsockopt(sock, IPPROTO_IP, IP_HDRINCL, &on,
+	    sizeof(on)) == -1)
+		error("setsockopt(IP_HDRINCL): %m");
+	info->ufdesc = sock;
 }
 
 /*
@@ -244,35 +256,32 @@ send_packet(struct interface_info *inter
 {
 	unsigned char buf[256];
 	struct iovec iov[2];
+	struct msghdr msg;
 	int result, bufp = 0;
-	int sock;
-
-	if (to->sin_addr.s_addr != INADDR_BROADCAST) {
-		note("SENDING DIRECT");
-		/* We know who the server is, send the packet via
-		   normal socket interface */
-
-		if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) >= 0) {
-			result = sendto (sock, (char *)raw, len, 0,
-					 (struct sockaddr *)to, sizeof *to);
-			close(sock);
-			if (result > 0)
-				return result;
-			}
-		}
 
 	/* Assemble the headers... */
-	assemble_hw_header(interface, buf, &bufp, hto);
+	if (to->sin_addr.s_addr == INADDR_BROADCAST)
+		assemble_hw_header(interface, buf, &bufp, hto);
 	assemble_udp_ip_header(buf, &bufp, from.s_addr,
 	    to->sin_addr.s_addr, to->sin_port, (unsigned char *)raw, len);
 
-	/* Fire it off */
 	iov[0].iov_base = (char *)buf;
 	iov[0].iov_len = bufp;
 	iov[1].iov_base = (char *)raw;
 	iov[1].iov_len = len;
 
-	result = writev(interface->wfdesc, iov, 2);
+	/* Fire it off */
+	if (to->sin_addr.s_addr == INADDR_BROADCAST)
+		result = writev(interface->wfdesc, iov, 2);
+	else {
+		memset(&msg, 0, sizeof(msg));
+		msg.msg_name = (struct sockaddr *)to;
+		msg.msg_namelen = sizeof(*to);
+		msg.msg_iov = iov;
+		msg.msg_iovlen = 2;
+		result = sendmsg(interface->ufdesc, &msg, 0);
+	}
+
 	if (result < 0)
 		warning("send_packet: %m");
 	return (result);

Modified: projects/clangbsd/sbin/dhclient/dhcpd.h
==============================================================================
--- projects/clangbsd/sbin/dhclient/dhcpd.h	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dhclient/dhcpd.h	Fri Oct 23 14:06:25 2009	(r198395)
@@ -37,6 +37,8 @@
  * Enterprises.  To learn more about the Internet Software Consortium,
  * see ``http://www.vix.com/isc''.  To learn more about Vixie
  * Enterprises, see ``http://www.vix.com''.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
@@ -194,6 +196,7 @@ struct interface_info {
 	char			 name[IFNAMSIZ];
 	int			 rfdesc;
 	int			 wfdesc;
+	int			 ufdesc;
 	unsigned char		*rbuf;
 	size_t			 rbuf_max;
 	size_t			 rbuf_offset;

Modified: projects/clangbsd/sbin/dhclient/packet.c
==============================================================================
--- projects/clangbsd/sbin/dhclient/packet.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dhclient/packet.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -135,6 +135,17 @@ assemble_udp_ip_header(unsigned char *bu
 	ip.ip_dst.s_addr = to;
 
 	ip.ip_sum = wrapsum(checksum((unsigned char *)&ip, sizeof(ip), 0));
+
+	/*
+	 * While the BPF -- used for broadcasts -- expects a "true" IP header
+	 * with all the bytes in network byte order, the raw socket interface
+	 * which is used for unicasts expects the ip_len field to be in host
+	 * byte order.  In both cases, the checksum has to be correct, so this
+	 * is as good a place as any to turn the bytes around again.
+	 */
+	if (to != INADDR_BROADCAST)
+		ip.ip_len = ntohs(ip.ip_len);
+
 	memcpy(&buf[*bufix], &ip, sizeof(ip));
 	*bufix += sizeof(ip);
 

Modified: projects/clangbsd/sbin/dmesg/Makefile
==============================================================================
--- projects/clangbsd/sbin/dmesg/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dmesg/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -4,8 +4,6 @@
 PROG=	dmesg
 MAN=	dmesg.8
 
-WARNS?=	6
-
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
 

Modified: projects/clangbsd/sbin/dump/Makefile
==============================================================================
--- projects/clangbsd/sbin/dump/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dump/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -19,5 +19,6 @@ CFLAGS+=-DRDUMP
 SRCS=	itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c
 MAN=	dump.8
 MLINKS=	dump.8 rdump.8
+WARNS?=	2
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/dumpfs/Makefile
==============================================================================
--- projects/clangbsd/sbin/dumpfs/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dumpfs/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dumpfs
+WARNS?=	2
 DPADD=	${LIBUFS}
 LDADD=	-lufs
 MAN=	dumpfs.8

Modified: projects/clangbsd/sbin/dumpfs/dumpfs.c
==============================================================================
--- projects/clangbsd/sbin/dumpfs/dumpfs.c	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dumpfs/dumpfs.c	Fri Oct 23 14:06:25 2009	(r198395)
@@ -413,7 +413,7 @@ marshal(const char *name)
 		break;
 	}
 	/* -p..r unimplemented */
-	printf("-s %jd ", (intmax_t)fs->fs_size);
+	printf("-s %jd ", (intmax_t)fsbtodb(fs, fs->fs_size));
 	printf("%s ", disk.d_name);
 	printf("\n");
 

Modified: projects/clangbsd/sbin/dumpon/Makefile
==============================================================================
--- projects/clangbsd/sbin/dumpon/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/dumpon/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	dumpon
-WARNS?=	6
 MAN=	dumpon.8
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/sbin/geom/Makefile
==============================================================================
--- projects/clangbsd/sbin/geom/Makefile	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/geom/Makefile	Fri Oct 23 14:06:25 2009	(r198395)
@@ -11,6 +11,7 @@ PROG=	geom
 SRCS=	geom.c geom_label.c geom_part.c subr.c
 NO_MAN=
 
+WARNS?=	2
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
 
 DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}

Modified: projects/clangbsd/sbin/geom/Makefile.inc
==============================================================================
--- projects/clangbsd/sbin/geom/Makefile.inc	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/geom/Makefile.inc	Fri Oct 23 14:06:25 2009	(r198395)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-WARNS?=	6
 CLASS_DIR?=/lib/geom
 
 .include "../Makefile.inc"

Modified: projects/clangbsd/sbin/geom/class/part/gpart.8
==============================================================================
--- projects/clangbsd/sbin/geom/class/part/gpart.8	Fri Oct 23 13:39:30 2009	(r198394)
+++ projects/clangbsd/sbin/geom/class/part/gpart.8	Fri Oct 23 14:06:25 2009	(r198395)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Nov 18, 2008
+.Dd November 18, 2008
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -43,20 +43,34 @@ lines in your kernel configuration file:
 .Cd "options GEOM_PART_VTOC8"
 .Ed
 .Pp
-The GEOM_PART_APM option adds support for the Apple Partition Map (APM)
+The
+.Dv GEOM_PART_APM
+option adds support for the Apple Partition Map (APM)
 found on Apple Macintosh computers.
-The GEOM_PART_BSD option adds support for the traditional BSD disklabel.
-The GEOM_PART_GPT option adds support for the GUID Partition Table (GPT)
+The
+.Dv GEOM_PART_BSD
+option adds support for the traditional
+.Bx
+disklabel.
+The
+.Dv GEOM_PART_GPT
+option adds support for the GUID Partition Table (GPT)
 found on Intel Itanium computers and Intel-based Macintosh computers.
-The GEOM_PART_MBR option adds support for the Master Boot Record (MBR)
+The
+.Dv GEOM_PART_MBR
+option adds support for the Master Boot Record (MBR)
 found on PCs and used on many removable media.
-The GEOM_PART_PC98 option adds support for the MBR variant as used on
+The
+.Dv GEOM_PART_PC98
+option adds support for the MBR variant as used on
 NEC PC-98 computers.
-The GEOM_PART_VTOC8 option adds support for Sun's SMI VTOC8 label as
+The
+.Dv GEOM_PART_VTOC8
+option adds support for Sun's SMI VTOC8 label as
 found on UltraSPARC-based computers.
 .Pp
 Usage of the
-.Xr gpart 8
+.Ns Nm
 utility:
 .Pp
 .\" ==== ADD ====
@@ -123,7 +137,7 @@ utility:
 .Ar geom
 .\" ==== UNSET ====
 .Nm
-.Cm unset 
+.Cm unset
 .Fl a Ar attrib
 .Fl i Ar index
 .Op Fl f Ar flags
@@ -134,7 +148,7 @@ The
 .Nm
 utility is used to partition GEOM providers, normally disks.
 The first argument of which is the action to be taken:
-.Bl -tag -width ".Cm wwwwwww"
+.Bl -tag -width ".Cm bootcode"
 .\" ==== ADD ====
 .It Cm add
 Add a new partition to the partitioning scheme given by
@@ -148,13 +162,15 @@ option.
 The type of the partition is given by the
 .Fl t Ar type
 option.
-Partition types are discussed in the section entitled "Partition Types".
+Partition types are discussed below in the section entitled
+.Sx "PARTITION TYPES" .
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl i Ar index
 The index in the partition table at which the new partition is to be
-placed. The index determines the name of the device special file used
+placed.
+The index determines the name of the device special file used
 to represent the partition.
 .It Fl l Ar label
 The label attached to the partition.
@@ -162,7 +178,9 @@ This option is only valid when used on p
 partition labels.
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== BOOTCODE ====
@@ -185,7 +203,7 @@ The
 option specifies a file that contains the bootstrap code.
 The contents and size of the file are determined by the partitioning
 scheme.
-For the MBR scheme, it's a 512 byte file of which the first 446 bytes
+For the MBR scheme, it is a 512 byte file of which the first 446 bytes
 are installed as bootstrap code.
 The
 .Fl p Ar partcode
@@ -196,11 +214,13 @@ The partition is specified by the
 option.
 The size of the file must be smaller than the size of the partition.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== COMMIT ====
@@ -229,8 +249,8 @@ option determines the scheme to use.
 The kernel needs to have support for a particular scheme before
 that scheme can be used to partition a disk.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl n Ar entries
 The number of entries in the partition table.
 Every partitioning scheme has a minimum and a maximum number of entries
@@ -242,7 +262,9 @@ By default, partition tables are created
 entries.
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== DELETE ====
@@ -254,11 +276,13 @@ and further identified by the
 option.
 The partition cannot be actively used by the kernel.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== DESTROY ====
@@ -266,11 +290,13 @@ about its use.
 Destroy the partitioning scheme as implemented by geom
 .Ar geom .
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== MODIFY ====
@@ -290,22 +316,26 @@ option.
 Not all partitioning schemes support labels and it is invalid to
 try to change a partition label in such cases.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== SET ====
 .It Cm set
 Set the named attribute on the partition entry.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El
 .\" ==== SHOW ====
@@ -314,7 +344,8 @@ Show the current partition information o
 or all geoms if none are specified.
 .\" ==== UNDO ====
 .It Cm undo
-Revert any pending changes.
+Revert any pending changes for geom
+.Ar geom .
 This action is the opposite of the
 .Cm commit
 action and can be used to undo any changes that have not been committed.
@@ -322,11 +353,13 @@ action and can be used to undo any chang
 .It Cm unset
 Clear the named attribute on the partition entry.
 .Pp
-Addition options include:
-.Bl -tag -width ".Fl w Ar wwwwwww"
+Additional options include:
+.Bl -tag -width 10n
 .It Fl f Ar flags
 Additional operational flags.
-See the section entitled "Operational flags" below for a discussion
+See the section entitled
+.Sx "OPERATIONAL FLAGS"
+below for a discussion
 about its use.
 .El

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list