svn commit: r257467 - in projects/ifnet: . bin/sh contrib/binutils/binutils contrib/binutils/gas contrib/binutils/gas/config contrib/binutils/opcodes contrib/gcclibs/libssp contrib/libreadline cont...

Thu Oct 31 20:12:48 UTC 2013

Author: glebius
Date: Thu Oct 31 20:12:37 2013
New Revision: 257467
URL: http://svnweb.freebsd.org/changeset/base/257467

Log:
  Merge head r256150 through r257465.

Added:
  projects/ifnet/share/keys/
     - copied from r257465, head/share/keys/
  projects/ifnet/share/man/man4/urtwnfw.4
     - copied unchanged from r257465, head/share/man/man4/urtwnfw.4
  projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_anatop.c
  projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_anatopreg.h
  projects/ifnet/sys/arm/freescale/imx/imx6_anatopvar.h
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_anatopvar.h
  projects/ifnet/sys/arm/freescale/imx/imx6_ccm.c
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_ccm.c
  projects/ifnet/sys/arm/freescale/imx/imx6_ccmreg.h
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/ifnet/sys/arm/freescale/imx/imx6_usbphy.c
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx6_usbphy.c
  projects/ifnet/sys/arm/freescale/imx/imx_nop_usbphy.c
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx_nop_usbphy.c
  projects/ifnet/sys/arm/freescale/imx/imx_sdhci.c
     - copied unchanged from r257465, head/sys/arm/freescale/imx/imx_sdhci.c
  projects/ifnet/sys/net/ifq.h
     - copied unchanged from r257465, head/sys/net/ifq.h
  projects/ifnet/tools/regression/bin/sh/builtins/trap13.0
     - copied unchanged from r257465, head/tools/regression/bin/sh/builtins/trap13.0
  projects/ifnet/tools/regression/bin/sh/builtins/trap14.0
     - copied unchanged from r257465, head/tools/regression/bin/sh/builtins/trap14.0
  projects/ifnet/usr.sbin/pkg/pkg.7
     - copied unchanged from r257465, head/usr.sbin/pkg/pkg.7
Deleted:
  projects/ifnet/etc/keys/
  projects/ifnet/etc/periodic/daily/220.backup-pkgdb
  projects/ifnet/etc/periodic/daily/490.status-pkg-changes
  projects/ifnet/etc/periodic/security/460.chkportsum
  projects/ifnet/etc/periodic/weekly/400.status-pkg
  projects/ifnet/tools/build/options/WITH_PKGTOOLS
  projects/ifnet/usr.sbin/pkg_install/
Modified:
  projects/ifnet/Makefile.inc1
  projects/ifnet/ObsoleteFiles.inc
  projects/ifnet/bin/sh/trap.c
  projects/ifnet/contrib/binutils/binutils/readelf.c
  projects/ifnet/contrib/binutils/gas/config/atof-ieee.c
  projects/ifnet/contrib/binutils/gas/symbols.c
  projects/ifnet/contrib/binutils/opcodes/i386-dis.c
  projects/ifnet/contrib/gcclibs/libssp/ssp.c
  projects/ifnet/contrib/libreadline/bind.c
  projects/ifnet/contrib/libreadline/complete.c
  projects/ifnet/contrib/libreadline/histexpand.c
  projects/ifnet/contrib/libreadline/history.c
  projects/ifnet/contrib/libreadline/input.c
  projects/ifnet/contrib/libreadline/tilde.c
  projects/ifnet/contrib/tcp_wrappers/clean_exit.c
  projects/ifnet/contrib/tcp_wrappers/hosts_access.c
  projects/ifnet/contrib/tcp_wrappers/options.c
  projects/ifnet/contrib/tcp_wrappers/percent_x.c
  projects/ifnet/contrib/tcp_wrappers/rfc931.c
  projects/ifnet/contrib/tcp_wrappers/shell_cmd.c
  projects/ifnet/contrib/tcp_wrappers/update.c
  projects/ifnet/contrib/tcpdump/print-ip.c
  projects/ifnet/contrib/wpa/src/utils/radiotap.h
  projects/ifnet/etc/Makefile
  projects/ifnet/etc/defaults/periodic.conf
  projects/ifnet/etc/mtree/BSD.root.dist
  projects/ifnet/etc/mtree/BSD.usr.dist
  projects/ifnet/etc/periodic/daily/Makefile
  projects/ifnet/etc/periodic/security/Makefile
  projects/ifnet/etc/periodic/weekly/Makefile
  projects/ifnet/etc/pkg/FreeBSD.conf
  projects/ifnet/lib/libcam/camlib.c
  projects/ifnet/lib/libz/FREEBSD-upgrade   (contents, props changed)
  projects/ifnet/lib/libz/Makefile   (contents, props changed)
  projects/ifnet/lib/libz/Symbol.map   (contents, props changed)
  projects/ifnet/lib/libz/Versions.def   (contents, props changed)
  projects/ifnet/lib/libz/zopen.c   (contents, props changed)
  projects/ifnet/sbin/camcontrol/camcontrol.c
  projects/ifnet/sbin/ifconfig/Makefile
  projects/ifnet/sbin/newfs/mkfs.c
  projects/ifnet/share/Makefile
  projects/ifnet/share/examples/bhyve/vmrun.sh
  projects/ifnet/share/man/man4/Makefile
  projects/ifnet/share/man/man4/urtwn.4
  projects/ifnet/share/man/man5/src.conf.5
  projects/ifnet/share/man/man7/hier.7
  projects/ifnet/share/man/man9/getenv.9
  projects/ifnet/share/misc/bsd-family-tree
  projects/ifnet/share/misc/committers-ports.dot
  projects/ifnet/sys/amd64/amd64/trap.c
  projects/ifnet/sys/amd64/vmm/intel/vmx.c
  projects/ifnet/sys/amd64/vmm/io/vlapic.c
  projects/ifnet/sys/amd64/vmm/vmm.c
  projects/ifnet/sys/amd64/vmm/vmm_ktr.h
  projects/ifnet/sys/arm/arm/gic.c
  projects/ifnet/sys/arm/at91/at91.c
  projects/ifnet/sys/arm/conf/DIGI-CCWMX53
  projects/ifnet/sys/arm/econa/econa.c
  projects/ifnet/sys/arm/freescale/imx/files.imx51
  projects/ifnet/sys/arm/freescale/imx/files.imx53
  projects/ifnet/sys/arm/freescale/imx/imx51_ccm.c
  projects/ifnet/sys/arm/freescale/imx/imx51_ccmreg.h
  projects/ifnet/sys/arm/freescale/imx/imx_gpt.c
  projects/ifnet/sys/arm/freescale/imx/imx_machdep.h
  projects/ifnet/sys/arm/freescale/imx/tzic.c
  projects/ifnet/sys/arm/s3c2xx0/s3c24x0.c
  projects/ifnet/sys/arm/sa11x0/sa11x0.c
  projects/ifnet/sys/arm/xscale/i80321/iq80321.c
  projects/ifnet/sys/arm/xscale/pxa/pxa_obio.c
  projects/ifnet/sys/boot/fdt/dts/digi-ccwmx53.dts
  projects/ifnet/sys/boot/fdt/dts/efikamx.dts
  projects/ifnet/sys/boot/fdt/dts/imx51x.dtsi
  projects/ifnet/sys/boot/fdt/dts/imx53-qsb.dts
  projects/ifnet/sys/boot/fdt/dts/imx53x.dtsi
  projects/ifnet/sys/cam/cam.h
  projects/ifnet/sys/cam/cam_xpt.c
  projects/ifnet/sys/cam/scsi/scsi_xpt.c
  projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/ifnet/sys/dev/acpica/acpi.c
  projects/ifnet/sys/dev/altera/atse/if_atse_nexus.c
  projects/ifnet/sys/dev/altera/avgen/altera_avgen_nexus.c
  projects/ifnet/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
  projects/ifnet/sys/dev/altera/sdcard/altera_sdcard_nexus.c
  projects/ifnet/sys/dev/arcmsr/arcmsr.c
  projects/ifnet/sys/dev/asr/asr.c
  projects/ifnet/sys/dev/cfe/cfe_resource.c
  projects/ifnet/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  projects/ifnet/sys/dev/firewire/sbp.c
  projects/ifnet/sys/dev/gxemul/disk/gxemul_disk.c
  projects/ifnet/sys/dev/gxemul/ether/if_gx.c
  projects/ifnet/sys/dev/hptiop/hptiop.c
  projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/ifnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/ifnet/sys/dev/ipmi/ipmi.c
  projects/ifnet/sys/dev/iscsi_initiator/isc_cam.c
  projects/ifnet/sys/dev/isp/isp_freebsd.c
  projects/ifnet/sys/dev/isp/isp_freebsd.h
  projects/ifnet/sys/dev/iwn/if_iwn.c
  projects/ifnet/sys/dev/mps/mps_sas.c
  projects/ifnet/sys/dev/mpt/mpt_cam.c
  projects/ifnet/sys/dev/rt/if_rt.c
  projects/ifnet/sys/dev/snc/dp83932.c
  projects/ifnet/sys/dev/snc/if_snc.c
  projects/ifnet/sys/dev/snc/if_snc_pccard.c
  projects/ifnet/sys/dev/terasic/de4led/terasic_de4led_nexus.c
  projects/ifnet/sys/dev/terasic/mtl/terasic_mtl_nexus.c
  projects/ifnet/sys/dev/twa/tw_osl_cam.c
  projects/ifnet/sys/dev/usb/controller/ehci_imx.c
  projects/ifnet/sys/dev/usb/serial/umodem.c
  projects/ifnet/sys/dev/usb/storage/umass.c
  projects/ifnet/sys/dev/usb/usb.h
  projects/ifnet/sys/dev/usb/usbdevs
  projects/ifnet/sys/dev/usb/wlan/if_run.c
  projects/ifnet/sys/dev/usb/wlan/if_runreg.h
  projects/ifnet/sys/dev/wds/wd7000.c
  projects/ifnet/sys/dev/xen/console/console.c
  projects/ifnet/sys/dev/xen/pcifront/pcifront.c
  projects/ifnet/sys/dev/xen/timer/timer.c
  projects/ifnet/sys/i386/i386/trap.c
  projects/ifnet/sys/mips/adm5120/if_admsw.c
  projects/ifnet/sys/mips/adm5120/obio.c
  projects/ifnet/sys/mips/alchemy/obio.c
  projects/ifnet/sys/mips/atheros/apb.c
  projects/ifnet/sys/mips/atheros/ar71xx_ehci.c
  projects/ifnet/sys/mips/atheros/ar71xx_pci.c
  projects/ifnet/sys/mips/atheros/ar71xx_spi.c
  projects/ifnet/sys/mips/atheros/ar71xx_wdog.c
  projects/ifnet/sys/mips/atheros/ar724x_pci.c
  projects/ifnet/sys/mips/atheros/if_arge.c
  projects/ifnet/sys/mips/cavium/ciu.c
  projects/ifnet/sys/mips/cavium/octeon_ebt3000_cf.c
  projects/ifnet/sys/mips/cavium/octeon_pmc.c
  projects/ifnet/sys/mips/cavium/octeon_rnd.c
  projects/ifnet/sys/mips/cavium/octeon_rtc.c
  projects/ifnet/sys/mips/idt/if_kr.c
  projects/ifnet/sys/mips/idt/obio.c
  projects/ifnet/sys/mips/malta/gt.c
  projects/ifnet/sys/mips/mips/tick.c
  projects/ifnet/sys/mips/mips/trap.c
  projects/ifnet/sys/mips/nlm/dev/net/xlpge.c
  projects/ifnet/sys/mips/nlm/tick.c
  projects/ifnet/sys/mips/nlm/xlp_pci.c
  projects/ifnet/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/ifnet/sys/mips/rmi/iodi.c
  projects/ifnet/sys/mips/rmi/tick.c
  projects/ifnet/sys/mips/rt305x/obio.c
  projects/ifnet/sys/mips/sibyte/sb_zbbus.c
  projects/ifnet/sys/net/if_var.h
  projects/ifnet/sys/net80211/ieee80211_amrr.c
  projects/ifnet/sys/netinet/sctp_timer.c
  projects/ifnet/sys/powerpc/aim/trap.c
  projects/ifnet/sys/powerpc/pseries/phyp_vscsi.c
  projects/ifnet/sys/powerpc/pseries/plpar_iommu.c
  projects/ifnet/sys/sys/dtrace_bsd.h
  projects/ifnet/sys/x86/include/trap.h
  projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/ifnet/tools/build/options/WITHOUT_PKGBOOTSTRAP
  projects/ifnet/tools/regression/pjdfstest/Makefile
  projects/ifnet/tools/regression/pjdfstest/pjdfstest.c
  projects/ifnet/usr.bin/iscsictl/iscsictl.8
  projects/ifnet/usr.bin/iscsictl/iscsictl.c
  projects/ifnet/usr.bin/limits/limits.c
  projects/ifnet/usr.bin/netstat/Makefile
  projects/ifnet/usr.bin/netstat/if.c
  projects/ifnet/usr.bin/netstat/main.c
  projects/ifnet/usr.bin/netstat/netstat.1
  projects/ifnet/usr.bin/xinstall/xinstall.c
  projects/ifnet/usr.sbin/Makefile
  projects/ifnet/usr.sbin/bhyve/acpi.c
  projects/ifnet/usr.sbin/bhyve/acpi.h
  projects/ifnet/usr.sbin/bhyve/bhyverun.c
  projects/ifnet/usr.sbin/bhyve/mptbl.c
  projects/ifnet/usr.sbin/bhyve/mptbl.h
  projects/ifnet/usr.sbin/bhyve/pci_lpc.c
  projects/ifnet/usr.sbin/ctladm/ctladm.8
  projects/ifnet/usr.sbin/ctladm/ctladm.c
  projects/ifnet/usr.sbin/pkg/Makefile
  projects/ifnet/usr.sbin/pkg/pkg.c
  projects/ifnet/usr.sbin/tcpdump/tcpdump/Makefile
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/contrib/binutils/   (props changed)
  projects/ifnet/contrib/tcpdump/   (props changed)
  projects/ifnet/contrib/wpa/   (props changed)
  projects/ifnet/lib/libz/   (props changed)
  projects/ifnet/sbin/   (props changed)
  projects/ifnet/share/man/man4/   (props changed)
  projects/ifnet/sys/   (props changed)
  projects/ifnet/sys/amd64/vmm/   (props changed)
  projects/ifnet/sys/boot/   (props changed)
  projects/ifnet/sys/dev/hyperv/   (props changed)
  projects/ifnet/usr.sbin/bhyve/   (props changed)

Modified: projects/ifnet/Makefile.inc1
==============================================================================

--- projects/ifnet/Makefile.inc1	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/Makefile.inc1	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1686,6 +1686,7 @@ delete-old-files:
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
@@ -1708,7 +1709,8 @@ delete-old-files:
 
 check-old-files:
 	@echo ">>> Checking for old files"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
@@ -1729,6 +1731,7 @@ delete-old-libs:
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
@@ -1748,7 +1751,8 @@ delete-old-libs:
 
 check-old-libs:
 	@echo ">>> Checking for old libraries"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
@@ -1763,7 +1767,8 @@ check-old-libs:
 
 delete-old-dirs:
 	@echo ">>> Removing old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
@@ -1776,7 +1781,8 @@ delete-old-dirs:
 
 check-old-dirs:
 	@echo ">>> Checking for old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \

Modified: projects/ifnet/ObsoleteFiles.inc
==============================================================================
--- projects/ifnet/ObsoleteFiles.inc	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/ObsoleteFiles.inc	Thu Oct 31 20:12:37 2013	(r257467)
@@ -38,6 +38,29 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131031: pkg_install has been removed
+OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
+OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
+OLD_FILES+=etc/periodic/security/460.chkportsum
+OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/sbin/pkg_add
+OLD_FILES+=usr/sbin/pkg_create
+OLD_FILES+=usr/sbin/pkg_delete
+OLD_FILES+=usr/sbin/pkg_info
+OLD_FILES+=usr/sbin/pkg_updating
+OLD_FILES+=usr/sbin/pkg_version
+OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
+# 20131030: /etc/keys moved to /usr/share/keys
+OLD_DIRS+=etc/keys
+OLD_DIRS+=etc/keys/pkg
+OLD_DIRS+=etc/keys/pkg/revoked
+OLD_DIRS+=etc/keys/pkg/trusted
+OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz

Modified: projects/ifnet/bin/sh/trap.c
==============================================================================
--- projects/ifnet/bin/sh/trap.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/bin/sh/trap.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -362,10 +362,12 @@ void
 ignoresig(int signo)
 {
 
+	if (sigmode[signo] == 0)
+		setsignal(signo);
 	if (sigmode[signo] != S_IGN && sigmode[signo] != S_HARD_IGN) {
 		signal(signo, SIG_IGN);
+		sigmode[signo] = S_IGN;
 	}
-	sigmode[signo] = S_HARD_IGN;
 }
 
 

Modified: projects/ifnet/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/ifnet/contrib/binutils/binutils/readelf.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/binutils/binutils/readelf.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -7118,7 +7118,7 @@ process_symbol_table (FILE *file)
 
 	      n = print_vma (si, DEC_5);
 	      if (n < 5)
-		fputs ("     " + n, stdout);
+		fputs (&"     "[n], stdout);
 	      printf (" %3lu: ", hn);
 	      print_vma (psym->st_value, LONG_HEX);
 	      putchar (' ');

Modified: projects/ifnet/contrib/binutils/gas/config/atof-ieee.c
==============================================================================
--- projects/ifnet/contrib/binutils/gas/config/atof-ieee.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/binutils/gas/config/atof-ieee.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -420,7 +420,8 @@ gen_to_words (LITTLENUM_TYPE *words, int
 		     - generic_floating_point_number.low);
 
   /* Seek (and forget) 1st significant bit.  */
-  for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage);;
+  for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage)
+	;;
   exponent_1 = (generic_floating_point_number.exponent
 		+ generic_floating_point_number.leader
 		+ 1

Modified: projects/ifnet/contrib/binutils/gas/symbols.c
==============================================================================
--- projects/ifnet/contrib/binutils/gas/symbols.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/binutils/gas/symbols.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1666,7 +1666,8 @@ dollar_label_name (register long n,	/* w
       *q = i % 10 + '0';
       i /= 10;
     }
-  while ((*p++ = *--q) != '\0');;
+  while ((*p++ = *--q) != '\0')
+	;;
 
   /* The label, as a '\0' ended string, starts at symbol_name_build.  */
   return symbol_name_build;
@@ -1837,7 +1838,8 @@ fb_label_name (long n,	/* We just saw "n
       *q = i % 10 + '0';
       i /= 10;
     }
-  while ((*p++ = *--q) != '\0');;
+  while ((*p++ = *--q) != '\0')
+	;;
 
   /* The label, as a '\0' ended string, starts at symbol_name_build.  */
   return (symbol_name_build);

Modified: projects/ifnet/contrib/binutils/opcodes/i386-dis.c
==============================================================================
--- projects/ifnet/contrib/binutils/opcodes/i386-dis.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/binutils/opcodes/i386-dis.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -3474,7 +3474,7 @@ static bfd_vma start_pc;
  * The function returns the length of this instruction in bytes.
  */
 
-static char intel_syntax;
+static int intel_syntax;
 static char open_char;
 static char close_char;
 static char separator_char;
@@ -3547,7 +3547,7 @@ print_insn (bfd_vma pc, disassemble_info
   else
     address_mode = mode_32bit;
 
-  if (intel_syntax == (char) -1)
+  if (intel_syntax == -1)
     intel_syntax = (info->mach == bfd_mach_i386_i386_intel_syntax
 		    || info->mach == bfd_mach_x86_64_intel_syntax);
 
@@ -4326,7 +4326,7 @@ dofloat (int sizeflag)
 static void
 OP_ST (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
-  oappend ("%st" + intel_syntax);
+  oappend (&"%st"[intel_syntax]);
 }
 
 static void
@@ -4677,32 +4677,32 @@ append_seg (void)
   if (prefixes & PREFIX_CS)
     {
       used_prefixes |= PREFIX_CS;
-      oappend ("%cs:" + intel_syntax);
+      oappend (&"%cs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_DS)
     {
       used_prefixes |= PREFIX_DS;
-      oappend ("%ds:" + intel_syntax);
+      oappend (&"%ds:"[intel_syntax]);
     }
   if (prefixes & PREFIX_SS)
     {
       used_prefixes |= PREFIX_SS;
-      oappend ("%ss:" + intel_syntax);
+      oappend (&"%ss:"[intel_syntax]);
     }
   if (prefixes & PREFIX_ES)
     {
       used_prefixes |= PREFIX_ES;
-      oappend ("%es:" + intel_syntax);
+      oappend (&"%es:"[intel_syntax]);
     }
   if (prefixes & PREFIX_FS)
     {
       used_prefixes |= PREFIX_FS;
-      oappend ("%fs:" + intel_syntax);
+      oappend (&"%fs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_GS)
     {
       used_prefixes |= PREFIX_GS;
-      oappend ("%gs:" + intel_syntax);
+      oappend (&"%gs:"[intel_syntax]);
     }
 }
 
@@ -5474,7 +5474,7 @@ OP_I (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5525,7 +5525,7 @@ OP_I64 (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5575,7 +5575,7 @@ OP_sI (int bytemode, int sizeflag)
 
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5755,7 +5755,7 @@ OP_ESreg (int code, int sizeflag)
 	  intel_operand_size (b_mode, sizeflag);
 	}
     }
-  oappend ("%es:" + intel_syntax);
+  oappend (&"%es:"[intel_syntax]);
   ptr_reg (code, sizeflag);
 }
 
@@ -5805,7 +5805,7 @@ OP_C (int dummy ATTRIBUTE_UNUSED, int si
       add = 8;
     }
   sprintf (scratchbuf, "%%cr%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5826,7 +5826,7 @@ static void
 OP_T (int dummy ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%tr%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5852,7 +5852,7 @@ OP_MMX (int bytemode ATTRIBUTE_UNUSED, i
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5863,7 +5863,7 @@ OP_XMM (int bytemode ATTRIBUTE_UNUSED, i
   if (rex & REX_R)
     add = 8;
   sprintf (scratchbuf, "%%xmm%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5895,7 +5895,7 @@ OP_EM (int bytemode, int sizeflag)
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 /* cvt* are the only instructions in sse2 which have
@@ -5922,7 +5922,7 @@ OP_EMC (int bytemode, int sizeflag)
   codep++;
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5930,7 +5930,7 @@ OP_MXC (int bytemode ATTRIBUTE_UNUSED, i
 {
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5950,7 +5950,7 @@ OP_EX (int bytemode, int sizeflag)
   MODRM_CHECK;
   codep++;
   sprintf (scratchbuf, "%%xmm%d", modrm.rm + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -6547,7 +6547,7 @@ static void
 XMM_Fixup (int reg, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%xmm%d", reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void

Modified: projects/ifnet/contrib/gcclibs/libssp/ssp.c
==============================================================================
--- projects/ifnet/contrib/gcclibs/libssp/ssp.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/gcclibs/libssp/ssp.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -56,6 +56,8 @@ Software Foundation, 51 Franklin Street,
 # include <syslog.h>
 #endif
 
+#include <stdlib.h>
+
 void *__stack_chk_guard = 0;
 
 static void __attribute__ ((constructor))

Modified: projects/ifnet/contrib/libreadline/bind.c
==============================================================================
--- projects/ifnet/contrib/libreadline/bind.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/bind.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -442,7 +442,7 @@ rl_translate_keyseq (seq, array, len)
 {
   register int i, c, l, temp;
 
-  for (i = l = 0; c = seq[i]; i++)
+  for (i = l = 0; (c = seq[i]); i++)
     {
       if (c == '\\')
 	{
@@ -1185,7 +1185,7 @@ rl_parse_and_bind (string)
     {
       int passc = 0;
 
-      for (i = 1; c = string[i]; i++)
+      for (i = 1; (c = string[i]); i++)
 	{
 	  if (passc)
 	    {
@@ -1276,7 +1276,7 @@ rl_parse_and_bind (string)
       int delimiter, passc;
 
       delimiter = string[i++];
-      for (passc = 0; c = string[i]; i++)
+      for (passc = 0; (c = string[i]); i++)
 	{
 	  if (passc)
 	    {
@@ -2048,7 +2048,7 @@ rl_function_dumper (print_readably)
 
   fprintf (rl_outstream, "\n");
 
-  for (i = 0; name = names[i]; i++)
+  for (i = 0; (name = names[i]); i++)
     {
       rl_command_func_t *function;
       char **invokers;

Modified: projects/ifnet/contrib/libreadline/complete.c
==============================================================================
--- projects/ifnet/contrib/libreadline/complete.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/complete.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -884,7 +884,7 @@ _rl_find_completion_word (fp, dp)
       /* We didn't find an unclosed quoted substring upon which to do
          completion, so use the word break characters to find the
          substring on which to complete. */
-      while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
+      while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
 	{
 	  scan = rl_line_buffer[rl_point];
 
@@ -1803,7 +1803,7 @@ rl_completion_matches (text, entry_funct
   match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
   match_list[1] = (char *)NULL;
 
-  while (string = (*entry_function) (text, matches))
+  while ((string = (*entry_function) (text, matches)))
     {
       if (matches + 1 == match_list_size)
 	match_list = (char **)xrealloc
@@ -1854,7 +1854,7 @@ rl_username_completion_function (text, s
     }
 
 #if defined (HAVE_GETPWENT)
-  while (entry = getpwent ())
+  while ((entry = getpwent ()))
     {
       /* Null usernames should result in all users as possible completions. */
       if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))

Modified: projects/ifnet/contrib/libreadline/histexpand.c
==============================================================================
--- projects/ifnet/contrib/libreadline/histexpand.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/histexpand.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -203,7 +203,7 @@ get_history_event (string, caller_index,
     }
 
   /* Only a closing `?' or a newline delimit a substring search string. */
-  for (local_index = i; c = string[i]; i++)
+  for (local_index = i; (c = string[i]); i++)
     {
 #if defined (HANDLE_MULTIBYTE)
       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)

Modified: projects/ifnet/contrib/libreadline/history.c
==============================================================================
--- projects/ifnet/contrib/libreadline/history.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/history.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -306,7 +306,7 @@ add_history (string)
 	}
     }
 
-  temp = alloc_history_entry (string, hist_inittime ());
+  temp = alloc_history_entry ((char *)string, hist_inittime ());
 
   the_history[history_length] = (HIST_ENTRY *)NULL;
   the_history[history_length - 1] = temp;

Modified: projects/ifnet/contrib/libreadline/input.c
==============================================================================
--- projects/ifnet/contrib/libreadline/input.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/input.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -428,7 +428,7 @@ rl_read_key ()
   else
     {
       /* If input is coming from a macro, then use that. */
-      if (c = _rl_next_macro_key ())
+      if ((c = _rl_next_macro_key ()))
 	return (c);
 
       /* If the user has an event function, then call it periodically. */

Modified: projects/ifnet/contrib/libreadline/tilde.c
==============================================================================
--- projects/ifnet/contrib/libreadline/tilde.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/libreadline/tilde.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -196,7 +196,7 @@ tilde_expand (string)
   int result_size, result_index;
 
   result_index = result_size = 0;
-  if (result = strchr (string, '~'))
+  if ((result = strchr (string, '~')))
     result = (char *)xmalloc (result_size = (strlen (string) + 16));
   else
     result = (char *)xmalloc (result_size = (strlen (string) + 1));

Modified: projects/ifnet/contrib/tcp_wrappers/clean_exit.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/clean_exit.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/clean_exit.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -13,6 +13,7 @@ static char sccsid[] = "@(#) clean_exit.
 #endif
 
 #include <stdio.h>
+#include <unistd.h>
 
 extern void exit();
 

Modified: projects/ifnet/contrib/tcp_wrappers/hosts_access.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/hosts_access.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/hosts_access.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#) hosts_acces
 #ifdef INET6
 #include <netdb.h>
 #endif
+#include <stdlib.h>
 
 extern char *fgets();
 extern int errno;
@@ -102,6 +103,11 @@ static int masked_match6();
 
 #define	BUFLEN 2048
 
+/* definition to be used from workarounds.c */
+#ifdef NETGROUP
+int     yp_get_default_domain(char  **);
+#endif
+
 /* hosts_access - host access control facility */
 
 int     hosts_access(request)
@@ -269,7 +275,7 @@ struct request_info *request;
 
 static int hostfile_match(path, host)
 char   *path;
-struct hosts_info *host;
+struct host_info *host;
 {
     char    tok[BUFSIZ];
     int     match = NO;

Modified: projects/ifnet/contrib/tcp_wrappers/options.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/options.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/options.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -50,6 +50,8 @@ static char sccsid[] = "@(#) options.c 1
 #include <ctype.h>
 #include <setjmp.h>
 #include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 #ifndef MAXPATHNAMELEN
 #define MAXPATHNAMELEN  BUFSIZ
@@ -441,16 +443,21 @@ struct request_info *request;
 /* severity_map - lookup facility or severity value */
 
 static int severity_map(table, name)
-CODE   *table;
+const CODE   *table;
 char   *name;
 {
-    CODE *t;
+    const CODE *t;
+    int ret = -1;
 
     for (t = table; t->c_name; t++)
-	if (STR_EQ(t->c_name, name))
-	    return (t->c_val);
-    tcpd_jump("bad syslog facility or severity: \"%s\"", name);
-    /* NOTREACHED */
+	if (STR_EQ(t->c_name, name)) {
+	    ret = t->c_val;
+	    break;
+	}
+    if (ret == -1)
+    	tcpd_jump("bad syslog facility or severity: \"%s\"", name);
+
+    return (ret);
 }
 
 /* severity_option - change logging severity for this event (Dave Mitchell) */

Modified: projects/ifnet/contrib/tcp_wrappers/percent_x.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/percent_x.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/percent_x.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -19,6 +19,7 @@ static char sccsid[] = "@(#) percent_x.c
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
 
 extern void exit();
 

Modified: projects/ifnet/contrib/tcp_wrappers/rfc931.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/rfc931.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/rfc931.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -25,6 +25,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
 #include <setjmp.h>
 #include <signal.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifndef SEEK_SET
 #define SEEK_SET 0

Modified: projects/ifnet/contrib/tcp_wrappers/shell_cmd.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/shell_cmd.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/shell_cmd.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -16,10 +16,13 @@ static char sccsid[] = "@(#) shell_cmd.c
 
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 extern void exit();
 

Modified: projects/ifnet/contrib/tcp_wrappers/update.c
==============================================================================
--- projects/ifnet/contrib/tcp_wrappers/update.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcp_wrappers/update.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -24,6 +24,7 @@ static char sccsid[] = "@(#) update.c 1.
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
 
 /* Local stuff. */
 

Modified: projects/ifnet/contrib/tcpdump/print-ip.c
==============================================================================
--- projects/ifnet/contrib/tcpdump/print-ip.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/tcpdump/print-ip.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -483,9 +483,11 @@ again:
 		pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
 		break;
 
+#if defined(HAVE_NET_PFVAR_H)
 	case IPPROTO_PFSYNC:
 		pfsync_ip_print(ipds->cp, ipds->len);
 		break;
+#endif
 
 	default:
 		if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)

Modified: projects/ifnet/contrib/wpa/src/utils/radiotap.h
==============================================================================
--- projects/ifnet/contrib/wpa/src/utils/radiotap.h	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/contrib/wpa/src/utils/radiotap.h	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
 
 /*-

Modified: projects/ifnet/etc/Makefile
==============================================================================
--- projects/ifnet/etc/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -224,7 +224,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
-	${_+_}cd ${.CURDIR}/keys; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 .if ${MK_PKGBOOTSTRAP} != "no"
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install

Modified: projects/ifnet/etc/defaults/periodic.conf
==============================================================================
--- projects/ifnet/etc/defaults/periodic.conf	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/defaults/periodic.conf	Thu Oct 31 20:12:37 2013	(r257467)
@@ -319,7 +319,7 @@ if [ -z "${source_periodic_confs_defined
 	security_daily_compat_var() {
 		local var=$1 dailyvar value
 
-		dailyvar=daily_status_security${#status_security}
+		dailyvar=daily_status_security${var#security_status}
 		periodvar=${var%enable}period
 		eval value=\"\$$dailyvar\"
 		[ -z "$value" ] && return
@@ -331,7 +331,7 @@ if [ -z "${source_periodic_confs_defined
 			$periodvar=daily
 			;;
 		*)
-			$var="$value"
+			eval $var=\"$value\"
 			;;
 		esac
 	}

Modified: projects/ifnet/etc/mtree/BSD.root.dist
==============================================================================
--- projects/ifnet/etc/mtree/BSD.root.dist	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/mtree/BSD.root.dist	Thu Oct 31 20:12:37 2013	(r257467)
@@ -34,14 +34,6 @@
         ..
         gss
         ..
-        keys
-            pkg
-                revoked
-                ..
-                trusted
-                ..
-            ..
-        ..
         mail
         ..
         mtree

Modified: projects/ifnet/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/ifnet/etc/mtree/BSD.usr.dist	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/mtree/BSD.usr.dist	Thu Oct 31 20:12:37 2013	(r257467)
@@ -478,6 +478,14 @@
         ..
         info
         ..
+        keys
+            pkg
+                revoked
+                ..
+                trusted
+                ..
+            ..
+        ..
         locale
             UTF-8
             ..

Modified: projects/ifnet/etc/periodic/daily/Makefile
==============================================================================
--- projects/ifnet/etc/periodic/daily/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/periodic/daily/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -36,11 +36,6 @@ FILES+=	130.clean-msgs
 FILES+=	480.status-ntpd
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	220.backup-pkgdb \
-	490.status-pkg-changes
-.endif
-
 .if ${MK_RCMDS} != "no"
 FILES+=	140.clean-rwho \
 	430.status-rwho

Modified: projects/ifnet/etc/periodic/security/Makefile
==============================================================================
--- projects/ifnet/etc/periodic/security/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/periodic/security/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -29,8 +29,4 @@ FILES+=	500.ipfwdenied \
 FILES+=	520.pfdenied
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	460.chkportsum
-.endif
-
 .include <bsd.prog.mk>

Modified: projects/ifnet/etc/periodic/weekly/Makefile
==============================================================================
--- projects/ifnet/etc/periodic/weekly/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/periodic/weekly/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -16,8 +16,4 @@ FILES+=	310.locate
 FILES+=	320.whatis 330.catman
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	400.status-pkg
-.endif
-
 .include <bsd.prog.mk>

Modified: projects/ifnet/etc/pkg/FreeBSD.conf
==============================================================================
--- projects/ifnet/etc/pkg/FreeBSD.conf	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/etc/pkg/FreeBSD.conf	Thu Oct 31 20:12:37 2013	(r257467)
@@ -3,6 +3,6 @@ FreeBSD: {
   url: "pkg+http://pkg.freebsd.org/${ABI}/latest",
   mirror_type: "srv",
   signature_type: "none",
-  fingerprints: "/etc/keys/pkg",
+  fingerprints: "/usr/share/keys/pkg",
   enabled: "yes"
 }

Modified: projects/ifnet/lib/libcam/camlib.c
==============================================================================
--- projects/ifnet/lib/libcam/camlib.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libcam/camlib.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -348,16 +349,16 @@ cam_open_btl(path_id_t path_id, target_i
 	if (ccb.cdm.status == CAM_DEV_MATCH_MORE) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: CDM reported more than one"
-			 " passthrough device at %d:%d:%d!!\n",
-			 func_name, path_id, target_id, target_lun);
+			 " passthrough device at %d:%d:%jx!!\n",
+			 func_name, path_id, target_id, (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
 	if (ccb.cdm.num_matches == 0) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: no passthrough device found at"
-			 " %d:%d:%d", func_name, path_id, target_id,
-			 target_lun);
+			 " %d:%d:%jx", func_name, path_id, target_id,
+			 (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
@@ -687,14 +688,14 @@ cam_path_string(struct cam_device *dev, 
 		return(str);
 	}
 
-	snprintf(str, len, "(%s%d:%s%d:%d:%d:%d): ",
+	snprintf(str, len, "(%s%d:%s%d:%d:%d:%jx): ",
 		 (dev->device_name[0] != '\0') ? dev->device_name : "pass",
 		 dev->dev_unit_num,
 		 (dev->sim_name[0] != '\0') ? dev->sim_name : "unknown",
 		 dev->sim_unit_number,
 		 dev->bus_id,
 		 dev->target_id,
-		 dev->target_lun);
+		 (uintmax_t)dev->target_lun);
 
 	return(str);
 }

Modified: projects/ifnet/lib/libz/FREEBSD-upgrade
==============================================================================
--- projects/ifnet/lib/libz/FREEBSD-upgrade	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libz/FREEBSD-upgrade	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
+$FreeBSD$
 
 ZLib 1.2.2
 

Modified: projects/ifnet/lib/libz/Makefile
==============================================================================
--- projects/ifnet/lib/libz/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libz/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/lib/libz/Makefile 232263 2012-02-28 18:30:18Z dim $
+# $FreeBSD$
 #
 
 LIB=		z

Modified: projects/ifnet/lib/libz/Symbol.map
==============================================================================
--- projects/ifnet/lib/libz/Symbol.map	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libz/Symbol.map	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: head/lib/libz/Symbol.map 206709 2010-04-16 20:07:24Z delphij $
+ * $FreeBSD$
  */
 
 ZLIB_1.2.7.1 {

Modified: projects/ifnet/lib/libz/Versions.def
==============================================================================
--- projects/ifnet/lib/libz/Versions.def	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libz/Versions.def	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/lib/libz/Versions.def 205486 2010-03-22 22:12:27Z delphij $
+# $FreeBSD$
 
 ZLIB_1.2.4.0 {
 };

Modified: projects/ifnet/lib/libz/zopen.c
==============================================================================
--- projects/ifnet/lib/libz/zopen.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/lib/libz/zopen.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/lib/libz/zopen.c 84228 2001-09-30 22:39:00Z dillon $");
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <zlib.h>

Modified: projects/ifnet/sbin/camcontrol/camcontrol.c
==============================================================================
--- projects/ifnet/sbin/camcontrol/camcontrol.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/sbin/camcontrol/camcontrol.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -566,11 +566,11 @@ getdevtree(void)
 				}
 
 				fprintf(stdout, "%-33s  at scbus%d "
-					"target %d lun %d (",
+					"target %d lun %jx (",
 					tmpstr,
 					dev_result->path_id,
 					dev_result->target_id,
-					dev_result->target_lun);
+					(uintmax_t)dev_result->target_lun);
 
 				need_close = 1;
 

Modified: projects/ifnet/sbin/ifconfig/Makefile
==============================================================================
--- projects/ifnet/sbin/ifconfig/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/sbin/ifconfig/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -40,7 +40,9 @@ LDADD+=	-lbsdxml -lsbuf
 
 SRCS+=	carp.c			# SIOC[GS]VH support
 SRCS+=	ifgroup.c		# ...
+.if ${MK_PF} != "no"
 SRCS+=	ifpfsync.c		# pfsync(4) support
+.endif
 
 SRCS+=	ifbridge.c		# bridge support
 SRCS+=	iflagg.c		# lagg support

Modified: projects/ifnet/sbin/newfs/mkfs.c
==============================================================================
--- projects/ifnet/sbin/newfs/mkfs.c	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/sbin/newfs/mkfs.c	Thu Oct 31 20:12:37 2013	(r257467)
@@ -134,12 +134,10 @@ mkfs(struct partition *pp, char *fsys)
 	 */
 	disk.d_bsize = sectorsize;
 	disk.d_ufs = Oflag;
-	if (Rflag) {
+	if (Rflag)
 		utime = 1000000000;
-	} else {
+	else
 		time(&utime);
-		arc4random_stir();
-	}
 	sblock.fs_old_flags = FS_FLAGS_UPDATED;
 	sblock.fs_flags = 0;
 	if (Uflag)

Modified: projects/ifnet/share/Makefile
==============================================================================
--- projects/ifnet/share/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/share/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -11,6 +11,7 @@ SUBDIR=	${_colldef} \
 	dtrace \
 	${_examples} \
 	${_i18n} \
+	keys \
 	${_man} \
 	${_me} \
 	misc \

Modified: projects/ifnet/share/examples/bhyve/vmrun.sh
==============================================================================
--- projects/ifnet/share/examples/bhyve/vmrun.sh	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/share/examples/bhyve/vmrun.sh	Thu Oct 31 20:12:37 2013	(r257467)
@@ -173,7 +173,7 @@ while [ 1 ]; do
 		break
 	fi
 
-	${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -AI -H -P	\
+	${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -A -H -P	\
 		-g ${gdbport}						\
 		-s 0:0,hostbridge					\
 		-s 1:0,lpc						\

Modified: projects/ifnet/share/man/man4/Makefile
==============================================================================
--- projects/ifnet/share/man/man4/Makefile	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/share/man/man4/Makefile	Thu Oct 31 20:12:37 2013	(r257467)
@@ -523,6 +523,7 @@ MAN=	aac.4 \
 	urio.4 \
 	${_urtw.4} \
 	urtwn.4 \
+	urtwnfw.4 \
 	usb.4 \
 	usb_quirk.4 \
 	uslcom.4 \

Modified: projects/ifnet/share/man/man4/urtwn.4
==============================================================================
--- projects/ifnet/share/man/man4/urtwn.4	Thu Oct 31 20:03:59 2013	(r257466)
+++ projects/ifnet/share/man/man4/urtwn.4	Thu Oct 31 20:12:37 2013	(r257467)
@@ -1,6 +1,3 @@
-.\" $OpenBSD: urtwn.4,v 1.20 2013/05/16 10:02:59 sthen Exp $
-.\" $FreeBSD$
-.\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini at free.fr>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +12,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd October 6, 2013
+.\" $FreeBSD$
+.\"
+.Dd October 31, 2013
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -40,6 +39,13 @@ module at boot time, place the following
 .Bd -literal -offset indent
 if_urtwn_load="YES"
 .Ed
+.Pp
+In both cases, place the following line in
+.Xr loader.conf 5
+to acknowledge the firmware license (see below):
+.Bd -literal -offset indent
+legal.realtek.license_ack=1
+.Ed
 .Sh DESCRIPTION
 The
 .Nm
@@ -57,6 +63,22 @@ The RTL8192CU is a highly integrated mul
 802.11n adapter that combines a MAC, a 2T2R capable baseband and an
 RF in a single chip.
 It operates in the 2GHz spectrum only.
+.Pp
+This driver requires the firmware built with the
+.Nm urtwnfw
+module to work.
+For the loaded firmware to be enabled for use the license at
+.Pa /usr/share/doc/legal/realtek
+must be agreed by adding the following line to
+.Xr loader.conf 5 :
+.Pp
+.Dl "legal.realtek.license_ack=1"
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact
+.It Pa /usr/share/doc/legal/realtek
+.Nm
+firmware license
+.El
 .Sh HARDWARE
 The following adapters should work:
 .Pp
@@ -97,6 +119,7 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
+.Xr urtwnfw 4 ,
 .Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,

Copied: projects/ifnet/share/man/man4/urtwnfw.4 (from r257465, head/share/man/man4/urtwnfw.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/share/man/man4/urtwnfw.4	Thu Oct 31 20:12:37 2013	(r257467, copy of r257465, head/share/man/man4/urtwnfw.4)
@@ -0,0 +1,75 @@
+.\" Copyright (c) 2013 Kevin Lo
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 31, 2013
+.Dt URTWNFW 4
+.Os
+.Sh NAME
+.Nm urtwnfw
+.Nd "Firmware Module for Realtek Wireless driver"
+.Sh SYNOPSIS
+To compile this module into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device urtwnfw"
+.Ed
+.Pp
+This will include three firmware images inside the kernel.
+If you want to pick only the firmware image for your network adapter choose one
+of the following:
+.Bd -ragged -offset indent
+.Cd "device urtwn-rtl8192cfwT"
+.Cd "device urtwn-rtl8192cfwU"
+.Ed
+.Pp
+Alternatively, to load the driver as a

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