[PC-BSD Commits] [pcbsd/freebsd] 009954: Set props and correct RCS ID tag.

GitHub noreply at github.com
Thu Sep 26 01:42:55 PDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/pcbsd/freebsd
  Commit: 009954ae5c3b89ec865a76f4a8b0d2e7880f2a91
      https://github.com/pcbsd/freebsd/commit/009954ae5c3b89ec865a76f4a8b0d2e7880f2a91
  Author: des <des at FreeBSD.org>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M contrib/unbound/freebsd-configure.sh
    M contrib/unbound/freebsd-sources.pl

  Log Message:
  -----------
  Set props and correct RCS ID tag.

Approved by:	re (blanket)


  Commit: b1cb7725c30745191790fb81b917d3dcfd31fb1e
      https://github.com/pcbsd/freebsd/commit/b1cb7725c30745191790fb81b917d3dcfd31fb1e
  Author: des <des at FreeBSD.org>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Log Message:
  -----------
  Remove autoprops.

Approved by:	re (blanket)


  Commit: d9f8e5d07be62acd0df762ab276f5a3f50db6b38
      https://github.com/pcbsd/freebsd/commit/d9f8e5d07be62acd0df762ab276f5a3f50db6b38
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M sys/i386/include/xen/xenvar.h

  Log Message:
  -----------
  Fix compilation of the i386 PAE kernel config.

sys/i386/include/xen/xenvar.h:
	Provide vtomach() when PAE is defined.

Approved by:	re (blanket Xen)


  Commit: f749b57e894fe8edc4ac41bdb13df3198fad2cfb
      https://github.com/pcbsd/freebsd/commit/f749b57e894fe8edc4ac41bdb13df3198fad2cfb
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M sys/kern/subr_smp.c

  Log Message:
  -----------
  Fix ia64 and mips kernel builds due to XENHVM=>GENERIC integration in
revision 255744.

sys/kern/subr_smp.c:
	IPI_SUSPEND is only available on amd64 and i386.  Protect
	new uses of this constant with #ifdefs to avoid impacting
	other platforms.

Approved by:	re (blanket Xen)


  Commit: 79894c60808ab81f99811a12ec76a9cfd16ec29d
      https://github.com/pcbsd/freebsd/commit/79894c60808ab81f99811a12ec76a9cfd16ec29d
  Author: andrew <andrew at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M Makefile
    M Makefile.inc1

  Log Message:
  -----------
  Remove the armv6eb architecture as it is unused, and almost certainly
broken. None of our kernels can boot armv6eb. The little-endian kernels do
not have the required code to be able to switch endian when running a
big-endian executable.

Approved by:	re (gjb)


  Commit: 12fb397079ae31a26be56507235df63d4f0ef5a3
      https://github.com/pcbsd/freebsd/commit/12fb397079ae31a26be56507235df63d4f0ef5a3
  Author: glebius <glebius at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/arm/arm/vm_machdep.c
    M sys/i386/i386/vm_machdep.c
    M sys/kern/uipc_syscalls.c
    M sys/mips/mips/vm_machdep.c
    M sys/powerpc/aim/vm_machdep.c
    M sys/powerpc/booke/vm_machdep.c
    M sys/sparc64/sparc64/vm_machdep.c
    M sys/sys/sf_buf.h

  Log Message:
  -----------
  - Create kern.ipc.sendfile namespace, and put the new "readhead" OID
  there as "kern.ipc.sendfile.readahead".
- Push all nsfbuf related tunables into MD code. Don't move them
  to new namespace in favor of POLA.

Reviewed by:	scottl
Approved by:	re (gjb)


  Commit: 30f0365ae9f2024c5ae68ffcb5370d12d1facc13
      https://github.com/pcbsd/freebsd/commit/30f0365ae9f2024c5ae68ffcb5370d12d1facc13
  Author: davide <davide at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/kern/kern_rwlock.c
    M sys/kern/kern_sx.c

  Log Message:
  -----------
  Consistently use the same value to indicate exclusively-held and
shared-held locks for all the primitives in lc_lock/lc_unlock routines.
This fixes the problems introduced in r255747, which indeed introduced an
inversion in the logic.

Reported by:	many
Tested by:	bdrewery, pho, lme, Adam McDougall, O. Hartmann
Approved by:	re (glebius)


  Commit: 2140bc08e214cec665723930038427e3a148cb10
      https://github.com/pcbsd/freebsd/commit/2140bc08e214cec665723930038427e3a148cb10
  Author: bz <bz at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/netinet6/frag6.c

  Log Message:
  -----------
  Update comment from draft to RFC number.

Submitted by:	Loganaden Velvindron (logan elandsys.com)
Approved by:	re (gjb)
MFC after:	6 days


  Commit: 6e2676ddc162624edc427cd85bc8f7998c24d1fb
      https://github.com/pcbsd/freebsd/commit/6e2676ddc162624edc427cd85bc8f7998c24d1fb
  Author: alc <alc at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/vm/vm_map.c

  Log Message:
  -----------
  Both the vm_map and vmspace zones are defined as "no free".  So, there is no
point in defining a fini function for these zones.

Reviewed by:	kib
Approved by:	re (glebius)
Sponsored by:	EMC / Isilon Storage Division


  Commit: 15943e2b3dfacc5df66cf519a87279cb15dbc23e
      https://github.com/pcbsd/freebsd/commit/15943e2b3dfacc5df66cf519a87279cb15dbc23e
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M etc/mtree/BSD.var.dist

  Log Message:
  -----------
  Fix indentation.

Approved by:	re (blanket)


  Commit: bbab9202d39bf4067344787e0529d1e0e7778a5e
      https://github.com/pcbsd/freebsd/commit/bbab9202d39bf4067344787e0529d1e0e7778a5e
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M contrib/unbound/freebsd-configure.sh
    M contrib/unbound/util/configparser.h

  Log Message:
  -----------
  Due to a missing command-line argument, yacc regenerated the parser but
not its header file, resulting in a mismatch between the lexer and parser
and strange errors when reading the configuration file.

Approved by:	re (blanket)


  Commit: c4b7751552a7ca56d5a3824e2a56cd9f00731b88
      https://github.com/pcbsd/freebsd/commit/c4b7751552a7ca56d5a3824e2a56cd9f00731b88
  Author: ian <ian at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M include/Makefile

  Log Message:
  -----------
  Launch the shell, passing it the path to the mk-osreldate script, rather
than launching the script directly and relying on #! to launch the shell.
This avoids problems when the source is mounted with the noexec flag.

MFC this together with r255775.

Approved by:	re (kib)
MFC after:	2 weeks


  Commit: 46dd93739bb63f7f7791e941da58c8c7c43572bb
      https://github.com/pcbsd/freebsd/commit/46dd93739bb63f7f7791e941da58c8c7c43572bb
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/kern/vfs_bio.c

  Log Message:
  -----------
  Increase the chance of the buffer write from the bufdaemon helper
context to succeed.  If the locked vnode which owns the buffer to be
written is shared locked, try the non-blocking upgrade of the lock to
exclusive.

PR:	kern/178997
Reported and tested by:	Klaus Weber <fbsd-bugs-2013-1 at unix-admin.de>
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Approved by:	re (marius)


  Commit: 5252c8b0bf99df2fc687ffe7579e180673c0b619
      https://github.com/pcbsd/freebsd/commit/5252c8b0bf99df2fc687ffe7579e180673c0b619
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/kern/kern_event.c

  Log Message:
  -----------
  Pre-acquire the filedesc sx when a possibility exists that the later
code could need to remove a kqueue from the filedesc list.  Global
lock is already locked, which causes sleepable after non-sleepable
lock acquisition.

Reported and tested by:	pho
Reviewed by:	jmg
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Approved by:	re (gjb)


  Commit: 752a7a786f64701363c2727c927615419313b0d0
      https://github.com/pcbsd/freebsd/commit/752a7a786f64701363c2727c927615419313b0d0
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/kern/vfs_bio.c

  Log Message:
  -----------
  Revert r255797.  The LK_UPGRADE | LK_NOWAIT drops the lock.

Approved by:	re (marius, implicit)


  Commit: 819dbfe373eeb8d0c4961fa136119525067ba024
      https://github.com/pcbsd/freebsd/commit/819dbfe373eeb8d0c4961fa136119525067ba024
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    A contrib/ldns/drill/config.h
    A contrib/ldns/drill/drill.1
    M usr.bin/Makefile
    A usr.bin/drill/Makefile

  Log Message:
  -----------
  Build and install drill(1).

Approved by:	re (blanket)


  Commit: 733c348ff3f536b89b2147621a7fd3d9ed16640e
      https://github.com/pcbsd/freebsd/commit/733c348ff3f536b89b2147621a7fd3d9ed16640e
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M tools/build/mk/OptionalObsoleteFiles.inc

  Log Message:
  -----------
  Remove drill(1) if MK_LDNS_UTILS is false.
Remove host(1) if both MK_BIND and MK_LDNS_UTILS are false.

Approved by:	re (blanket)


  Commit: 340e2ed8dbe5580459203833def634c2888db571
      https://github.com/pcbsd/freebsd/commit/340e2ed8dbe5580459203833def634c2888db571
  Author: dim <dim at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    M contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp

  Log Message:
  -----------
  Pull in r191165 from upstream llvm trunk:

  ISelDAG: spot chain cycles involving MachineNodes

  Previously, the DAGISel function WalkChainUsers was spotting that it
  had entered already-selected territory by whether a node was a
  MachineNode (amongst other things). Since it's fairly common practice
  to insert MachineNodes during ISelLowering, this was not the correct
  check.

  Looking around, it seems that other nodes get their NodeId set to -1
  upon selection, so this makes sure the same thing happens to all
  MachineNodes and uses that characteristic to determine whether we
  should stop looking for a loop during selection.

  This should fix PR15840.

Specifically, this fixes the long-standing assertion failure when
compiling the multimedia/gstreamer port on i386.  Thanks to Tijl
Coosemans for his help in getting upstream to fix it.

Approved by:	re (marius)


  Commit: 65c545bff143fb7ebecbf312e0f289f8604f770a
      https://github.com/pcbsd/freebsd/commit/65c545bff143fb7ebecbf312e0f289f8604f770a
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/kern/subr_sbuf.c

  Log Message:
  -----------
  Always request zeroed memory, in case we're dumb enough to leak it later.

Approved by:	re (gjb)


  Commit: 26423835af161459626fd913fb397bdda1e0f167
      https://github.com/pcbsd/freebsd/commit/26423835af161459626fd913fb397bdda1e0f167
  Author: sbruno <sbruno at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M sys/dev/mfi/mfireg.h

  Log Message:
  -----------
  Export two new DCMD enums.  These allow set/get of the mfi_ctrl_properties
structure in the driver.

Having these in 10.0 means that mfiutil can be modified to take adavantage
of new updates without a kernel recompile.

Approved by:	re (gjb)
MFC after:	2 weeks


  Commit: 5acce3cc7f418da48d069006b327265877aa87d8
      https://github.com/pcbsd/freebsd/commit/5acce3cc7f418da48d069006b327265877aa87d8
  Author: ian <ian at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M include/Makefile

  Log Message:
  -----------
  Launch the bourne shell using "sh" rather than "${SHELL}", as the latter
may come in from the environment and reflect the user's interactive shell.
Using bare "sh" is the dominant pattern in existing makefiles.

MFC this together with r255775.

Approved by:	re ()
MFC after:	2 weeks


  Commit: b1d537a11d2a680fc34947d3883280e75b3d6b71
      https://github.com/pcbsd/freebsd/commit/b1d537a11d2a680fc34947d3883280e75b3d6b71
  Author: des <des at FreeBSD.org>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M etc/defaults/rc.conf
    M etc/rc.d/Makefile
    A etc/rc.d/local_unbound
    M etc/rc.subr
    M share/man/man5/rc.conf.5
    M share/man/man8/rc.8
    M share/man/man8/rc.subr.8
    M tools/build/mk/OptionalObsoleteFiles.inc
    M usr.sbin/unbound/Makefile
    A usr.sbin/unbound/local-setup/Makefile
    A usr.sbin/unbound/local-setup/local-unbound-setup.sh

  Log Message:
  -----------
  Add a setup script for unbound(8) called local-unbound-setup.  It
generates a configuration suitable for running unbound as a caching
forwarding resolver, and configures resolvconf(8) to update unbound's
list of forwarders in addition to /etc/resolv.conf.  The initial list
is taken from the existing resolv.conf, which is rewritten to point to
localhost.  Alternatively, a list of forwarders can be provided on the
command line.

To assist this script, add an rc.subr command called "enabled" which
does nothing except return 0 if the service is enabled and 1 if it is
not, without going through the usual checks.  We should consider doing
the same for "status", which is currently pointless.

Add an rc script for unbound, called local_unbound.  If there is no
configuration file, the rc script runs local-unbound-setup to generate
one.

Note that these scripts place the unbound configuration files in
/var/unbound rather than /etc/unbound.  This is necessary so that
unbound can reload its configuration while chrooted.  We should
probably provide symlinks in /etc.

Approved by:	re (blanket)


  Commit: 9c38c532fffb7380cebafcee5521c5ceffd56ff0
      https://github.com/pcbsd/freebsd/commit/9c38c532fffb7380cebafcee5521c5ceffd56ff0
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M sys/dev/iscsi_initiator/iscsi.c

  Log Message:
  -----------
  Prevent "lock (iscsi) sx does not match earlier (sleep mutex) lock" panic
triggered by "kldload iscsi_initiator; kldunload iscsi_initiator; kldload
iscsi".

Approved by:	re (marius)


  Commit: 674fdc66685eb6f5b619be29f1ed5af5c0713c53
      https://github.com/pcbsd/freebsd/commit/674fdc66685eb6f5b619be29f1ed5af5c0713c53
  Author: theraven <theraven at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M contrib/libcxxrt/libelftc_dem_gnu3.c
    M contrib/libcxxrt/typeinfo.cc
    M contrib/libcxxrt/unwind-itanium.h

  Log Message:
  -----------
  Import a new libcxxrt.  This fixes some potential crashing in the demangler.

Approved by:	re (gjb)
MFC after:	1 week


  Commit: 185dc91bf29b66981dcb68f679ed3f2d50c7a69e
      https://github.com/pcbsd/freebsd/commit/185dc91bf29b66981dcb68f679ed3f2d50c7a69e
  Author: loos <loos at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M sys/arm/broadcom/bcm2835/bcm2835_systimer.c

  Log Message:
  -----------
  Fix DELAY() on RPi, the wrong math was making it take twice it should.

Reported by:	Alexander <sht at ropnet.ru>
Approved by:	adrian (mentor)
Approved by:	re (gjb)


  Commit: 23d9cd5eff5ee7d7588bd950e305cacab59ce40d
      https://github.com/pcbsd/freebsd/commit/23d9cd5eff5ee7d7588bd950e305cacab59ce40d
  Author: nwhitehorn <nwhitehorn at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M usr.sbin/bsdinstall/partedit/gpart_ops.c
    M usr.sbin/bsdinstall/partedit/partedit_powerpc.c

  Log Message:
  -----------
  Add installer support for CHRP/PAPR PowerPC systems that use MBR+BSD
formatting, like x86, but with an additional MBR slice containing a raw
boot partition.

Approved by:	re (gjb)


  Commit: 64fbf758553e27367ea243f3b71bd0a09fc59001
      https://github.com/pcbsd/freebsd/commit/64fbf758553e27367ea243f3b71bd0a09fc59001
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M usr.sbin/bsdconfig/examples/Makefile
    R usr.sbin/bsdconfig/examples/browse_packages.sh
    A usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
    A usr.sbin/bsdconfig/examples/browse_packages_http.sh
    M usr.sbin/bsdconfig/share/media/http.subr

  Log Message:
  -----------
  Fix a bug in HTTP checking/fetching.
Fix a bug in HTTP checking/fetching. Add Main Site to HTTP menu. Add new
example script browse_packages_http.sh and move existing example script
browse_packages.sh -> browse_packages_ftp.sh

Reviewed by:	gjb, brd
Approved by:	re (gjb), clusteradm (brd)
MFC after:	3 days


  Commit: 56573b50a653966ac9e8142886a52014c68654fa
      https://github.com/pcbsd/freebsd/commit/56573b50a653966ac9e8142886a52014c68654fa
  Author: des <des at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M usr.sbin/unbound/local-setup/local-unbound-setup.sh

  Log Message:
  -----------
  Ensure that resolvconf(8) preserves the edns0 setting.

Approved by:	re (blanket)


  Commit: d232e740fa1fdf064d937d9d03973d715bcb27f7
      https://github.com/pcbsd/freebsd/commit/d232e740fa1fdf064d937d9d03973d715bcb27f7
  Author: glebius <glebius at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M usr.sbin/arp/arp.c

  Log Message:
  -----------
  Fix coredump on 'arp -d'.

Submitted by:	az
Approved by:	re (kib)


  Commit: 883625cd6610a9c86c5a3f649bd38259ad602ad3
      https://github.com/pcbsd/freebsd/commit/883625cd6610a9c86c5a3f649bd38259ad602ad3
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M sys/cam/ctl/ctl_frontend_iscsi.c
    M sys/dev/iscsi/iscsi.c

  Log Message:
  -----------
  Don't use M_WAITOK when running from context where sleeping is prohibited,
such as callout or a geom thread.

Approved by:	re (marius)
Sponsored by:	FreeBSD Foundation


  Commit: ff52db8211aeda98e79c8dde663aae3ea5d12dd0
      https://github.com/pcbsd/freebsd/commit/ff52db8211aeda98e79c8dde663aae3ea5d12dd0
  Author: des <des at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M etc/rc.d/local_unbound

  Log Message:
  -----------
  Move local_unbound up in the rc order.

Approved by:	re (blanket)


  Commit: 0f8f840670a0d35203600fb99b86013beb6c00eb
      https://github.com/pcbsd/freebsd/commit/0f8f840670a0d35203600fb99b86013beb6c00eb
  Author: des <des at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M usr.sbin/unbound/local-setup/local-unbound-setup.sh

  Log Message:
  -----------
  Prevent resolvconf from updating /etc/resolv.conf.  As Jakob Schlyter
pointed out, having additional nameservers listed in /etc/resolv.conf
can break DNSSEC verification by providing a false positive if unbound
returns SERVFAIL due to an invalid signature.  The downside is that
the domain / search path won't get updated either, but we can live
with that.

Approved by:	re (blanket)


  Commit: 776b37339a65f1d3c5e391cfb0a70be9e7754a18
      https://github.com/pcbsd/freebsd/commit/776b37339a65f1d3c5e391cfb0a70be9e7754a18
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M sys/amd64/amd64/vm_machdep.c
    M sys/i386/i386/vm_machdep.c

  Log Message:
  -----------
  Free both KVA and backing pages when freeing TSS memory.

Reported and tested by:	pho
Sponsored by:	The FreeBSD Foundation
Approved by:	re (marius)


  Commit: 6d86a0080bfdac11278fa40273e50920072f74df
      https://github.com/pcbsd/freebsd/commit/6d86a0080bfdac11278fa40273e50920072f74df
  Author: hiren <hiren at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M share/man/man4/netmap.4

  Log Message:
  -----------
  Correcting EXAMPLES section.

Approved by:	re (gjb)


  Commit: 476b7e3d43eadb9adc07587cb47ade03d7fc6f22
      https://github.com/pcbsd/freebsd/commit/476b7e3d43eadb9adc07587cb47ade03d7fc6f22
  Author: des <des at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M crypto/openssh/FREEBSD-upgrade
    M crypto/openssh/config.h
    A crypto/openssh/freebsd-configure.sh
    A crypto/openssh/krb5_config.h
    M crypto/openssh/ssh-gss.h
    M crypto/openssh/sshd.c
    M secure/lib/libssh/Makefile
    M secure/usr.bin/ssh/Makefile
    M secure/usr.sbin/sshd/Makefile

  Log Message:
  -----------
  Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a
repeat performance by introducing a script that runs configure with and
without Kerberos, diffs the result and generates krb5_config.h, which
contains the preprocessor macros that need to be defined in the Kerberos
case and undefined otherwise.

Approved by:	re (marius)


  Commit: 9f82ff2278980f33d887a2bdcbf1ad255fec1596
      https://github.com/pcbsd/freebsd/commit/9f82ff2278980f33d887a2bdcbf1ad255fec1596
  Author: danilo <danilo at FreeBSD.org>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M share/misc/committers-ports.dot
    M usr.bin/calendar/calendars/calendar.freebsd

  Log Message:
  -----------
  - Add myself as port commiter and my mentors relationship.
- Add myself to calendar.freebsd.

Approved by:	re (gjb), wg (mentor)


  Commit: a836e0c53672e740737d2dff33568f7a0bf2974e
      https://github.com/pcbsd/freebsd/commit/a836e0c53672e740737d2dff33568f7a0bf2974e
  Author: mav <mav at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/kern/kern_synch.c

  Log Message:
  -----------
  Make load average sampling asynchronous to hardclock ticks. This improves
measurement of load caused by time-related events still using hardclock.
For example, without this change dummynet, scheduling events each hardclock
tick, was always miscounted as load of 1.

There is still aliasing with events delayed by the new precision mechanism,
but it probably can't be avoided without moving this sampling from using
callout to some lower-level code or handling it in some other special way.

Reviewed by:	davide
Approved by:	re (marius)


  Commit: 22453ebd122d5a687b8a4239b30e6f9e5f2a93aa
      https://github.com/pcbsd/freebsd/commit/22453ebd122d5a687b8a4239b30e6f9e5f2a93aa
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/cam/ctl/ctl_frontend_iscsi.c

  Log Message:
  -----------
  Fix a few instances of M_WAITOK in threads marked as prohibited from sleep,
missed in r255824.

Approved by:	re (kib)
Sponsored by:	FreeBSD Foundation


  Commit: 7a2a1b7d7f1a93ffbde01c1c61c298ca15551f29
      https://github.com/pcbsd/freebsd/commit/7a2a1b7d7f1a93ffbde01c1c61c298ca15551f29
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M contrib/unbound/configure.ac
    M contrib/unbound/daemon/unbound.c

  Log Message:
  -----------
  Don't include the build date or command-line arguments in the binary.

Approved by:	re (blanket)


  Commit: da61ec806e58e60524a61f2f08184282e4120dfb
      https://github.com/pcbsd/freebsd/commit/da61ec806e58e60524a61f2f08184282e4120dfb
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M contrib/unbound/freebsd-configure.sh

  Log Message:
  -----------
  Regenerate the configure script before running it.
Set the default config file to /var/unbound/unbound.conf.

Approved by:	re (blanket)


  Commit: 384b4d5caeff301bc6b680c639a19887868bc3cf
      https://github.com/pcbsd/freebsd/commit/384b4d5caeff301bc6b680c639a19887868bc3cf
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M contrib/unbound/config.h
    M contrib/unbound/config.h.in
    M contrib/unbound/configure
    M contrib/unbound/doc/unbound-checkconf.8
    M contrib/unbound/doc/unbound-control.8
    M contrib/unbound/doc/unbound.8
    M contrib/unbound/doc/unbound.conf.5

  Log Message:
  -----------
  Regenerate

Approved by:	re (blanket)


  Commit: 3e7c9aa8a8fce25c081b8af1b5698b9ad8eb4891
      https://github.com/pcbsd/freebsd/commit/3e7c9aa8a8fce25c081b8af1b5698b9ad8eb4891
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M etc/Makefile
    M etc/mtree/BSD.root.dist

  Log Message:
  -----------
  Replace the unused /etc/unbound directory with a symlink to /var/unbound.

Approved by:	re (blanket)


  Commit: 1f2c9d2f151b16756e44d66eae8539c76972567d
      https://github.com/pcbsd/freebsd/commit/1f2c9d2f151b16756e44d66eae8539c76972567d
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M etc/rc.d/NETWORKING

  Log Message:
  -----------
  Forgotten in r255825: NETWORKING requires local_unbound.

Approved by:	re (blanket)


  Commit: 2346155b1e1ec03137ae64ce08cfe2d7803df47e
      https://github.com/pcbsd/freebsd/commit/2346155b1e1ec03137ae64ce08cfe2d7803df47e
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/amd64/amd64/vm_machdep.c

  Log Message:
  -----------
  Ensure that the ERESTART return from the syscall reloads the
registers, to make the restarted syscall instruction pass the correct
arguments.

PR:	kern/182161
Reported by:	Russ Cox <rsc at swtch.com>
Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Approved by:	re (marius)


  Commit: 28393634c52c62351cee5193ebe7cb3b9a86117f
      https://github.com/pcbsd/freebsd/commit/28393634c52c62351cee5193ebe7cb3b9a86117f
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/amd64/amd64/pmap.c

  Log Message:
  -----------
  Use the pv lists generation count to read-lock the pvh_global_lock in
pmap_clear_modify().

Noted and reviewed by:	alc
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
Approved by:	re (marius)


  Commit: 02a8f348b2807034c78dfee797d2e3a2c775d7d8
      https://github.com/pcbsd/freebsd/commit/02a8f348b2807034c78dfee797d2e3a2c775d7d8
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/cam/ctl/ctl_frontend_iscsi.c

  Log Message:
  -----------
  Properly ignore PDUs with CmdSN outside of allowed range.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation


  Commit: 8e50b328e4ddad34b88719c05a56867515ac46c0
      https://github.com/pcbsd/freebsd/commit/8e50b328e4ddad34b88719c05a56867515ac46c0
  Author: kib <kib at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/amd64/amd64/pmap.c

  Log Message:
  -----------
  In pmap_clear_modify(), initialize pvh even for fictitious managed
page, otherwise the small mappings loop would use uninitialized value.
Note that currently pmap_clear_modify() is not called for fictitious
pages.

Sponsored by:	The FreeBSD Foundation
Approved by:	re (glebius)


  Commit: 044043195e064e5fe04e76fcf6ad9d4665bea3b4
      https://github.com/pcbsd/freebsd/commit/044043195e064e5fe04e76fcf6ad9d4665bea3b4
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M share/mk/bsd.own.mk
    R tools/build/options/WITHOUT_BIND
    A tools/build/options/WITHOUT_LDNS_UTILS
    A tools/build/options/WITH_BIND
    R tools/build/options/WITH_LDNS_UTILS

  Log Message:
  -----------
  Flip the switch: disable BIND and enable LDNS_UTILS.

Approved by:	re (blanket)


  Commit: 8a88ce9ab8eb02eeeb3167855ff0ac0f381dad7e
      https://github.com/pcbsd/freebsd/commit/8a88ce9ab8eb02eeeb3167855ff0ac0f381dad7e
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M share/man/man5/src.conf.5

  Log Message:
  -----------
  Regenerate.

Approved by:	re (blanket)


  Commit: 6633bf70ed24c304037f64ca2f28e6ea8d2a0b47
      https://github.com/pcbsd/freebsd/commit/6633bf70ed24c304037f64ca2f28e6ea8d2a0b47
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M contrib/dialog/CHANGES
    M contrib/dialog/VERSION
    M contrib/dialog/aclocal.m4
    M contrib/dialog/arrows.c
    M contrib/dialog/buildlist.c
    M contrib/dialog/checklist.c
    M contrib/dialog/config.guess
    M contrib/dialog/config.sub
    M contrib/dialog/configure
    M contrib/dialog/configure.in
    M contrib/dialog/dialog.1
    M contrib/dialog/dialog.3
    M contrib/dialog/dialog.c
    M contrib/dialog/dialog.h
    M contrib/dialog/formbox.c
    M contrib/dialog/guage.c
    M contrib/dialog/inputstr.c
    M contrib/dialog/makefile.in
    M contrib/dialog/menubox.c
    M contrib/dialog/mixedform.c
    M contrib/dialog/package/debian/changelog
    M contrib/dialog/package/debian/copyright
    M contrib/dialog/package/dialog.spec
    A contrib/dialog/package/freebsd/Makefile
    A contrib/dialog/package/freebsd/distinfo
    A contrib/dialog/package/freebsd/pkg-descr
    A contrib/dialog/package/freebsd/pkg-plist
    A contrib/dialog/po/fa.po
    M contrib/dialog/po/lt.po
    M contrib/dialog/samples/inputbox6-utf8
    M contrib/dialog/samples/report-tempfile
    M contrib/dialog/treeview.c
    M contrib/dialog/util.c
    M gnu/lib/libdialog/dlg_config.h

  Log Message:
  -----------
  Update dialog to 1.2-20130923.

Approved by:	re (marius)


  Commit: 108b7070e7a17abc52f44f333ba095f8f0eafc3a
      https://github.com/pcbsd/freebsd/commit/108b7070e7a17abc52f44f333ba095f8f0eafc3a
  Author: scottl <scottl at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/cam/cam.h
    M sys/cam/cam_ccb.h
    M sys/cam/cam_compat.c
    M sys/cam/cam_compat.h
    M sys/cam/cam_xpt.c
    M sys/cam/scsi/scsi_pass.c
    M sys/dev/asr/asr.c
    M sys/dev/firewire/sbp.c
    M sys/dev/hpt27xx/hpt27xx_osm_bsd.c
    M sys/dev/hpt27xx/os_bsd.h
    M sys/dev/hptiop/hptiop.c
    M sys/dev/hptiop/hptiop.h
    M sys/dev/hptmv/entry.c
    M sys/dev/hptmv/osbsd.h
    M sys/dev/hptnr/hptnr_osm_bsd.c
    M sys/dev/hptnr/os_bsd.h
    M sys/dev/hptrr/hptrr_osm_bsd.c
    M sys/dev/hptrr/os_bsd.h
    M sys/dev/iir/iir.c
    M sys/dev/iir/iir.h
    M sys/dev/tws/tws.c
    M sys/dev/tws/tws_cam.c

  Log Message:
  -----------
  Update the CAM API for FreeBSD 10:

- Remove the timeout_ch field.  It's been deprecated since FreeBSD 7.0;
  MPSAFE drivers should be managing their own timeout storage.  The
  remaining non-MPSAFE drivers have been modified to also manage their own
  storage, and should be considered for updating to MPSAFE (or removal)
  during the FreeBSD 10.x lifecycle.

- Add fields related to soft timeouts and quality of service, to be used
  in upcoming work.

- Add room for more flags in the CCB header and path_inq structures.

- Begin support for extended 64-bit LUNs.

- Bump the CAM version number to 0x18, but add compat shims.  Tested with
  camcontrol and smartctl.

Reviewed by:    nathanw, ken, kib
Approved by:    re
Obtained from:  Netflix


  Commit: 2fecc5b1b4b5378db1a269f3b4e8bdf078b6787f
      https://github.com/pcbsd/freebsd/commit/2fecc5b1b4b5378db1a269f3b4e8bdf078b6787f
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update head/ to -ALPHA3.
This commit marks the point the final KBI change was made as part of the
10.0-RELEASE cycle.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


  Commit: d3e442de8589dadbe7ff361f4c6929d31ecb5272
      https://github.com/pcbsd/freebsd/commit/d3e442de8589dadbe7ff361f4c6929d31ecb5272
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/dev/iscsi_initiator/iscsi.c

  Log Message:
  -----------
  Improve error handling in the old initiator, preventing panic on attempt
to load iscsi_initiator.ko when iscsi.ko is already loaded.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation


  Commit: 669071cdb3ab52c65996b09f3623ca355e8ac005
      https://github.com/pcbsd/freebsd/commit/669071cdb3ab52c65996b09f3623ca355e8ac005
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/dev/iscsi/iscsi.c

  Log Message:
  -----------
  As it turns out, when MOD_LOAD handler returns error, kernel calls MOD_UNLOAD
handler.  Make the new iSCSI initiator not panic when this happens.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation


  Commit: b23486b24466dd2035799adb12dacdeaae033bce
      https://github.com/pcbsd/freebsd/commit/b23486b24466dd2035799adb12dacdeaae033bce
  Author: jhb <jhb at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  Don't parse NO_ROOT metadata for extra kernels if NO_ROOT isn't defined.

Approved by:	re (gjb)
MFC after:	1 week


  Commit: 140807754ca23ee872ee1217e4a66c347b7885f0
      https://github.com/pcbsd/freebsd/commit/140807754ca23ee872ee1217e4a66c347b7885f0
  Author: des <des at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/geom/geom_int.h
    M sys/geom/geom_kern.c
    M sys/geom/geom_subr.c

  Log Message:
  -----------
  Introduce a kern.geom.notaste sysctl that can be used to temporarily
disable GEOM tasting to avoid the "bouncing GEOM" problem where, when
you shut down the consumer of a provider which can be viewed in multiple
ways (typically a mirror whose members are labeled partitions), GEOM
will immediately taste that provider's alter ego and reattach the
consumer.

Approved by:	re (glebius)


  Commit: 85074aa18eb69e2ea599def9d5b8a5bbb5addf8b
      https://github.com/pcbsd/freebsd/commit/85074aa18eb69e2ea599def9d5b8a5bbb5addf8b
  Author: joel <joel at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M share/man/man4/bxe.4

  Log Message:
  -----------
  Minor mdoc fixes.

Approved by:	re (blanket)


  Commit: d965f28ba1171a60f27bd8b0e21de9412e2640f2
      https://github.com/pcbsd/freebsd/commit/d965f28ba1171a60f27bd8b0e21de9412e2640f2
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/cam/cam.h
    M sys/cam/cam_ccb.h
    M sys/cam/cam_compat.c
    M sys/cam/cam_compat.h
    M sys/cam/cam_xpt.c
    M sys/cam/scsi/scsi_pass.c
    M sys/dev/asr/asr.c
    M sys/dev/firewire/sbp.c
    M sys/dev/hpt27xx/hpt27xx_osm_bsd.c
    M sys/dev/hpt27xx/os_bsd.h
    M sys/dev/hptiop/hptiop.c
    M sys/dev/hptiop/hptiop.h
    M sys/dev/hptmv/entry.c
    M sys/dev/hptmv/osbsd.h
    M sys/dev/hptnr/hptnr_osm_bsd.c
    M sys/dev/hptnr/os_bsd.h
    M sys/dev/hptrr/hptrr_osm_bsd.c
    M sys/dev/hptrr/os_bsd.h
    M sys/dev/iir/iir.c
    M sys/dev/iir/iir.h
    M sys/dev/tws/tws.c
    M sys/dev/tws/tws_cam.c

  Log Message:
  -----------
  Revert r255853 pending fixes to build errors in usr.bin/kdump

Approved by:	re (implicit)


  Commit: 903f65948b7ea2da43e3376963ac490985695832
      https://github.com/pcbsd/freebsd/commit/903f65948b7ea2da43e3376963ac490985695832
  Author: jmg <jmg at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/fs/cd9660/cd9660_vfsops.c

  Log Message:
  -----------
  fix a bug where we access a bread buffer after we have brelse'd it...
The kernel normally didn't unmap/context switch away before we accessed
the buffer most of the time, but under heavy I/O pressure and lots of
mount/unmounting this would cause a fault on nofault panic...

Reviewed by:	dteske
Approved by:	re (kib)
Sponsored by:	Vicor
MFC after:	3 days


  Commit: 244d5cfa888ce4ebbf71aa49a4dfe0ca293be27c
      https://github.com/pcbsd/freebsd/commit/244d5cfa888ce4ebbf71aa49a4dfe0ca293be27c
  Author: jmg <jmg at FreeBSD.org>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M sys/fs/cd9660/cd9660_vfsops.c

  Log Message:
  -----------
  NULL stale pointers (should be a no-op as they should no longer be
used)...

Reviewed by:	dteske
Approved by:	re (kib)
Sponsored by:	Vicor
MFC after:	3 days


  Commit: 29d161240ea3c6786da8eaac6f6e04b60a3b2316
      https://github.com/pcbsd/freebsd/commit/29d161240ea3c6786da8eaac6f6e04b60a3b2316
  Author: attilio <attilio at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M sys/kern/kern_descrip.c

  Log Message:
  -----------
  Avoid memory accesses reordering which can result in fget_unlocked()
seeing a stale fd_ofiles table once fd_nfiles is already updated,
resulting in OOB accesses.

Approved by:	re (kib)
Sponsored by:	EMC / Isilon storage division
Reported and tested by:	pho
Reviewed by:	benno


  Commit: 43aa8edf2f0a0f0b75805747a784a6700d6903a4
      https://github.com/pcbsd/freebsd/commit/43aa8edf2f0a0f0b75805747a784a6700d6903a4
  Author: ambrisko <ambrisko at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M sys/dev/mfi/mfi_pci.c

  Log Message:
  -----------
  Add PCI device ID for MegaRAID Invader cards.  This was the only
change needed to make it work on my card.

Approved by:	re (glebius)


  Commit: e2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4
      https://github.com/pcbsd/freebsd/commit/e2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4
  Author: scottl <scottl at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M sys/cam/cam.h
    M sys/cam/cam_ccb.h
    M sys/cam/cam_compat.c
    M sys/cam/cam_compat.h
    M sys/cam/cam_xpt.c
    M sys/cam/scsi/scsi_pass.c

  Log Message:
  -----------
  Re-do r255853.  Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there.  There are no user-servicable parts in there, so
no need for those tools to be groping around in there.

Approved by:	re


  Commit: e9cc92746f45b2e0ad6e2997f3128b950e702770
      https://github.com/pcbsd/freebsd/commit/e9cc92746f45b2e0ad6e2997f3128b950e702770
  Author: scottl <scottl at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M sys/dev/asr/asr.c
    M sys/dev/firewire/sbp.c
    M sys/dev/hpt27xx/hpt27xx_osm_bsd.c
    M sys/dev/hpt27xx/os_bsd.h
    M sys/dev/hptiop/hptiop.c
    M sys/dev/hptiop/hptiop.h
    M sys/dev/hptmv/entry.c
    M sys/dev/hptmv/osbsd.h
    M sys/dev/hptnr/hptnr_osm_bsd.c
    M sys/dev/hptnr/os_bsd.h
    M sys/dev/hptrr/hptrr_osm_bsd.c
    M sys/dev/hptrr/os_bsd.h
    M sys/dev/iir/iir.c
    M sys/dev/iir/iir.h
    M sys/dev/tws/tws.c
    M sys/dev/tws/tws_cam.c

  Log Message:
  -----------
  Re-do r255853.  Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there.  There are no user-servicable parts in there, so
no need for those tools to be groping around in there.

Approved by:    re


  Commit: 1ec3e374fb372ff7b1a6e5008404e8fa4d1fe765
      https://github.com/pcbsd/freebsd/commit/1ec3e374fb372ff7b1a6e5008404e8fa4d1fe765
  Author: des <des at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M tools/build/mk/OptionalObsoleteFiles.inc

  Log Message:
  -----------
  Additional BIND files.

Submitted by:	bdrewery
Approved by:	re (blanket)


  Commit: 2fca78e125311d5ffee83d40488c276c68389546
      https://github.com/pcbsd/freebsd/commit/2fca78e125311d5ffee83d40488c276c68389546
  Author: delphij <delphij at FreeBSD.org>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M contrib/bind9/bin/dig/nslookup.c
    M contrib/bind9/bin/nsupdate/nsupdate.c

  Log Message:
  -----------
  Correct a NULL pointer deference in nslookup and nsupdate that would
cause the utility to crash in interactive mode when the user gives
an EOF on standard input.

MFC after:	3 days
Approved by:	re (gjb)


  Commit: 9439877e985eb4df023ef814794a47111ca4d892
      https://github.com/pcbsd/freebsd/commit/9439877e985eb4df023ef814794a47111ca4d892
  Author: andrew <andrew at FreeBSD.org>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M contrib/binutils/binutils/readelf.c
    M contrib/binutils/include/elf/common.h
    M lib/csu/arm/crt1.c
    M lib/csu/common/notes.h

  Log Message:
  -----------
  Add an elf note on ARM to store the MACHINE_ARCH an executable was built
for. This is useful for software needing to know which architecture a
binary is built for as arm and armv6 have slight differences meaning only
some binaries build for one will work as expected on the other. It is
expected pkgng will be able to make use of this to simplify the logic to
determine which package ABI to use.

Approved by:	re (kib)


  Commit: b72a651a1d4d095db2941a933ce0350d23d7028e
      https://github.com/pcbsd/freebsd/commit/b72a651a1d4d095db2941a933ce0350d23d7028e
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M Makefile
    M Makefile.inc1
    M contrib/bind9/bin/dig/nslookup.c
    M contrib/bind9/bin/nsupdate/nsupdate.c
    M contrib/binutils/binutils/readelf.c
    M contrib/binutils/include/elf/common.h
    M contrib/dialog/CHANGES
    M contrib/dialog/VERSION
    M contrib/dialog/aclocal.m4
    M contrib/dialog/arrows.c
    M contrib/dialog/buildlist.c
    M contrib/dialog/checklist.c
    M contrib/dialog/config.guess
    M contrib/dialog/config.sub
    M contrib/dialog/configure
    M contrib/dialog/configure.in
    M contrib/dialog/dialog.1
    M contrib/dialog/dialog.3
    M contrib/dialog/dialog.c
    M contrib/dialog/dialog.h
    M contrib/dialog/formbox.c
    M contrib/dialog/guage.c
    M contrib/dialog/inputstr.c
    M contrib/dialog/makefile.in
    M contrib/dialog/menubox.c
    M contrib/dialog/mixedform.c
    M contrib/dialog/package/debian/changelog
    M contrib/dialog/package/debian/copyright
    M contrib/dialog/package/dialog.spec
    A contrib/dialog/package/freebsd/Makefile
    A contrib/dialog/package/freebsd/distinfo
    A contrib/dialog/package/freebsd/pkg-descr
    A contrib/dialog/package/freebsd/pkg-plist
    A contrib/dialog/po/fa.po
    M contrib/dialog/po/lt.po
    M contrib/dialog/samples/inputbox6-utf8
    M contrib/dialog/samples/report-tempfile
    M contrib/dialog/treeview.c
    M contrib/dialog/util.c
    A contrib/ldns/drill/config.h
    A contrib/ldns/drill/drill.1
    M contrib/libcxxrt/libelftc_dem_gnu3.c
    M contrib/libcxxrt/typeinfo.cc
    M contrib/libcxxrt/unwind-itanium.h
    M contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    M contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
    M contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
    M contrib/unbound/config.h
    M contrib/unbound/config.h.in
    M contrib/unbound/configure
    M contrib/unbound/configure.ac
    M contrib/unbound/daemon/unbound.c
    M contrib/unbound/doc/unbound-checkconf.8
    M contrib/unbound/doc/unbound-control.8
    M contrib/unbound/doc/unbound.8
    M contrib/unbound/doc/unbound.conf.5
    M contrib/unbound/freebsd-configure.sh
    M contrib/unbound/freebsd-sources.pl
    M contrib/unbound/util/configparser.h
    M crypto/openssh/FREEBSD-upgrade
    M crypto/openssh/config.h
    A crypto/openssh/freebsd-configure.sh
    A crypto/openssh/krb5_config.h
    M crypto/openssh/ssh-gss.h
    M crypto/openssh/sshd.c
    M etc/Makefile
    M etc/defaults/rc.conf
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.var.dist
    M etc/rc.d/Makefile
    M etc/rc.d/NETWORKING
    A etc/rc.d/local_unbound
    M etc/rc.subr
    M gnu/lib/libdialog/dlg_config.h
    M include/Makefile
    M lib/csu/arm/crt1.c
    M lib/csu/common/notes.h
    M secure/lib/libssh/Makefile
    M secure/usr.bin/ssh/Makefile
    M secure/usr.sbin/sshd/Makefile
    M share/man/man4/bxe.4
    M share/man/man4/netmap.4
    M share/man/man5/rc.conf.5
    M share/man/man5/src.conf.5
    M share/man/man8/rc.8
    M share/man/man8/rc.subr.8
    M share/misc/committers-ports.dot
    M share/mk/bsd.own.mk
    M sys/amd64/amd64/pmap.c
    M sys/amd64/amd64/vm_machdep.c
    M sys/arm/arm/vm_machdep.c
    M sys/arm/broadcom/bcm2835/bcm2835_systimer.c
    M sys/cam/cam.h
    M sys/cam/cam_ccb.h
    M sys/cam/cam_compat.c
    M sys/cam/cam_compat.h
    M sys/cam/cam_xpt.c
    M sys/cam/ctl/ctl_frontend_iscsi.c
    M sys/cam/scsi/scsi_pass.c
    M sys/dev/asr/asr.c
    M sys/dev/firewire/sbp.c
    M sys/dev/hpt27xx/hpt27xx_osm_bsd.c
    M sys/dev/hpt27xx/os_bsd.h
    M sys/dev/hptiop/hptiop.c
    M sys/dev/hptiop/hptiop.h
    M sys/dev/hptmv/entry.c
    M sys/dev/hptmv/osbsd.h
    M sys/dev/hptnr/hptnr_osm_bsd.c
    M sys/dev/hptnr/os_bsd.h
    M sys/dev/hptrr/hptrr_osm_bsd.c
    M sys/dev/hptrr/os_bsd.h
    M sys/dev/iir/iir.c
    M sys/dev/iir/iir.h
    M sys/dev/iscsi/iscsi.c
    M sys/dev/iscsi_initiator/iscsi.c
    M sys/dev/mfi/mfi_pci.c
    M sys/dev/mfi/mfireg.h
    M sys/dev/tws/tws.c
    M sys/dev/tws/tws_cam.c
    M sys/fs/cd9660/cd9660_vfsops.c
    M sys/geom/geom_int.h
    M sys/geom/geom_kern.c
    M sys/geom/geom_subr.c
    M sys/i386/i386/vm_machdep.c
    M sys/i386/include/xen/xenvar.h
    M sys/kern/kern_descrip.c
    M sys/kern/kern_event.c
    M sys/kern/kern_rwlock.c
    M sys/kern/kern_sx.c
    M sys/kern/kern_synch.c
    M sys/kern/subr_sbuf.c
    M sys/kern/subr_smp.c
    M sys/kern/uipc_syscalls.c
    M sys/mips/mips/vm_machdep.c
    M sys/netinet6/frag6.c
    M sys/powerpc/aim/vm_machdep.c
    M sys/powerpc/booke/vm_machdep.c
    M sys/sparc64/sparc64/vm_machdep.c
    M sys/sys/sf_buf.h
    M sys/vm/vm_map.c
    M tools/build/mk/OptionalObsoleteFiles.inc
    R tools/build/options/WITHOUT_BIND
    A tools/build/options/WITHOUT_LDNS_UTILS
    A tools/build/options/WITH_BIND
    R tools/build/options/WITH_LDNS_UTILS
    M usr.bin/Makefile
    M usr.bin/calendar/calendars/calendar.freebsd
    A usr.bin/drill/Makefile
    M usr.sbin/arp/arp.c
    M usr.sbin/bsdconfig/examples/Makefile
    R usr.sbin/bsdconfig/examples/browse_packages.sh
    A usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
    A usr.sbin/bsdconfig/examples/browse_packages_http.sh
    M usr.sbin/bsdconfig/share/media/http.subr
    M usr.sbin/bsdinstall/partedit/gpart_ops.c
    M usr.sbin/bsdinstall/partedit/partedit_powerpc.c
    M usr.sbin/unbound/Makefile
    A usr.sbin/unbound/local-setup/Makefile
    A usr.sbin/unbound/local-setup/local-unbound-setup.sh

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/freebsd/freebsd

Conflicts:
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/d7e1bd6e0195...b72a651a1d4d


More information about the Commits mailing list