des [Mon, 31 Mar 2014 14:39:56 +0000 (14:39 +0000)]
MFH (r237568, r255422, r255460, r255766, r255767, r255774, r255829,
r256126, r257954, r261320, r261499, r263691, r263712): upgrade to
OpenSSH 6.6p1 via 6.3p1, 6.4p1 and 6.5p1.
Differences relative to head:
- No DNSSEC support since stable/9 does not have LDNS
- Sandboxing off by default, and uses rlimit instead of Capsicum
- ED25519 moved to the bottom of the order of preference to avoid
"new public key" warnings
ae [Mon, 31 Mar 2014 09:37:11 +0000 (09:37 +0000)]
MFC r263468:
When loader(8) inspects MBR, it chooses GPT as main partition table,
when MBR contains only PMBR entry or it is bootcamp-compatible.
If MBR has PMBR entry and some other, the loader rejects it.
Make these checks to be less strict. If loader decided that PMBR
isn't suitable for GPT, it will use MBR.
dteske [Mon, 31 Mar 2014 01:04:40 +0000 (01:04 +0000)]
MFC revisions 230804,254265,255908,256338,256345,256347-256348,256489,
257842-257845,257872,259115,259143,259276,259468-259469,259572,259686,
260260-260262,260866, and 260900 (25 revisions; summarized below)...
r230804: Fix a whitespace nit (kevlo)
r254265: (recording mergeinfo only)
r255908: Remove the is (Iceland) mirror per mail from the admins (brd)
r256338: Dump 4096 bytes from /dev/random to /entropy (des)
r256345: Rewrite the keymap module
r256347: Detect when an interface is wireless (Warren Block)
r256348: Merge dumpdev into regular services; enable (Allan Jude)
r256489: Add executable bit to docsinstall and entropy scripts
r257842: Performance and debugging enhancements
r257843: Remove ttys(5) munging from previous commit
r257844: Copy install log to deployed /var/log for debugging
r257845: Fixup to last commit
r257872: Doc fixup -- add missing .El (joel)
r259115: Prevent log file from becoming truncated
r259143: Use sed(1) /i instead of /I (eadler)
r259276: Fix `local: Not in a function' error in logfile
r259468: Ignore mouse-release command from VMware
r259469: Mask error from newaliases(1) when hostname not fully qualified
r259572: Fix `rm: /tmp/bsdinstall_etc/fstab: ..." error in logfile
r259686: Move VMware mouse-release solution
r260260: Remove what appears to be a stray debugging printf
r260261: Lower priority of open wireless access policy (gavin)
r260262: Allow bsdinstall to use WPA-Enterprise networks (gavin)
r260866: Fix bad comparison and fix file comment (Christoph Mallon)
r260900: Whitespace and style nits
dim [Sat, 29 Mar 2014 17:18:23 +0000 (17:18 +0000)]
MFC r260880 (by kaiw, from projects/elftoolchain):
* Make die_mem_offset() be able to handle DW_AT_data_member_location
attributes generated by Clang 3.4.
* Document how different compilers generate DW_AT_data_member_location
attributes differently.
* Document the quirks about DW_FORM_data[48].
This is a slightly modified version, adapted to work with the old
libdwarf in stable/9 and stable/10. It should fix DTrace on these
branches, when the kernel is compiled with clang 3.4.
Note that you have to build *and* install the CTF tools first, before
building the kernel. Otherwise you can possibly still get error
messages similar to "failed to copy type of 'pr_uid': Type information
is in parent and unavailable", when attempting to run dtrace(1).
dim [Sat, 29 Mar 2014 11:33:52 +0000 (11:33 +0000)]
MFC r263774:
Revert r263694, and apply a better fix to squelch unnecessary warnings
from clang about possible keywords being treated as identifiers for the
remainder of the translation unit (a.k.a. -Wkeyword-compat), when using
libstdc++ in combination with -Wsystem-headers. This will not only fix
devd, but any C++ program using libstdc++.
asomers [Fri, 28 Mar 2014 15:41:04 +0000 (15:41 +0000)]
MFC r262912
cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
Fix a memory leak in uu_avl_pool_create: pthread_mutex_init without
a corresponding pthread_mutex_destroy. It shows up, among other
places, when doing "zfs list
kib [Fri, 28 Mar 2014 15:38:54 +0000 (15:38 +0000)]
MFC r263475:
Fix two issues with /dev/mem access on amd64, both causing kernel page
faults.
First, for accesses to direct map region should check for the limit by
which direct map is instantiated.
Second, for accesses to the kernel map, use a new thread private flag
TDP_DEVMEMIO, which instructs vm_fault() to return error when fault
happens on the MAP_ENTRY_NOFAULT entry, instead of panicing.
MFC r263498:
Add change forgotten in r263475. Make dmaplimit accessible outside
amd64/pmap.c.
dim [Thu, 27 Mar 2014 20:46:46 +0000 (20:46 +0000)]
MFC r263694:
Apply a temporary band-aid for building devd with clang 3.4, libstdc++
and -Wsystem-headers enabled (which is the default for any non-zero
WARNS level, crazily enough!). This is primarily meant to be MFC'd as
soon as possible.
brueffer [Thu, 27 Mar 2014 20:14:50 +0000 (20:14 +0000)]
MFC: r263121
Re-format the license to conform to our BSD license template as much
as possible. This does not change the wording in any way.
Remove the 3rd clause ("advertising clause") of the BSD license as
permitted by the University of Berkeley on July 22, 1999. While the
clause itself mentions Lawrence Berkeley Laboratory, UCB is the sole
copyright holder of this file.
asomers [Thu, 27 Mar 2014 19:04:15 +0000 (19:04 +0000)]
MFC r258311
opensolaris/uts/common/dtrace/fasttrap.c
Fix several problems that can cause panics on kldload and kldunload.
* kproc_create(fasttrap_pid_cleanup_cb, ...) gets called before
fasttrap_provs.fth_table gets allocated. This can lead to a panic
on module load, because fasttrap_pid_cleanup_cb references
fasttrap_provs.fth_table. Move kproc_create down after the point
that fasttrap_provs.fth_table gets allocated, and modify the error
handling accordingly.
* dtrace_fasttrap_{fork,exec,exit} weren't getting NULLed until
after fasttrap_provs.fth_table got freed. That caused panics on
module unload because fasttrap_exec_exit calls
fasttrap_provider_retire, which references
fasttrap_provs.fth_table. NULL those function pointers earlier.
* There wasn't any code to destroy the
fasttrap_{tpoints,provs,procs}.fth_table mutexes on module unload,
leading to a resource leak when WITNESS is enabled. Destroy those
mutexes during fasttrap_unload().
hselasky [Thu, 27 Mar 2014 07:03:50 +0000 (07:03 +0000)]
MFC r263423:
Try to resolve a possible deadlock when detaching USB devices which
create character devices. The deadlock can happen if an application is
issuing IOCTLs which require USB refcounting, at the same time the USB
device is detaching.
There is already a counter in place in the USB device structure to
detect this situation, but it was not always checked ahead of invoking
functions that might destroy character devices, like detach, set
configuration, set alternate interface or detach active kernel driver.
dteske [Thu, 27 Mar 2014 03:20:47 +0000 (03:20 +0000)]
MFC revisions 253333,256181,256321-256323,256325,256330,256333,256335,
256391,257755-257756,257780-257785,257787-257793,258029,258263,258266,
258355,258360,258400-258401,258406-258407,258418,258430,258439,258458,
258589-258590,258592,258727-258728,258785,259054,260894,260899,262895-
262902,262904,262908-262910,262982,262984,263133-263137,263139,263141,
263144-263150, and (partially) 263249 (76 revisions; summarized below)...
r253333: Re-implement $probe_only aspect of f_media_get_TYPE()
r256181: Centralized [X]dialog(1) exit codes added to `dialog.subr'
r256321: Add support for obtaining the capacity of disks.
r256322: Fix include statements in strings.subr
r256323: Add USE_DIALOG global
r256325: Add keymap.subr
r256330: Fix f_dialog_*_constrain() to support NULL variable arguments
r256333: Fixes and additions to `device.subr'
r256335: Add f_expand_number() (shadowing expand_number(3))
r256391: Fix signed integer overflow detection in f_expand_number()
r257755: Update f_host_lookup() to support SRV records
r257756: Fix spurious error message "f_media_shutdown_http: not found"
r257780: Whitespace
r257781: Make use of f_isset()
r257782: Add DEBUG_INITIALIZE_FILE global boolean
r257783: Add f_show_err() (like f_show_msg() but for errors)
r257784: Add f_eval_catch() for debug and displaying errors automatically
r257785: Fix dialog auto-sizing when running in a pipe-chain
r257787: Fix a silly bug
r257788: Add some helpful debugging
r257789: Comments
r257790: Fix a bug when using printf
r257791: Add f_sprintf() and f_vsprintf()
r257792: Comments
r257793: Fix an off-by-one error
r258029: Comments
r258263: Move function name declarations/usages
r258266: Always shutdown media and don't eject CDROM
r258355: "Tim trailing" -> "Trim Trailing"
r258360: Whitespace, style, sub-shells, and variable names
r258400: Add new `includes' module for exploring the API
r258401: Add `-d' flag [to includes module] for printing function descrs
r258406: Make `-d' flag [of include module] implicitly enable `-f'
r258407: Update function description for f_validate_hostname()
r258418: Quote the interface name for good measure [in device.subr]
r258430: Remove unused line [in device.subr] -- cruft from SVN r258360
r258439: Fix command-line only modules [dot, includes] to not use f_die()
r258458: Improve network device scanning
r258589: Add missing `$' before `pgm' in syscons_ttys module
r258590: Add missing newline [in includes module]
r258592: Sort messages
r258727: Fix display output issue with `includes' module
r258728: Fix [another] display output issue with `includes' module
r258785: Sort function output [from includes module] on name of function
r259054: Performance and debugging enhancements
r260894: Optimize f_expand_number() (submitted by Christoph Mallon)
r260899: Dummy commit
r262895: Allow dispatched reswords to carry arguments
r262896: Add missing local declaration [in common.subr]
r262897: Fix a type in a comment [in common.subr]
r262898: Fix incorrect return status [from f_getvar() in common.subr]
r262899: Make f_show_err() [of common.subr] non-fatal
r262900: Centralize function name [in f_script_load() of script.subr]
r262901: Prevent localization of __number in f_expand_number()
r262902: Add a comment above f_replaceall() [of strings.subr]
r262904: Rewrite groupmgmt -- hooking it into the scripting system
r262908: Change dispatch words from group* to *Group for backward compat
r262909: Fix copy/paste error in a comment [in goupadd module]
r262910: Take a group name on the command-line [of groupdel] if available
r262982: Whitespace [in group_input.subr]
r262984: Remove vestigial global [in group_input.subr]
r263133: Remove extraneous debug statement
r263134: Add debug statement just before attempting to exec a module
r263135: Comments [in device.subr]
r263136: Update copyright
r263137: Fix future namespace issues [in dialog.subr]
r263139: Remove useless NULL strings ('') in some compound strings
r263141: Fix broken f_isinteger() [of strings.subr]
r263144: Fix a code-type that prevented auto-sizing [in group_input.subr]
r263145: Fix comments and whitespace [in new group.subr]
r263146: Reduce dialog sleep cycle for confirmation dialogs [in group.subr]
r263147: Fix bug preventing pw(8) errors from appearing [in group.subr]
r263148: Check arguments when running non-interactive [in group.subr]
r263149: Add i18n input protection [to group.subr and group_input.subr]
r263150: Rewrite usermgmt -- hooking it into the scripting system
r263249: (partial) Add old group_input and user_input to ObsoleteFiles.inc
delphij [Thu, 27 Mar 2014 00:24:48 +0000 (00:24 +0000)]
MFC r262501:
Refresh our implementation of OpenBSD's Blowfish password format.
Notable changes:
- Support of $2b$ password format to address a problem where very
long passwords (more than 256 characters, when an integer
overflow would happen and cause the length to wrap at 256).
- Updated pseudo code in comments to reflect the reality.
- Removed our local shortcut of processing magic string and rely
on the centralized and tigntened validation.
- Diff reduction from upstream.
For now we are still generating the older $2a$ format of password
but we will migrate to the new format once the format is formally
finalized.
dim [Wed, 26 Mar 2014 07:42:43 +0000 (07:42 +0000)]
MFC r263312:
Pull in r196939 from upstream llvm trunk (by Reid Kleckner):
Reland "Fix miscompile of MS inline assembly with stack realignment"
This re-lands commit r196876, which was reverted in r196879.
The tests have been fixed to pass on platforms with a stack alignment
larger than 4.
Update to clang side tests will land shortly.
Pull in r196986 from upstream llvm trunk (by Reid Kleckner):
Revert the backend fatal error from r196939
The combination of inline asm, stack realignment, and dynamic allocas
turns out to be too common to reject out of hand.
ASan inserts empy inline asm fragments and uses aligned allocas.
Compiling any trivial function containing a dynamic alloca with ASan is
enough to trigger the check.
XFAIL the test cases that would be miscompiled and add one that uses the
relevant functionality.
Pull in r202930 from upstream llvm trunk (by Hans Wennborg):
Check for dynamic allocas and inline asm that clobbers sp before building
selection dag (PR19012)
In X86SelectionDagInfo::EmitTargetCodeForMemcpy we check with MachineFrameInfo
to make sure that ESI isn't used as a base pointer register before we choose to
emit rep movs (which clobbers esi).
The problem is that MachineFrameInfo wouldn't know about dynamic allocas or
inline asm that clobbers the stack pointer until SelectionDAGBuilder has
encountered them.
This patch fixes the problem by checking for such things when building the
FunctionLoweringInfo.
Together, these commits fix the problem encountered in the devel/emacs
port on the i386 architecture, where a combination of stack realignment,
alloca() and memcpy() could incidentally clobber the %esi register,
leading to segfaults in the temacs build-time utility.
See also: http://llvm.org/PR18171 and http://llvm.org/PR19012
Reported by: ashish
PR: ports/183064
MFC r263313:
Pull in r203311 from upstream llvm trunk (by Arnold Schwaighofer):
ISel: Make VSELECT selection terminate in cases where the condition type has to
be split and the result type widened.
When the condition of a vselect has to be split it makes no sense widening the
vselect and thereby widening the condition. We end up in an endless loop of
widening (vselect result type) and splitting (condition mask type) doing this.
Instead, split both the condition and the vselect and widen the result.
I ran this over the test suite with i686 and mattr=+sse and saw no regressions.
Fixes PR18036.
With this fix the original problem case from the graphics/rawtherapee
port (posted in http://llvm.org/PR18036 ) now compiles within ~97MB RSS.
Reported by: mandree
MFC r263320:
Add separate patch files for all the customizations we have currently
applied to our copy of llvm/clang. These can be applied in alphabetical
order to a pristine llvm/clang 3.4 release source tree, to result in the
same version used in FreeBSD.
This is intended to clearly document all the changes until now, which
mostly consist of cherry pickings from the respective upstream trunks,
plus a number of hand-written FreeBSD-specific ones. Hopefully those
can eventually be cleaned up and sent upstream too.
dim [Wed, 26 Mar 2014 07:35:24 +0000 (07:35 +0000)]
MFC r262613:
Merge the projects/clang-sparc64 branch back to head. This brings in
several updates from the llvm and clang trunks to make the sparc64
backend fully functional.
Apart from one patch to sys/sparc64/include/pcpu.h which is still under
discussion, this makes it possible to let clang fully build world and
kernel for sparc64.
Any assistance with testing this on actual sparc64 hardware is greatly
appreciated, as there will unavoidably be bugs left.
Many thanks go to Roman Divacky for his upstream work on getting the
sparc64 backend into shape.
MFC r262985:
Repair a few minor mismerges from r262261 in the clang-sparc64 project
branch. This is also to minimize differences with upstream.
dim [Tue, 25 Mar 2014 22:43:34 +0000 (22:43 +0000)]
MFC r243322 (by marcel):
Unbreak amd64 cross-build where amd64 is the target. While clang
may be installed as cc and we don't need to build gcc as a
cross-tools, we still build gcc and thus need cc_tools built
as a build tool. Not doing this results in building gengenrtl with
the target compiler while we need to run it on the build machine.
dteske [Tue, 25 Mar 2014 04:40:41 +0000 (04:40 +0000)]
MFC r257824,257826-257830,258411: Updates to sysrc(8)
257824: Fix a bug with `-d' form working as documented
257826: Add `--version' long option
257827: Add a `-c' option for `check only'
257828: Comments and whitespace
257829: Fix a bug with `-e' introduced by above 257828
257830: Document SYSRC_VERBOSE enviroment variable in the manual
258411: Revert the above 257830 (both merged to get .Dd bump in man-page)
dteske [Tue, 25 Mar 2014 03:30:44 +0000 (03:30 +0000)]
MFC r258270:
Add a try-include word (which acts the same as "include") and use it to
conditionally include (but ignore failures) /boot/loader.rc.local and
/boot/menu.rc.local -- to make customizing the menu easier.
dteske [Tue, 25 Mar 2014 03:23:06 +0000 (03:23 +0000)]
MFC r257821:
Extend loader_delay as-documented in beastie.4th(8) and delay.4th(8),
making it available to architectures that do not use or load the beastie
menu. This is reported to save headaches on some PPC systems where unload
followed by load does not produce the desired results wherein if-given
the opportunity to abort the initial loading sequence, you can customize
the first load.
Reviewed by: nwhitehorn, kan
Discussed on: -current
dteske [Tue, 25 Mar 2014 03:19:03 +0000 (03:19 +0000)]
MFC r257650:
Defer loading of kernel and modules if the beastie menu is enabled. Add a
kernel selection menu to the beastie menu. List of kernels is taken from
`kernels' in loader.conf(5) as a space (or comma) separated list of names
to display (up to 9). If not set, default value is "kernel kernel.old".
Does not validate that kernels exist because the next enhancement will be
to allow selection of the root device.
emaste [Mon, 24 Mar 2014 13:50:11 +0000 (13:50 +0000)]
MFC r263289: Update NetBSD Foundation copyrights to 2-clause BSD
The NetBSD Foundation states "Third parties are encouraged to change the
license on any files which have a 4-clause license contributed to the
NetBSD Foundation to a 2-clause license."
This change removes clauses 3 and 4 from copyright / license blocks that
list The NetBSD Foundation as the only copyright holder.
dim [Sun, 23 Mar 2014 14:18:40 +0000 (14:18 +0000)]
Turn off warnings for building aicasm. Various versions of yacc exist,
which can result in different warnings-as-errors in this tool, but these
are all completely harmless.
This is a direct commit to stable/7, stable/8, stable/9 and stable/10,
since this kernel build tool has already been removed in head.
brueffer [Sun, 23 Mar 2014 13:03:46 +0000 (13:03 +0000)]
MFC: r262273
Further refine the auth fail regex to catch more auth failures and
reduce false positives.
The committed patch was provided by Christian Marg.
PR: 91732
Submitted by: Daniel O'Connor <doconnor at gsoft.com.au>
Skye Poier <spoier at gmail.com>
Alan Amesbury <amesbury at umn.edu>
Christian Marg <marg at rz.tu-clausthal.de>
projects / FreeBSD / stable / 9.git / log