From owner-svn-src-user@FreeBSD.ORG  Tue Dec 16 09:15:49 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FCF01065672;
	Tue, 16 Dec 2008 09:15:49 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A94D8FC1F;
	Tue, 16 Dec 2008 09:15:49 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBG9Fnlq032106;
	Tue, 16 Dec 2008 09:15:49 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBG9FmGS032076;
	Tue, 16 Dec 2008 09:15:48 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <200812160915.mBG9FmGS032076@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 16 Dec 2008 09:15:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186173 - in user/mlaier/pf44head: .
	contrib/binutils/bfd contrib/binutils/gas/config
	contrib/binutils/ld/emulparams contrib/bsnmp/snmp_mibII
	contrib/ipfilter/ipsend contrib/openpam etc...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Dec 2008 09:15:49 -0000

Author: mlaier
Date: Tue Dec 16 09:15:47 2008
New Revision: 186173
URL: http://svn.freebsd.org/changeset/base/186173

Log:
  merge recent head changes: arp-v2, vimage switch

Added:
  user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
     - copied unchanged from r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/as/mips-freebsd/
     - copied from r186172, head/gnu/usr.bin/binutils/as/mips-freebsd/
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips
  user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips
  user/mlaier/pf44head/lib/libc/include/isc/platform.h
     - copied unchanged from r186172, head/lib/libc/include/isc/platform.h
  user/mlaier/pf44head/share/man/man9/VOP_VPTOCNP.9
     - copied unchanged from r186172, head/share/man/man9/VOP_VPTOCNP.9
  user/mlaier/pf44head/sys/kern/kern_vimage.c
     - copied unchanged from r186172, head/sys/kern/kern_vimage.c
  user/mlaier/pf44head/sys/net/if_llatbl.c
     - copied unchanged from r186172, head/sys/net/if_llatbl.c
  user/mlaier/pf44head/sys/net/if_llatbl.h
     - copied unchanged from r186172, head/sys/net/if_llatbl.h
Deleted:
  user/mlaier/pf44head/sys/modules/ath_rate_amrr/
  user/mlaier/pf44head/sys/modules/ath_rate_onoe/
  user/mlaier/pf44head/sys/modules/ath_rate_sample/
  user/mlaier/pf44head/sys/sparc64/include/ofw_bus.h
  user/mlaier/pf44head/sys/sparc64/sparc64/ofw_bus.c
  user/mlaier/pf44head/sys/sun4v/include/ofw_bus.h
Modified:
  user/mlaier/pf44head/   (props changed)
  user/mlaier/pf44head/UPDATING
  user/mlaier/pf44head/contrib/binutils/bfd/config.bfd
  user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c
  user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c
  user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c
  user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c
  user/mlaier/pf44head/contrib/openpam/   (props changed)
  user/mlaier/pf44head/etc/regdomain.xml
  user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile
  user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h
  user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local
  user/mlaier/pf44head/include/arpa/nameser.h
  user/mlaier/pf44head/include/resolv.h
  user/mlaier/pf44head/lib/libc/include/isc/eventlib.h   (contents, props changed)
  user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c
  user/mlaier/pf44head/lib/libc/net/rcmd.3
  user/mlaier/pf44head/lib/libc/resolv/res_debug.c
  user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c
  user/mlaier/pf44head/lib/libc/resolv/res_query.c
  user/mlaier/pf44head/lib/libc/resolv/res_send.c
  user/mlaier/pf44head/lib/libc/stdio/vfprintf.c
  user/mlaier/pf44head/lib/libc/stdio/vfwprintf.c
  user/mlaier/pf44head/lib/libfetch/fetch.3
  user/mlaier/pf44head/lib/libfetch/fetch.h
  user/mlaier/pf44head/lib/libfetch/http.c
  user/mlaier/pf44head/lib/libstand/if_ether.h
  user/mlaier/pf44head/libexec/bootpd/rtmsg.c
  user/mlaier/pf44head/release/picobsd/tinyware/ns/ns.c
  user/mlaier/pf44head/sbin/atacontrol/atacontrol.8
  user/mlaier/pf44head/sbin/devd/devd.cc
  user/mlaier/pf44head/sbin/devd/devd.conf.5
  user/mlaier/pf44head/sbin/geom/misc/subr.c
  user/mlaier/pf44head/sbin/ifconfig/ifieee80211.c
  user/mlaier/pf44head/sbin/ifconfig/regdomain.c
  user/mlaier/pf44head/sbin/ifconfig/regdomain.h
  user/mlaier/pf44head/sbin/newfs/newfs.c
  user/mlaier/pf44head/sbin/route/route.c
  user/mlaier/pf44head/sbin/routed/table.c
  user/mlaier/pf44head/share/man/man4/Makefile
  user/mlaier/pf44head/share/man/man4/acpi_aiboost.4
  user/mlaier/pf44head/share/man/man4/cxgb.4
  user/mlaier/pf44head/share/man/man4/ddb.4
  user/mlaier/pf44head/share/man/man4/fxp.4
  user/mlaier/pf44head/share/man/man4/route.4
  user/mlaier/pf44head/share/man/man9/Makefile
  user/mlaier/pf44head/share/man/man9/ifnet.9
  user/mlaier/pf44head/share/man/man9/rtalloc.9
  user/mlaier/pf44head/share/man/man9/rtentry.9
  user/mlaier/pf44head/sys/amd64/amd64/exception.S
  user/mlaier/pf44head/sys/amd64/amd64/genassym.c
  user/mlaier/pf44head/sys/amd64/amd64/identcpu.c
  user/mlaier/pf44head/sys/amd64/amd64/local_apic.c
  user/mlaier/pf44head/sys/amd64/include/apicreg.h
  user/mlaier/pf44head/sys/amd64/include/apicvar.h
  user/mlaier/pf44head/sys/amd64/include/specialreg.h
  user/mlaier/pf44head/sys/boot/Makefile
  user/mlaier/pf44head/sys/boot/zfs/zfs.c
  user/mlaier/pf44head/sys/compat/freebsd32/freebsd32_signal.h
  user/mlaier/pf44head/sys/compat/linprocfs/linprocfs.c
  user/mlaier/pf44head/sys/conf/NOTES
  user/mlaier/pf44head/sys/conf/files
  user/mlaier/pf44head/sys/conf/files.sparc64
  user/mlaier/pf44head/sys/conf/files.sun4v
  user/mlaier/pf44head/sys/conf/options
  user/mlaier/pf44head/sys/contrib/pf/net/pf.c
  user/mlaier/pf44head/sys/contrib/pf/net/pf_if.c
  user/mlaier/pf44head/sys/contrib/pf/net/pf_subr.c
  user/mlaier/pf44head/sys/contrib/rdma/rdma_addr.c
  user/mlaier/pf44head/sys/dev/acpica/acpi_smbat.c
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_eeprom_v14.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_eeprom_v3.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_internal.h   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5212/ar5111.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5312/ar5312.h   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/bce/if_bce.c
  user/mlaier/pf44head/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
  user/mlaier/pf44head/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
  user/mlaier/pf44head/sys/dev/hwpmc/hwpmc_logging.c
  user/mlaier/pf44head/sys/dev/hwpmc/hwpmc_mod.c
  user/mlaier/pf44head/sys/dev/isp/isp.c
  user/mlaier/pf44head/sys/dev/mfi/mfi.c
  user/mlaier/pf44head/sys/dev/mfi/mfi_pci.c
  user/mlaier/pf44head/sys/dev/ofw/ofw_bus_subr.c
  user/mlaier/pf44head/sys/dev/ofw/ofw_bus_subr.h
  user/mlaier/pf44head/sys/dev/ofw/openfirm.h
  user/mlaier/pf44head/sys/dev/pccbb/pccbb_pci.c
  user/mlaier/pf44head/sys/dev/re/if_re.c
  user/mlaier/pf44head/sys/dev/snp/snp.c
  user/mlaier/pf44head/sys/dev/sound/pci/hda/hdac.c
  user/mlaier/pf44head/sys/dev/usb/ucom.c
  user/mlaier/pf44head/sys/dev/usb/ucomvar.h
  user/mlaier/pf44head/sys/dev/usb/uftdi.c
  user/mlaier/pf44head/sys/dev/usb/usbdevs
  user/mlaier/pf44head/sys/dev/usb2/bluetooth/ng_ubt2.c
  user/mlaier/pf44head/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/at91dci.c
  user/mlaier/pf44head/sys/dev/usb2/controller/at91dci_atmelarm.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ehci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ehci2_pci.c
  user/mlaier/pf44head/sys/dev/usb2/controller/musb2_otg.c
  user/mlaier/pf44head/sys/dev/usb2/controller/musb2_otg_atmelarm.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ohci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/uhci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/usb2_controller.c
  user/mlaier/pf44head/sys/dev/usb2/controller/uss820dci.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_busdma.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_busdma.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_compat_linux.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_compat_linux.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_config_td.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_config_td.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_core.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_debug.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dev.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dev.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_device.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_device.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dynamic.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dynamic.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_error.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_generic.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_handle_request.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hid.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hub.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hub.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_lookup.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_mbuf.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_msctest.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_msctest.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_parse.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_process.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_process.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_request.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_request.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_sw_transfer.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_sw_transfer.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_transfer.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_transfer.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_util.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_aue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_axe2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_cdce2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_cue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_kue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_rue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_udav2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/usb2_ethernet.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/usb2_ethernet.h
  user/mlaier/pf44head/sys/dev/usb2/image/uscanner2.c
  user/mlaier/pf44head/sys/dev/usb2/include/usb2_devid.h
  user/mlaier/pf44head/sys/dev/usb2/include/usb2_devtable.h
  user/mlaier/pf44head/sys/dev/usb2/input/uhid2.c
  user/mlaier/pf44head/sys/dev/usb2/input/ukbd2.c
  user/mlaier/pf44head/sys/dev/usb2/input/ums2.c
  user/mlaier/pf44head/sys/dev/usb2/misc/udbp2.c
  user/mlaier/pf44head/sys/dev/usb2/misc/ufm2.c
  user/mlaier/pf44head/sys/dev/usb2/quirk/usb2_quirk.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uark2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ubsa2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ubser2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uchcom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ucycom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ufoma2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uftdi2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ugensa2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uipaq2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ulpt2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umct2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umodem2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umoscom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uplcom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/usb2_serial.c
  user/mlaier/pf44head/sys/dev/usb2/serial/usb2_serial.h
  user/mlaier/pf44head/sys/dev/usb2/serial/uvisor2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uvscom2.c
  user/mlaier/pf44head/sys/dev/usb2/sound/uaudio2.c
  user/mlaier/pf44head/sys/dev/usb2/sound/uaudio2.h
  user/mlaier/pf44head/sys/dev/usb2/storage/ata-usb2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/umass2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/urio2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/ustorage2_fs.c
  user/mlaier/pf44head/sys/dev/usb2/template/usb2_template.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_rum2.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_ural2.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_zyd2.c
  user/mlaier/pf44head/sys/dev/vr/if_vr.c
  user/mlaier/pf44head/sys/fs/deadfs/dead_vnops.c
  user/mlaier/pf44head/sys/fs/devfs/devfs_vnops.c
  user/mlaier/pf44head/sys/fs/procfs/procfs_map.c
  user/mlaier/pf44head/sys/i386/i386/exception.s
  user/mlaier/pf44head/sys/i386/i386/genassym.c
  user/mlaier/pf44head/sys/i386/i386/identcpu.c
  user/mlaier/pf44head/sys/i386/i386/local_apic.c
  user/mlaier/pf44head/sys/i386/include/apicreg.h
  user/mlaier/pf44head/sys/i386/include/apicvar.h
  user/mlaier/pf44head/sys/i386/include/specialreg.h
  user/mlaier/pf44head/sys/kern/kern_cpu.c
  user/mlaier/pf44head/sys/kern/kern_jail.c
  user/mlaier/pf44head/sys/kern/kern_linker.c
  user/mlaier/pf44head/sys/kern/kern_mbuf.c
  user/mlaier/pf44head/sys/kern/kern_poll.c
  user/mlaier/pf44head/sys/kern/kern_proc.c
  user/mlaier/pf44head/sys/kern/kern_prot.c
  user/mlaier/pf44head/sys/kern/kern_sysctl.c
  user/mlaier/pf44head/sys/kern/subr_prf.c
  user/mlaier/pf44head/sys/kern/subr_trap.c
  user/mlaier/pf44head/sys/kern/tty.c
  user/mlaier/pf44head/sys/kern/tty_pts.c
  user/mlaier/pf44head/sys/kern/uipc_socket.c
  user/mlaier/pf44head/sys/kern/vfs_cache.c
  user/mlaier/pf44head/sys/kern/vfs_default.c
  user/mlaier/pf44head/sys/kern/vnode_if.src
  user/mlaier/pf44head/sys/mips/adm5120/adm5120_machdep.c
  user/mlaier/pf44head/sys/modules/Makefile
  user/mlaier/pf44head/sys/modules/ath/Makefile
  user/mlaier/pf44head/sys/modules/cxgb/Makefile
  user/mlaier/pf44head/sys/net/if.c
  user/mlaier/pf44head/sys/net/if_arcsubr.c
  user/mlaier/pf44head/sys/net/if_atmsubr.c
  user/mlaier/pf44head/sys/net/if_bridge.c
  user/mlaier/pf44head/sys/net/if_ethersubr.c
  user/mlaier/pf44head/sys/net/if_fddisubr.c
  user/mlaier/pf44head/sys/net/if_fwsubr.c
  user/mlaier/pf44head/sys/net/if_gif.c
  user/mlaier/pf44head/sys/net/if_gif.h
  user/mlaier/pf44head/sys/net/if_iso88025subr.c
  user/mlaier/pf44head/sys/net/if_tun.c
  user/mlaier/pf44head/sys/net/if_var.h
  user/mlaier/pf44head/sys/net/pfil.h
  user/mlaier/pf44head/sys/net/radix.c
  user/mlaier/pf44head/sys/net/radix_mpath.c
  user/mlaier/pf44head/sys/net/raw_cb.h
  user/mlaier/pf44head/sys/net/route.c
  user/mlaier/pf44head/sys/net/route.h
  user/mlaier/pf44head/sys/net/rtsock.c
  user/mlaier/pf44head/sys/net/vnet.h
  user/mlaier/pf44head/sys/net80211/_ieee80211.h
  user/mlaier/pf44head/sys/net80211/ieee80211.c
  user/mlaier/pf44head/sys/net80211/ieee80211_crypto.h
  user/mlaier/pf44head/sys/net80211/ieee80211_ddb.c
  user/mlaier/pf44head/sys/net80211/ieee80211_dfs.h
  user/mlaier/pf44head/sys/net80211/ieee80211_hostap.c
  user/mlaier/pf44head/sys/net80211/ieee80211_input.c
  user/mlaier/pf44head/sys/net80211/ieee80211_ioctl.c
  user/mlaier/pf44head/sys/net80211/ieee80211_node.c
  user/mlaier/pf44head/sys/net80211/ieee80211_node.h
  user/mlaier/pf44head/sys/net80211/ieee80211_output.c
  user/mlaier/pf44head/sys/net80211/ieee80211_regdomain.c
  user/mlaier/pf44head/sys/net80211/ieee80211_scan_sta.c
  user/mlaier/pf44head/sys/net80211/ieee80211_var.h
  user/mlaier/pf44head/sys/netgraph/netflow/netflow.c
  user/mlaier/pf44head/sys/netgraph/netgraph.h
  user/mlaier/pf44head/sys/netgraph/ng_base.c
  user/mlaier/pf44head/sys/netgraph/ng_bridge.c
  user/mlaier/pf44head/sys/netgraph/ng_eiface.c
  user/mlaier/pf44head/sys/netgraph/ng_iface.c
  user/mlaier/pf44head/sys/netgraph/ng_ipfw.c
  user/mlaier/pf44head/sys/netgraph/ng_tty.c
  user/mlaier/pf44head/sys/netinet/icmp6.h
  user/mlaier/pf44head/sys/netinet/icmp_var.h
  user/mlaier/pf44head/sys/netinet/if_atm.c
  user/mlaier/pf44head/sys/netinet/if_ether.c
  user/mlaier/pf44head/sys/netinet/if_ether.h
  user/mlaier/pf44head/sys/netinet/in.c
  user/mlaier/pf44head/sys/netinet/in_mcast.c
  user/mlaier/pf44head/sys/netinet/in_pcb.c
  user/mlaier/pf44head/sys/netinet/in_pcb.h
  user/mlaier/pf44head/sys/netinet/in_proto.c
  user/mlaier/pf44head/sys/netinet/in_rmx.c
  user/mlaier/pf44head/sys/netinet/in_var.h
  user/mlaier/pf44head/sys/netinet/ip_carp.c
  user/mlaier/pf44head/sys/netinet/ip_divert.c
  user/mlaier/pf44head/sys/netinet/ip_dummynet.c
  user/mlaier/pf44head/sys/netinet/ip_fastfwd.c
  user/mlaier/pf44head/sys/netinet/ip_fw.h
  user/mlaier/pf44head/sys/netinet/ip_fw2.c
  user/mlaier/pf44head/sys/netinet/ip_fw_nat.c
  user/mlaier/pf44head/sys/netinet/ip_fw_pfil.c
  user/mlaier/pf44head/sys/netinet/ip_input.c
  user/mlaier/pf44head/sys/netinet/ip_output.c
  user/mlaier/pf44head/sys/netinet/ip_var.h
  user/mlaier/pf44head/sys/netinet/libalias/alias_db.c
  user/mlaier/pf44head/sys/netinet/raw_ip.c
  user/mlaier/pf44head/sys/netinet/sctp_os_bsd.h
  user/mlaier/pf44head/sys/netinet/sctp_pcb.c
  user/mlaier/pf44head/sys/netinet/tcp_sack.c
  user/mlaier/pf44head/sys/netinet/tcp_subr.c
  user/mlaier/pf44head/sys/netinet/tcp_syncache.c
  user/mlaier/pf44head/sys/netinet/tcp_usrreq.c
  user/mlaier/pf44head/sys/netinet/tcp_var.h
  user/mlaier/pf44head/sys/netinet/udp_usrreq.c
  user/mlaier/pf44head/sys/netinet/udp_var.h
  user/mlaier/pf44head/sys/netinet/vinet.h
  user/mlaier/pf44head/sys/netinet6/icmp6.c
  user/mlaier/pf44head/sys/netinet6/in6.c
  user/mlaier/pf44head/sys/netinet6/in6_ifattach.c
  user/mlaier/pf44head/sys/netinet6/in6_pcb.c
  user/mlaier/pf44head/sys/netinet6/in6_proto.c
  user/mlaier/pf44head/sys/netinet6/in6_rmx.c
  user/mlaier/pf44head/sys/netinet6/in6_src.c
  user/mlaier/pf44head/sys/netinet6/in6_var.h
  user/mlaier/pf44head/sys/netinet6/ip6_input.c
  user/mlaier/pf44head/sys/netinet6/ip6_output.c
  user/mlaier/pf44head/sys/netinet6/ip6_var.h
  user/mlaier/pf44head/sys/netinet6/nd6.c
  user/mlaier/pf44head/sys/netinet6/nd6.h
  user/mlaier/pf44head/sys/netinet6/nd6_nbr.c
  user/mlaier/pf44head/sys/netinet6/nd6_rtr.c
  user/mlaier/pf44head/sys/netinet6/raw_ip6.c
  user/mlaier/pf44head/sys/netinet6/raw_ip6.h
  user/mlaier/pf44head/sys/netinet6/tcp6_var.h
  user/mlaier/pf44head/sys/netinet6/udp6_usrreq.c
  user/mlaier/pf44head/sys/netinet6/vinet6.h
  user/mlaier/pf44head/sys/netipsec/ipip_var.h
  user/mlaier/pf44head/sys/netipsec/ipsec.c
  user/mlaier/pf44head/sys/netipsec/key.c
  user/mlaier/pf44head/sys/netipsec/vipsec.h
  user/mlaier/pf44head/sys/netipx/ipx_usrreq.c
  user/mlaier/pf44head/sys/nfsserver/nfs_serv.c
  user/mlaier/pf44head/sys/pci/if_rl.c
  user/mlaier/pf44head/sys/pci/if_rlreg.h
  user/mlaier/pf44head/sys/powerpc/include/param.h
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_pcib_pci.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_pcibus.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_syscons.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_syscons.h
  user/mlaier/pf44head/sys/powerpc/powermac/cuda.c
  user/mlaier/pf44head/sys/powerpc/powermac/cudavar.h
  user/mlaier/pf44head/sys/powerpc/powermac/grackle.c
  user/mlaier/pf44head/sys/powerpc/powermac/gracklevar.h
  user/mlaier/pf44head/sys/powerpc/powermac/macio.c
  user/mlaier/pf44head/sys/powerpc/powermac/uninorth.c
  user/mlaier/pf44head/sys/powerpc/powermac/uninorthvar.h
  user/mlaier/pf44head/sys/sparc64/ebus/ebus.c
  user/mlaier/pf44head/sys/sparc64/isa/ofw_isa.c
  user/mlaier/pf44head/sys/sparc64/pci/apb.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pci.h
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcib.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcib_subr.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcibus.c
  user/mlaier/pf44head/sys/sparc64/pci/psycho.c
  user/mlaier/pf44head/sys/sparc64/pci/schizo.c
  user/mlaier/pf44head/sys/sparc64/sbus/sbus.c
  user/mlaier/pf44head/sys/sparc64/sparc64/ofw_machdep.c
  user/mlaier/pf44head/sys/sys/kernel.h
  user/mlaier/pf44head/sys/sys/param.h
  user/mlaier/pf44head/sys/sys/pmc.h
  user/mlaier/pf44head/sys/sys/resource.h
  user/mlaier/pf44head/sys/sys/sysctl.h
  user/mlaier/pf44head/sys/sys/ttyhook.h
  user/mlaier/pf44head/sys/sys/vimage.h
  user/mlaier/pf44head/sys/sys/vnode.h
  user/mlaier/pf44head/sys/sys/vtoc.h
  user/mlaier/pf44head/usr.bin/cpuset/cpuset.1
  user/mlaier/pf44head/usr.bin/fetch/fetch.1
  user/mlaier/pf44head/usr.bin/fetch/fetch.c
  user/mlaier/pf44head/usr.bin/netstat/route.c
  user/mlaier/pf44head/usr.bin/tar/util.c
  user/mlaier/pf44head/usr.sbin/arp/arp.c
  user/mlaier/pf44head/usr.sbin/fwcontrol/fwcontrol.c
  user/mlaier/pf44head/usr.sbin/fwcontrol/fwmpegts.c
  user/mlaier/pf44head/usr.sbin/jexec/jexec.c
  user/mlaier/pf44head/usr.sbin/jls/jls.c
  user/mlaier/pf44head/usr.sbin/ndp/ndp.c
  user/mlaier/pf44head/usr.sbin/ppp/route.c
  user/mlaier/pf44head/usr.sbin/route6d/route6d.c
  user/mlaier/pf44head/usr.sbin/sysinstall/cdrom.c
  user/mlaier/pf44head/usr.sbin/sysinstall/config.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dispatch.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dist.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dist.h
  user/mlaier/pf44head/usr.sbin/sysinstall/install.c
  user/mlaier/pf44head/usr.sbin/sysinstall/label.c
  user/mlaier/pf44head/usr.sbin/sysinstall/main.c
  user/mlaier/pf44head/usr.sbin/sysinstall/menus.c
  user/mlaier/pf44head/usr.sbin/sysinstall/sysinstall.8
  user/mlaier/pf44head/usr.sbin/sysinstall/sysinstall.h
  user/mlaier/pf44head/usr.sbin/sysinstall/system.c

Modified: user/mlaier/pf44head/UPDATING
==============================================================================
--- user/mlaier/pf44head/UPDATING	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/UPDATING	Tue Dec 16 09:15:47 2008	(r186173)
@@ -22,6 +22,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081214:
+	__FreeBSD_version 800059 incorporates the new arp-v2 rewrite.
+	RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated.
+	The new code reduced struct rtentry{} by 16 bytes on 32-bit 
+	architecture and 40 bytes on 64-bit architecture. The userland
+	applications "arp" and "ndp" have been updated accordingly.
+	The output from "netstat -r" shows only routing entries and
+	none of the L2 information.
+
 20081130:
 	__FreeBSD_version 800057 marks the switchover from the
 	binary ath hal to source code. Users must add the line:

Modified: user/mlaier/pf44head/contrib/binutils/bfd/config.bfd
==============================================================================
--- user/mlaier/pf44head/contrib/binutils/bfd/config.bfd	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/binutils/bfd/config.bfd	Tue Dec 16 09:15:47 2008	(r186173)
@@ -768,6 +768,10 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
     ;;
+  mips*-*-freebsd*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
   mips*-*-netbsd*)
     targ_defvec=bfd_elf32_bigmips_vec
     targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"

Modified: user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c
==============================================================================
--- user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -281,6 +281,9 @@ static int mips_32bitmode = 0;
 
 #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI)
 
+/* True if relocations are stored in-place.  */
+#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI)
+
 /* We can only have 64bit addresses if the object file format
    supports it.  */
 #define HAVE_32BIT_ADDRESSES                           \
@@ -13020,6 +13023,26 @@ mips_fix_adjustable (fixS *fixp)
   if (fixp->fx_addsy == NULL)
     return 1;
 
+  /* If symbol SYM is in a mergeable section, relocations of the form
+     SYM + 0 can usually be made section-relative.  The mergeable data
+     is then identified by the section offset rather than by the symbol.
+
+     However, if we're generating REL LO16 relocations, the offset is split
+     between the LO16 and parterning high part relocation.  The linker will
+     need to recalculate the complete offset in order to correctly identify
+     the merge data.
+
+     The linker has traditionally not looked for the parterning high part
+     relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be
+     placed anywhere.  Rather than break backwards compatibility by changing
+     this, it seems better not to force the issue, and instead keep the
+     original symbol.  This will work with either linker behavior.  */
+  if ((fixp->fx_r_type == BFD_RELOC_LO16
+       || reloc_needs_lo_p (fixp->fx_r_type))
+      && HAVE_IN_PLACE_ADDENDS
+      && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
+    return 0;
+
 #ifdef OBJ_ELF
   if (OUTPUT_FLAVOR == bfd_target_elf_flavour
       && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16

Copied: user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh (from r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh)
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf32bmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Modified: user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -48,8 +48,7 @@ static void *route_fd;
 /* if-index allocator */
 static uint32_t next_if_index = 1;
 
-/* re-fetch arp table */
-static int update_arp;
+/* currently fetching the arp table */
 static int in_update_arp;
 
 /* OR registrations */
@@ -911,36 +910,6 @@ mib_find_ifa(struct in_addr addr)
 }
 
 /*
- * Process a new ARP entry
- */
-static void
-process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl,
-    const struct sockaddr_in *sa)
-{
-	struct mibif *ifp;
-	struct mibarp *at;
-
-	/* IP arp table entry */
-	if (sdl->sdl_alen == 0) {
-		update_arp = 1;
-		return;
-	}
-	if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL)
-		return;
-	/* have a valid entry */
-	if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL &&
-	    (at = mib_arp_create(ifp, sa->sin_addr,
-	    sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL)
-		return;
-
-	if (rtm->rtm_rmx.rmx_expire == 0)
-		at->flags |= MIBARP_PERM;
-	else
-		at->flags &= ~MIBARP_PERM;
-	at->flags |= MIBARP_FOUND;
-}
-
-/*
  * Handle a routing socket message.
  */
 static void
@@ -1080,46 +1049,12 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		}
 		break;
 #endif
-
 	  case RTM_GET:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_ADD:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_DELETE:
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO))
+
+		if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
 			mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
 			    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
 		break;
@@ -1289,7 +1224,8 @@ update_ifa_info(void)
 
 /*
  * Update arp table
- */
+ *
+*/
 void
 mib_arp_update(void)
 {
@@ -1305,11 +1241,11 @@ mib_arp_update(void)
 	TAILQ_FOREACH(at, &mibarp_list, link)
 		at->flags &= ~MIBARP_FOUND;
 
-	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) {
+	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) {
 		in_update_arp = 0;
 		return;
 	}
-
+	
 	next = buf;
 	while (next < buf + needed) {
 		rtm = (struct rt_msghdr *)(void *)next;
@@ -1326,7 +1262,6 @@ mib_arp_update(void)
 		at = at1;
 	}
 	mibarpticks = get_ticks();
-	update_arp = 0;
 	in_update_arp = 0;
 }
 
@@ -1634,8 +1569,8 @@ mibII_idle(void)
 		mib_arp_update();
 		mib_iflist_bad = 0;
 	}
-	if (update_arp)
-		mib_arp_update();
+
+	mib_arp_update();
 }
 
 

Modified: user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c
==============================================================================
--- user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -186,8 +186,7 @@ mib_sroute_process(struct rt_msghdr *rtm
 	memcpy(r->index, key.index, sizeof(r->index));
 	r->ifindex = (ifp == NULL) ? 0 : ifp->index;
 
-	r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 :
-	    (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
+	r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
 
 	/* cannot really know, what protocol it runs */
 	r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 :

Modified: user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c
==============================================================================
--- user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -88,7 +88,12 @@ char	*addr, *eaddr;
 	mib[2] = 0;
 	mib[3] = AF_INET;
 	mib[4] = NET_RT_FLAGS;
+#ifdef RTF_LLINFO
 	mib[5] = RTF_LLINFO;
+#else
+	mib[5] = 0;
+#endif	
+
 	if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1)
 	    {
 		perror("route-sysctl-estimate");

Modified: user/mlaier/pf44head/etc/regdomain.xml
==============================================================================
--- user/mlaier/pf44head/etc/regdomain.xml	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/etc/regdomain.xml	Tue Dec 16 09:15:47 2008	(r186173)
@@ -39,7 +39,7 @@
 -->
 <rd id="debug">
   <name>DEBUG</name>
-  <sku>0</sku>
+  <sku>0x1ff</sku>
 </rd>
 
 <rd id="fcc">
@@ -1080,6 +1080,75 @@
     </band>
   </netband>
 </rd>
+
+<rd id="sr9">
+  <name>SR9</name>
+  <sku>0x0298</sku>
+  <defcc ref="SR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="xr9">
+  <name>XR9</name>
+  <sku>0x299</sku>
+  <defcc ref="XR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S2_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="gz901">
+  <name>GZ901</name>
+  <sku>0x29a</sku>
+  <defcc ref="GZ901"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_908_923_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
 </regulatory-domains>
 
 <country-codes>
@@ -1201,6 +1270,9 @@
 <country id="GT">
   <isocc>320</isocc> <name>Guatemala</name> <rd ref="none"/>
 </country>
+<country id="GZ901">
+  <isocc>5002</isocc> <name>ZComax GZ-901</name> <rd ref="gz901"/>
+</country>
 <country id="HN">
   <isocc>340</isocc> <name>Honduras</name> <rd ref="none"/>
 </country>
@@ -1396,6 +1468,12 @@
 <country id="TR">
   <isocc>792</isocc> <name>Turkey</name> <rd ref="etsi"/>
 </country>
+<country id="SR9">
+  <isocc>5000</isocc> <name>Ubiquiti SR9</name> <rd ref="sr9"/>
+</country>
+<country id="XR9">
+  <isocc>5001</isocc> <name>Ubiquiti XR9</name> <rd ref="xr9"/>
+</country>
 <country id="UA">
   <isocc>804</isocc> <name>Ukraine</name> <rd ref="none"/>
 </country>
@@ -1426,6 +1504,10 @@
 <country id="ZW">
   <isocc>716</isocc> <name>Zimbabwe</name> <rd ref="none"/>
 </country>
+
+<country id="DEBUG">
+  <isocc>0</isocc> <name>Debug</name> <rd ref="debug"/>
+</country>
 </country-codes>
 
 <!--
@@ -1575,6 +1657,61 @@
   <freqstart>2512</freqstart> <freqend>2732</freqend>
   <chanwidth>20</chanwidth> <chansep>5</chansep>
 </freqband>
+
+<freqband id="S1_907_922_5">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_907_922_10">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_912_917">
+  <freqstart>2427</freqstart> <freqend>2432</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S2_907_922_5">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S2_907_922_10">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S2_912_917">
+  <freqstart>2432</freqstart> <freqend>2437</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S1_908_923_5">
+  <freqstart>2447</freqstart> <freqend>2467</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_913_918_10">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_913_918">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
 </shared-frequency-bands>
 
 </regulatory-data>

Modified: user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile	Tue Dec 16 09:15:47 2008	(r186173)
@@ -20,6 +20,10 @@ SRCS+=	app.c as.c atof-generic.c atof-ie
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
 
+.if ${TARGET_ARCH} == "mips"
+SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
+.endif
+
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
 .elif ${TARGET_ARCH} == "powerpc"

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+#xxxIMPxxx: size?
+#xxxIMPxxx: TARGET_BIG_ENDIAN is lame.  We should use the netbsd convention
+# of mipsel and mips.
+_sz?=32
+.if defined(TARGET_BIG_ENDIAN)
+NATIVE_EMULATION=elf${_sz}btsmip_fbsd
+.else
+NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
+.endif
+
+SRCS+=	e${NATIVE_EMULATION}.c 
+CLEANFILES+=	e${NATIVE_EMULATION}.c
+
+# nb: elf32 handles both elf32 and elf64 targets
+e${NATIVE_EMULATION}.c:	${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
+	    ${TOOLS_PREFIX}/usr \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
+	    ${.CURDIR}/${NATIVE_EMULATION}.sh
+

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips)
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+#xxxIMPxxx: endian and size
+DEFAULT_VECTOR=	bfd_elf32_tradbigmips_vec
+
+SRCS+=	coff-mips.c \
+	cpu-mips.c \
+	ecoff.c \
+	ecofflink.c \
+	elf32.c \
+	elf64.c \
+	elfn32-mips.c \
+	elf32-mips.c \
+	elf64-mips.c \
+	elfxx-mips.c \
+	elf32-target.h \
+	elf64-target.h \
+	elflink.c
+
+VECS=	bfd_elf32_tradbigmips_vec \
+	bfd_elf32_tradlittlemips_vec \
+	bfd_elf32_ntradbigmips_vec \
+	bfd_elf32_ntradlittlemips_vec \
+	bfd_elf64_tradbigmips_vec \
+	bfd_elf64_tradlittlemips_vec \
+	ecoff_little_vec \
+	ecoff_big_vec

Modified: user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -57,7 +57,7 @@ extern "C" {
 #define BFD_ARCH_SIZE 64
 
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__)
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SRCS+=	mips-dis.c mips-opc.c mips16-opc.c
+CFLAGS+= -DARCH_mips

Modified: user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local	Tue Dec 16 09:15:47 2008	(r186173)
@@ -69,6 +69,8 @@
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-6.3    6.3
+.ds doc-operating-system-FreeBSD-6.4    6.4
+.ds doc-operating-system-FreeBSD-7.1    7.1
 .ds doc-operating-system-FreeBSD-8.0    8.0
 .
 .ec

Modified: user/mlaier/pf44head/include/arpa/nameser.h
==============================================================================
--- user/mlaier/pf44head/include/arpa/nameser.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/include/arpa/nameser.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -424,9 +424,10 @@ typedef enum __ns_cert_types {
 #define NS_NXT_MAX 127
 
 /*%
- * EDNS0 extended flags, host order.
+ * EDNS0 extended flags and option codes, host order.
  */
 #define NS_OPT_DNSSEC_OK	0x8000U
+#define NS_OPT_NSID             3
 
 /*%
  * Inline versions of get/put short/long.  Pointer is advanced.

Modified: user/mlaier/pf44head/include/resolv.h
==============================================================================
--- user/mlaier/pf44head/include/resolv.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/include/resolv.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -50,7 +50,7 @@
 
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $
+ *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -245,6 +245,7 @@ union res_sockaddr_union {
 #define	RES_NOCHECKNAME	0x00008000	/*%< do not check names for sanity. */
 #define	RES_KEEPTSIG	0x00010000	/*%< do not strip TSIG records */
 #define	RES_BLAST	0x00020000	/*%< blast all recursive servers */
+#define RES_NSID	0x00040000      /*%< request name server ID */
 #define RES_NOTLDQUERY	0x00100000	/*%< don't unqualified name as a tld */
 #define RES_USE_DNSSEC	0x00200000	/*%< use DNSSEC using OK bit in OPT */
 /* #define RES_DEBUG2	0x00400000 */	/* nslookup internal */
@@ -386,6 +387,7 @@ extern const struct res_sym __p_rcode_sy
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
 #define res_nopt		__res_nopt
+#define res_nopt_rdata       	__res_nopt_rdata
 #define res_ndestroy		__res_ndestroy
 #define	res_nametoclass		__res_nametoclass
 #define	res_nametotype		__res_nametotype
@@ -474,6 +476,8 @@ int		res_findzonecut2(res_state, const c
 				 union res_sockaddr_union *, int);
 void		res_nclose(res_state);
 int		res_nopt(res_state, int, u_char *, int, int);
+int		res_nopt_rdata(res_state, int, u_char *, int, u_char *,
+			       u_short, u_short, u_char *);
 void		res_send_setqhook(res_send_qhook);
 void		res_send_setrhook(res_send_rhook);
 int		__res_vinit(res_state, int);

Modified: user/mlaier/pf44head/lib/libc/include/isc/eventlib.h
==============================================================================
--- user/mlaier/pf44head/lib/libc/include/isc/eventlib.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/include/isc/eventlib.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -18,7 +18,7 @@
 /* eventlib.h - exported interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib.h,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $
+ * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
  */
 
 #ifndef _EVENTLIB_H
@@ -29,6 +29,8 @@
 #include <sys/time.h>
 #include <stdio.h>
 
+#include <isc/platform.h>
+
 #ifndef __P
 # define __EVENTLIB_P_DEFINED
 # ifdef __STDC__

Copied: user/mlaier/pf44head/lib/libc/include/isc/platform.h (from r186172, head/lib/libc/include/isc/platform.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/lib/libc/include/isc/platform.h	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/lib/libc/include/isc/platform.h)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or 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.
+ *
+ * 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.
+ */
+
+/* $Id: platform.h.in,v 1.2.6.2 2008/01/23 02:15:02 tbox Exp $ */
+/* $FreeBSD$ */
+
+/*! \file */
+
+#ifndef ISC_PLATFORM_H
+#define ISC_PLATFORM_H
+
+/*
+ * Define if the OS does not define struct timespec.
+ */
+#undef ISC_PLATFORM_NEEDTIMESPEC
+#ifdef ISC_PLATFORM_NEEDTIMESPEC
+#include <time.h>               /* For time_t */
+struct timespec {
+	time_t  tv_sec;         /* seconds */
+	long    tv_nsec;        /* nanoseconds */
+};
+#endif
+
+#endif

Modified: user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -135,11 +135,11 @@ inet_net_pton_ipv4(const char *src, u_ch
 			assert(n >= 0 && n <= 9);
 			bits *= 10;
 			bits += n;
+			if (bits > 32)
+				goto enoent;
 		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
 		if (ch != '\0')
 			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
 	}
 
 	/* Firey death and destruction unless we prefetched EOS. */

Modified: user/mlaier/pf44head/lib/libc/net/rcmd.3
==============================================================================
--- user/mlaier/pf44head/lib/libc/net/rcmd.3	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/net/rcmd.3	Tue Dec 16 09:15:47 2008	(r186173)
@@ -238,6 +238,13 @@ For
 .Fn rcmd_af ,
 .Dv PF_UNSPEC
 is also allowed.
+.Sh ENVIRONMENT
+.Bl -tag -width RSH
+.It Ev RSH
+When using the
+.Fn rcmd
+function, this variable is used as the program to run instead of
+.Xr rsh 1 .
 .Sh DIAGNOSTICS
 The
 .Fn rcmd

Modified: user/mlaier/pf44head/lib/libc/resolv/res_debug.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_debug.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_debug.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -91,7 +91,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $";
+static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.6 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -187,10 +187,56 @@ do_section(const res_state statp,
 				p_type(ns_rr_type(rr)),
 				p_class(ns_rr_class(rr)));
 		else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
+			u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr);
 			u_int32_t ttl = ns_rr_ttl(rr);
+
 			fprintf(file,
 				"; EDNS: version: %u, udp=%u, flags=%04x\n",
 				(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
+
+			while (rdatalen >= 4) {
+				const u_char *cp = ns_rr_rdata(rr);
+				int i;
+
+				GETSHORT(optcode, cp);
+				GETSHORT(optlen, cp);
+
+				if (optcode == NS_OPT_NSID) {
+					fputs("; NSID: ", file);
+					if (optlen == 0) {
+						fputs("; NSID\n", file);
+					} else {
+						fputs("; NSID: ", file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%02x ",
+								cp[i]);
+						fputs(" (",file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%c",
+								isprint(cp[i])?
+								cp[i] : '.');
+						fputs(")\n", file);
+					}
+				} else {
+					if (optlen == 0) {
+						fprintf(file, "; OPT=%u\n",
+							optcode);
+					} else {
+						fprintf(file, "; OPT=%u: ",
+							optcode);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%02x ",
+								cp[i]);
+						fputs(" (",file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%c",
+								isprint(cp[i]) ?
+									cp[i] : '.');
+						fputs(")\n", file);
+					}
+				}
+				rdatalen -= 4 + optlen;
+			}
 		} else {
 			n = ns_sprintrr(handle, &rr, NULL, NULL,
 					buf, buflen);
@@ -202,7 +248,7 @@ do_section(const res_state statp,
 						buf = malloc(buflen += 1024);
 					if (buf == NULL) {
 						fprintf(file,
-				              ";; memory allocation failure\n");
+					      ";; memory allocation failure\n");
 					      return;
 					}
 					continue;
@@ -379,7 +425,7 @@ static const struct res_sym __p_default_
 	{ns_s_an,	"ANSWER",	(char *)0},
 	{ns_s_ns,	"AUTHORITY",	(char *)0},
 	{ns_s_ar,	"ADDITIONAL",	(char *)0},
-	{0,             (char *)0,	(char *)0}
+	{0,		(char *)0,	(char *)0}
 };
 
 static const struct res_sym __p_update_section_syms[] = {
@@ -387,7 +433,7 @@ static const struct res_sym __p_update_s
 	{S_PREREQ,	"PREREQUISITE",	(char *)0},
 	{S_UPDATE,	"UPDATE",	(char *)0},
 	{S_ADDT,	"ADDITIONAL",	(char *)0},
-	{0,             (char *)0,	(char *)0}
+	{0,		(char *)0,	(char *)0}
 };
 
 const struct res_sym __p_key_syms[] = {
@@ -615,6 +661,7 @@ p_option(u_long option) {
 	case RES_USE_INET6:	return "inet6";
 #ifdef RES_USE_EDNS0	/*%< KAME extension */
 	case RES_USE_EDNS0:	return "edns0";
+	case RES_NSID:		return "nsid";
 #endif
 #ifdef RES_USE_DNAME
 	case RES_USE_DNAME:	return "dname";

Modified: user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -201,9 +201,6 @@ res_nmkquery(res_state statp,
 
 #ifdef RES_USE_EDNS0
 /* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-#ifndef T_OPT
-#define T_OPT	41
-#endif
 
 int
 res_nopt(res_state statp,
@@ -228,15 +225,16 @@ res_nopt(res_state statp,
 	if ((ep - cp) < 1 + RRFIXEDSZ)
 		return (-1);
 
-	*cp++ = 0;	/*%< "." */
-	ns_put16(T_OPT, cp);	/*%< TYPE */
+	*cp++ = 0;				/*%< "." */
+	ns_put16(ns_t_opt, cp);			/*%< TYPE */
 	cp += INT16SZ;
 	if (anslen > 0xffff)
 		anslen = 0xffff;		/* limit to 16bit value */
-	ns_put16(anslen & 0xffff, cp);	/*%< CLASS = UDP payload size */
+	ns_put16(anslen & 0xffff, cp);		/*%< CLASS = UDP payload size */
 	cp += INT16SZ;
-	*cp++ = NOERROR;	/*%< extended RCODE */
-	*cp++ = 0;		/*%< EDNS version */
+	*cp++ = NOERROR;			/*%< extended RCODE */
+	*cp++ = 0;				/*%< EDNS version */
+
 	if (statp->options & RES_USE_DNSSEC) {
 #ifdef DEBUG
 		if (statp->options & RES_DEBUG)
@@ -246,12 +244,60 @@ res_nopt(res_state statp,
 	}
 	ns_put16(flags, cp);
 	cp += INT16SZ;
-	ns_put16(0, cp);	/*%< RDLEN */
+
+	ns_put16(0U, cp);			/*%< RDLEN */
 	cp += INT16SZ;
+
 	hp->arcount = htons(ntohs(hp->arcount) + 1);
 
 	return (cp - buf);
 }
+
+/*
+ * Construct variable data (RDATA) block for OPT psuedo-RR, append it
+ * to the buffer, then update the RDLEN field (previously set to zero by
+ * res_nopt()) with the new RDATA length.
+ */
+int
+res_nopt_rdata(res_state statp,
+	  int n0,	 	/*%< current offset in buffer */
+	  u_char *buf,	 	/*%< buffer to put query */
+	  int buflen,		/*%< size of buffer */
+	  u_char *rdata,	/*%< ptr to start of opt rdata */
+	  u_short code,		/*%< OPTION-CODE */
+	  u_short len,		/*%< OPTION-LENGTH */
+	  u_char *data)		/*%< OPTION_DATA */
+{
+	register u_char *cp, *ep;
+
+#ifdef DEBUG
+	if ((statp->options & RES_DEBUG) != 0U)
+		printf(";; res_nopt_rdata()\n");
+#endif
+
+	cp = buf + n0;
+	ep = buf + buflen;
+
+	if ((ep - cp) < (4 + len))
+		return (-1);
+
+	if (rdata < (buf + 2) || rdata >= ep)
+		return (-1);
+
+	ns_put16(code, cp);
+	cp += INT16SZ;
+
+	ns_put16(len, cp);
+	cp += INT16SZ;
+
+	memcpy(cp, data, len);
+	cp += len;
+
+	len = cp - rdata;
+	ns_put16(len, rdata - 2);	/* Update RDLEN field */
+
+	return (cp - buf);
+}
 #endif
 
 /*! \file */

Modified: user/mlaier/pf44head/lib/libc/resolv/res_query.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_query.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_query.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.7.18.1 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_query.c,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -115,8 +115,9 @@ res_nquery(res_state statp,
 {
 	u_char buf[MAXPACKET];
 	HEADER *hp = (HEADER *) answer;
-	int n;
 	u_int oflags;
+	u_char *rdata;
+	int n;
 
 	oflags = statp->_flags;
 
@@ -131,8 +132,14 @@ again:
 			 buf, sizeof(buf));
 #ifdef RES_USE_EDNS0
 	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U)
+	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC|RES_NSID))) {
 		n = res_nopt(statp, n, buf, sizeof(buf), anslen);
+		rdata = &buf[n];
+		if (n > 0 && (statp->options & RES_NSID) != 0U) {
+			n = res_nopt_rdata(statp, n, buf, sizeof(buf), rdata,
+					   NS_OPT_NSID, 0, NULL);
+		}
+	}
 #endif
 	if (n <= 0) {
 #ifdef DEBUG
@@ -142,6 +149,7 @@ again:
 		RES_SET_H_ERRNO(statp, NO_RECOVERY);
 		return (n);
 	}
+
 	n = res_nsend(statp, buf, n, answer, anslen);
 	if (n < 0) {
 #ifdef RES_USE_EDNS0

Modified: user/mlaier/pf44head/lib/libc/resolv/res_send.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_send.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_send.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.9.18.8 2006/10/16 23:00:58 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.9.18.10 2008/01/27 02:06:26 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -302,7 +302,7 @@ int
 res_nsend(res_state statp,
 	  const u_char *buf, int buflen, u_char *ans, int anssiz)
 {
-	int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
+	int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
 #ifdef USE_KQUEUE
 	int kq;
 #endif
@@ -420,7 +420,7 @@ res_nsend(res_state statp,
 	/*
 	 * Send request, RETRY times, or until successful.
 	 */
-	for (try = 0; try < statp->retry; try++) {
+	for (tries = 0; tries < statp->retry; tries++) {
 	    for (ns = 0; ns < statp->nscount; ns++) {
 		struct sockaddr *nsap;
 		int nsaplen;
@@ -471,7 +471,7 @@ res_nsend(res_state statp,
 
 		if (v_circuit) {

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