Permalink
Browse files

Merge branch 'stable/10' of github.com:pcbsd/freebsd into stable/10

  • Loading branch information...
2 parents d13262e + e3393d7 commit dbff34bea47c6fc0362836208a898436e57b806e @kmoore134 kmoore134 committed Oct 25, 2013
Showing with 3,190 additions and 1,554 deletions.
  1. +27 −1 ObsoleteFiles.inc
  2. +1 −16 UPDATING
  3. +1 −1 bin/freebsd-version/freebsd-version.sh.in
  4. +2 −0 contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
  5. +0 −3 etc/Makefile
  6. +0 −12 etc/atf/FreeBSD.conf
  7. +0 −39 etc/atf/Makefile
  8. +0 −12 etc/atf/common.conf
  9. +2 −1 etc/defaults/rc.conf
  10. +0 −1 etc/ftpusers
  11. +0 −1 etc/group
  12. +0 −1 etc/master.passwd
  13. +0 −2 etc/mtree/BSD.root.dist
  14. +0 −10 etc/mtree/BSD.usr.dist
  15. +6 −34 etc/rc.d/initrandom
  16. +2 −3 etc/rc.d/jail
  17. +1 −1 lib/clang/clang.build.mk
  18. +1 −1 lib/libcrypt/tests/crypt_tests.c
  19. +2 −2 sbin/camcontrol/modeedit.c
  20. +1 −8 share/Makefile
  21. +0 −37 share/atf/Makefile
  22. +0 −3 share/examples/Makefile
  23. +0 −39 share/examples/atf/Makefile
  24. +24 −17 share/examples/kld/random_adaptor/random_adaptor_example.c
  25. +55 −66 share/man/man4/random.4
  26. +0 −7 share/man/man5/Makefile
  27. +5 −4 share/man/man5/rc.conf.5
  28. +0 −13 share/man/man7/Makefile
  29. +1 −1 share/misc/bsd-family-tree
  30. +0 −94 share/mk/atf.test.mk
  31. +1 −1 share/syscons/keymaps/INDEX.keymaps
  32. +0 −36 share/xml/Makefile
  33. +0 −39 share/xml/atf/Makefile
  34. +0 −36 share/xsl/Makefile
  35. +0 −30 share/xsl/Makefile.inc
  36. +0 −39 share/xsl/atf/Makefile
  37. +4 −3 sys/amd64/conf/GENERIC
  38. +3 −0 sys/arm/versatile/versatile_pci.c
  39. +11 −0 sys/boot/forth/loader.conf
  40. +5 −0 sys/conf/NOTES
  41. +5 −3 sys/conf/files
  42. +2 −2 sys/conf/files.amd64
  43. +2 −2 sys/conf/files.i386
  44. +2 −2 sys/conf/newvers.sh
  45. +6 −0 sys/conf/options
  46. +1 −1 sys/dev/ata/ata-all.c
  47. +1 −1 sys/dev/ata/ata-card.c
  48. +25 −13 sys/dev/bxe/bxe.c
  49. +11 −0 sys/dev/bxe/bxe_stats.c
  50. +7 −2 sys/dev/bxe/ecore_sp.h
  51. +1 −0 sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  52. +1 −1 sys/dev/glxsb/glxsb.c
  53. +1 −1 sys/dev/hifn/hifn7751.c
  54. +3 −0 sys/dev/hyperv/include/hyperv.h
  55. +4 −0 sys/dev/hyperv/netvsc/hv_net_vsc.h
  56. +82 −19 sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  57. +8 −22 sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
  58. +8 −8 sys/dev/hyperv/vmbus/hv_channel.c
  59. +45 −46 sys/dev/random/{pseudo_rng.c → dummy_rng.c}
  60. +5 −7 sys/dev/random/harvest.c
  61. +5 −0 sys/dev/random/hash.h
  62. +43 −44 sys/dev/random/ivy.c
  63. +195 −0 sys/dev/random/live_entropy_sources.c
  64. +60 −0 sys/dev/random/live_entropy_sources.h
  65. +57 −134 sys/dev/random/nehemiah.c
  66. +45 −73 sys/dev/random/random_adaptors.c
  67. +5 −3 sys/dev/random/random_adaptors.h
  68. +138 −67 sys/dev/random/random_harvestq.c
  69. +5 −4 sys/dev/random/random_harvestq.h
  70. +30 −46 sys/dev/random/randomdev.c
  71. +12 −5 sys/dev/random/randomdev.h
  72. +41 −49 sys/dev/random/randomdev_soft.c
  73. +10 −9 sys/dev/random/randomdev_soft.h
  74. +96 −0 sys/dev/random/rwfile.c
  75. +39 −0 sys/dev/random/rwfile.h
  76. +44 −16 sys/dev/random/yarrow.c
  77. +5 −0 sys/dev/random/yarrow.h
  78. +1 −1 sys/dev/rndtest/rndtest.c
  79. +1 −1 sys/dev/safe/safe.c
  80. +1 −1 sys/dev/syscons/scmouse.c
  81. +1 −1 sys/dev/syscons/syscons.c
  82. +1 −1 sys/dev/ubsec/ubsec.c
  83. +1 −1 sys/dev/vmware/vmxnet3/if_vmx.c
  84. +0 −11 sys/dev/vmware/vmxnet3/if_vmxvar.h
  85. +4 −12 sys/i386/conf/GENERIC
  86. +0 −9 sys/ia64/conf/GENERIC
  87. +3 −3 sys/kern/kern_intr.c
  88. +16 −0 sys/kern/subr_bus.c
  89. +1 −6 sys/mips/cavium/octeon_rnd.c
  90. +1 −1 sys/modules/random/Makefile
  91. +1 −1 sys/net/if_ethersubr.c
  92. +1 −1 sys/net/if_tun.c
  93. +1 −1 sys/netgraph/ng_iface.c
  94. +0 −8 sys/powerpc/conf/GENERIC
  95. +0 −8 sys/powerpc/conf/GENERIC64
  96. +0 −9 sys/sparc64/conf/GENERIC
  97. +1 −1 sys/sys/param.h
  98. +11 −3 sys/sys/random.h
  99. +0 −22 tools/build/mk/OptionalObsoleteFiles.inc
  100. +1 −5 usr.bin/atf/Makefile
  101. +0 −2 usr.bin/atf/Makefile.inc
  102. +0 −42 usr.bin/atf/atf-config/Makefile
  103. +0 −42 usr.bin/atf/atf-report/Makefile
  104. +0 −44 usr.bin/atf/atf-run/Makefile
  105. +0 −52 usr.bin/atf/atf-version/Makefile
  106. +47 −5 usr.sbin/bhyve/pci_virtio_block.c
  107. +1 −0 usr.sbin/bsdconfig/include/messages.subr
  108. +3 −2 usr.sbin/bsdconfig/share/Makefile
  109. +104 −17 usr.sbin/bsdconfig/share/device.subr
  110. +8 −7 usr.sbin/bsdconfig/share/dialog.subr
  111. +262 −0 usr.sbin/bsdconfig/share/keymap.subr
  112. +121 −0 usr.sbin/bsdconfig/share/strings.subr
  113. +17 −0 usr.sbin/bsdconfig/share/variable.subr
  114. +2 −0 usr.sbin/bsdinstall/bsdinstall
  115. +5 −1 usr.sbin/bsdinstall/bsdinstall.8
  116. +3 −3 usr.sbin/bsdinstall/scripts/Makefile
  117. +32 −7 usr.sbin/bsdinstall/scripts/auto
  118. +5 −0 usr.sbin/bsdinstall/scripts/config
  119. +3 −4 share/xml/Makefile.inc → usr.sbin/bsdinstall/scripts/entropy
  120. +2 −0 usr.sbin/bsdinstall/scripts/jail
  121. +208 −6 usr.sbin/bsdinstall/scripts/keymap
  122. +9 −3 usr.sbin/bsdinstall/scripts/netconfig
  123. +1 −0 usr.sbin/bsdinstall/scripts/script
  124. +11 −10 usr.sbin/bsdinstall/scripts/services
  125. +1,043 −0 usr.sbin/bsdinstall/scripts/zfsboot
  126. +32 −1 usr.sbin/jail/command.c
  127. +1 −0 usr.sbin/jail/config.c
  128. +15 −5 usr.sbin/jail/jail.8
  129. +2 −0 usr.sbin/jail/jail.c
  130. +1 −0 usr.sbin/jail/jailp.h
View
@@ -38,8 +38,27 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131013: Removal of the ATF tools
+OLD_FILES+=etc/atf/FreeBSD.conf
+OLD_FILES+=etc/atf/atf-run.hooks
+OLD_FILES+=etc/atf/common.conf
+OLD_FILES+=usr/bin/atf-config
+OLD_FILES+=usr/bin/atf-report
+OLD_FILES+=usr/bin/atf-run
+OLD_FILES+=usr/bin/atf-version
+OLD_FILES+=usr/share/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/tests-results.css
+OLD_FILES+=usr/share/man/man1/atf-config.1.gz
+OLD_FILES+=usr/share/man/man1/atf-report.1.gz
+OLD_FILES+=usr/share/man/man1/atf-run.1.gz
+OLD_FILES+=usr/share/man/man1/atf-version.1.gz
+OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
+OLD_FILES+=usr/share/man/man7/atf.7.gz
+OLD_FILES+=usr/share/xml/atf/tests-results.dtd
+OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
# 20131009: freebsd-version moved from /libexec to /bin
-OLD_FILES+=/libexec/freebsd-version
+OLD_FILES+=libexec/freebsd-version
# 20131001: ar and ranlib from binutils not used
OLD_FILES+=usr/bin/gnu-ar
OLD_FILES+=usr/bin/gnu-ranlib
@@ -6093,6 +6112,13 @@ OLD_LIBS+=usr/lib/libkse.so.1
OLD_LIBS+=usr/lib/liblwres.so.3
OLD_LIBS+=usr/lib/pam_ftp.so.2
+# 20131013: Removal of the ATF tools
+OLD_DIRS+=etc/atf
+OLD_DIRS+=usr/share/examples/atf
+OLD_DIRS+=usr/share/xml/atf
+OLD_DIRS+=usr/share/xml
+OLD_DIRS+=usr/share/xsl/atf
+OLD_DIRS+=usr/share/xsl
# 20040925: bind9 import
OLD_DIRS+=usr/share/doc/bind/html
OLD_DIRS+=usr/share/doc/bind/misc
View
@@ -13,24 +13,9 @@ Items affecting the ports and packages system can be found in
NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping
from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
-head, and then rebuild without this option. The bootstrap process from
+stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
- FreeBSD 11.x has many debugging features turned on, in both the kernel
- and userland. These features attempt to detect incorrect use of
- system primitives, and encourage loud failure through extra sanity
- checking and fail stop semantics. They also substantially impact
- system performance. If you want to do performance measurement,
- benchmarking, and optimization, you'll want to turn them off. This
- includes various WITNESS- related kernel options, INVARIANTS, malloc
- debugging flags in userland, and various verbose features in the
- kernel. Many developers choose to disable these features on build
- machines to maximize performance. (To completely disable malloc
- debugging, define MALLOC_PRODUCTION in /etc/make.conf, or to merely
- disable the most expensive debugging functionality run
- "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
-
20131010:
The rc.d/jail script has been updated to support jail(8)
configuration file. The "jail_<jname>_*" rc.conf(5) variables
@@ -81,7 +81,7 @@ userland_version() {
# Print a usage string and exit.
#
usage() {
- echo "usage: $progname [-ku]\n" >&2
+ echo "usage: $progname [-ku]" >&2
exit 1
}
@@ -4,6 +4,8 @@
#undef JEMALLOC_OVERRIDE_VALLOC
+#define MALLOC_PRODUCTION
+
#ifndef MALLOC_PRODUCTION
#define JEMALLOC_DEBUG
#endif
View
@@ -218,9 +218,6 @@ distribution:
echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
) | ${METALOG.add}
.endif
-.if ${MK_ATF} != "no"
- ${_+_}cd ${.CURDIR}/atf; ${MAKE} install
-.endif
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
View
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Configuration file for the FreeBSD test suite.
-#
-# See atf-formats(5) for details on the syntax of this file and tests(7) for
-# details on the FreeBSD test suite.
-#
-
-#variable1 = value1
-#variable2 = value2
View
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 Google, Inc.
-# 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. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-ATF= ${.CURDIR}/../../contrib/atf
-
-.PATH: ${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESGROUPS= ETC
-
-ETCDIR= /etc/atf
-ETC= FreeBSD.conf atf-run.hooks common.conf
-
-.include <bsd.prog.mk>
View
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Sample configuration file for properties affecting all test suites.
-#
-
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks. Set this variable to
-# the user you want to use in those cases. If not set, those tests will
-# be skipped.
-unprivileged-user = "_atf"
View
@@ -604,7 +604,7 @@ lpd_flags="" # Flags to lpd (if enabled).
nscd_enable="NO" # Run the nsswitch caching daemon.
chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd.
chkprintcap_flags="-d" # Create missing directories by default.
-dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
+dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO).
dumpdir="/var/crash" # Directory where crash dumps are to be stored
savecore_flags="-m 10" # Used if dumpdev is enabled above, and present.
# By default, only the 10 most recent kernel dumps
@@ -651,6 +651,7 @@ entropy_save_num="8" # Number of entropy cache files to save.
harvest_interrupt="YES" # Entropy device harvests interrupt randomness
harvest_ethernet="YES" # Entropy device harvests ethernet randomness
harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness
+harvest_swi="YES" # Entropy device harvests internal SWI randomness
dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot
watchdogd_enable="NO" # Start the software watchdog daemon
watchdogd_flags="" # Flags to watchdogd (if enabled)
View
@@ -15,7 +15,6 @@ man
sshd
smmsp
mailnull
-_atf
bind
unbound
proxy
View
@@ -16,7 +16,6 @@ staff:*:20:
sshd:*:22:
smmsp:*:25:
mailnull:*:26:
-_atf:*:27:
guest:*:31:
bind:*:53:
unbound:*:59:
View
@@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
View
@@ -24,8 +24,6 @@
etc
X11
..
- atf
- ..
bluetooth
..
defaults
View
@@ -299,8 +299,6 @@
..
IPv6
..
- atf
- ..
bhyve
..
bootforth
@@ -1410,14 +1408,6 @@
catalog
..
..
- xml
- atf
- ..
- ..
- xsl
- atf
- ..
- ..
zoneinfo
Africa
..
View
@@ -14,26 +14,6 @@ name="initrandom"
start_cmd="initrandom_start"
stop_cmd=":"
-feed_dev_random()
-{
- if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
- cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null
- fi
-}
-
-better_than_nothing()
-{
- # XXX temporary until we can improve the entropy
- # harvesting rate.
- # Entropy below is not great, but better than nothing.
- # This unblocks the generator at startup
- # Note: commands are ordered to cause the most variance across reboots.
- ( kenv; dmesg; df -ib; ps -fauxww; date; sysctl -a ) \
- | dd of=/dev/random bs=8k 2>/dev/null
- /sbin/sha256 -q `sysctl -n kern.bootfile` \
- | dd of=/dev/random bs=8k 2>/dev/null
-}
-
initrandom_start()
{
soft_random_generator=`sysctl kern.random 2>/dev/null`
@@ -63,23 +43,15 @@ initrandom_start()
else
${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null
fi
- fi
- # First pass at reseeding /dev/random.
- #
- case ${entropy_file} in
- [Nn][Oo] | '')
- ;;
- *)
- if [ -w /dev/random ]; then
- feed_dev_random "${entropy_file}"
+ if checkyesno harvest_swi; then
+ ${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null
+ echo -n ' swi'
+ else
+ ${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null
fi
- ;;
- esac
-
- better_than_nothing
+ fi
- echo -n ' kickstart'
fi
echo '.'
View
@@ -226,8 +226,7 @@ parse_options()
eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
if checkyesno jail_${_j}_fdescfs_enable; then
- echo " mount += " \
- "\"fdescfs ${_rootdir%/}/dev/fd fdescfs rw 0 0\";"
+ echo " mount.fdescfs;"
fi
eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}}
if checkyesno jail_${_j}_procfs_enable; then
@@ -438,7 +437,7 @@ jail_start()
echo -n " ${_hostname:-${_jail}}"
else
echo " cannot start jail \"${_hostname:-${jail}}\": "
- tail +2 $_tmp
+ cat $_tmp
fi
rm -f $_tmp
done
View
@@ -6,7 +6,7 @@ CFLAGS+= -I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
-I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \
-I${LLVM_SRCS}/../../lib/clang/include \
-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
- -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
+ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG
.if !defined(EARLY_BUILD) && defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no"
CFLAGS+= -DCLANG_ENABLE_ARCMT \
@@ -43,7 +43,7 @@ ATF_TC_BODY(invalid, tc)
/*
* This function must not do anything except enumerate
- * the test cases, else atf-run is likely to be upset.
+ * the test cases, per atf-c-api(3).
*/
ATF_TP_ADD_TCS(tp)
{
@@ -886,12 +886,12 @@ mode_list(struct cam_device *device, int page_control, int dbd,
timeout, data, sizeof(data));
mh = (struct scsi_mode_header_6 *)data;
- len = mh->blk_desc_len; /* Skip block descriptors. */
+ len = sizeof(*mh) + mh->blk_desc_len; /* Skip block descriptors. */
/* Iterate through the pages in the reply. */
while (len < mh->data_length) {
/* Locate the next mode page header. */
mph = (struct scsi_mode_page_header *)
- ((intptr_t)mh + sizeof(*mh) + len);
+ ((intptr_t)mh + len);
mph->page_code &= SMS_PAGE_CODE;
nameentry = nameentry_lookup(mph->page_code);
View
@@ -5,8 +5,7 @@
# Do not include `info' in the SUBDIR list, it is handled separately.
-SUBDIR= ${_atf} \
- ${_colldef} \
+SUBDIR= ${_colldef} \
${_dict} \
${_doc} \
dtrace \
@@ -27,16 +26,10 @@ SUBDIR= ${_atf} \
tabset \
termcap \
${_timedef} \
- xml \
- xsl \
${_zoneinfo}
# NB: keep these sorted by MK_* knobs
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_BSNMP} != "no"
_snmp= snmp
.endif
Oops, something went wrong.

0 comments on commit dbff34b

Please sign in to comment.