Commit Graph

5830 Commits

Author SHA1 Message Date
peter
6a8fa4cab5 MFC: r269851,r272076,r274884,r282328,r285644,r286503,r286504,r286505,
r286506,r286510,r286561,r286562,r287034

Update svnlite from 1.8.10 to 1.8.14, and the support components:
serf->1.3.8, apr->1.5.2, apr-util->1.5.4, sqlite3->3.8.11.1

This includes syncing the developer templates with head.
2015-10-12 04:57:36 +00:00
dim
c26acd2a5d MFC r288099:
In binutils' arm-dis.c, avoid left-shifting a negative number.

Submitted by:	dan.mcgregor_usask.ca (Dan McGregor)
Differential Revision: https://reviews.freebsd.org/D3376
2015-10-09 19:36:06 +00:00
bdrewery
4bffffcaeb MFC r288238:
MFV c3ccd112: Correct off-by-ones in free_exception of emergency buffer
2015-10-08 18:02:43 +00:00
emaste
4521ad4bf5 MFC r256692: Fix .debug_line prologue header length calculation for 64-bit DWARF
The header_length field is the number of bytes following the field to
the first byte of the line number program.  The hard-coded constants
previously here (4 + 2 + 4) were correct only for 32-bit DWARF.

Sponsored by:	DARPA, AFRL
2015-09-24 19:33:35 +00:00
emaste
8a6b0049ee MFC r284551: Import libcxxrt master e64e93f.
This includes a number of demangler fixes obtained from upstream
ELF Tool Chain.

PR:		200913
Sponsored by:	The FreeBSD Foundation
2015-09-24 19:28:53 +00:00
dim
3606495e87 MFC r286699:
In gcc's libcpp, stop using the INTTYPE_MAXIMUM() macro, which relies on
undefined behavior.  The code used this macro to avoid problems on some
broken systems which define SSIZE_MAX incorrectly, but this is not
needed on FreeBSD, obviously.
2015-09-22 22:07:42 +00:00
rodrigc
12c2a2777a Merge r286649:
Fix and re-enable UTF-8 tests.

X-Merge with: r287393
2015-09-08 17:54:31 +00:00
kib
d894e2ffed MFC r287360:
Fix t_spawnattr test for attributes handling by posix_spawn(3).
Connect it to the build.
2015-09-08 07:15:10 +00:00
delphij
5505c947f4 MFC r287020: MFV r287019: leapseconds from tzdata2015f. 2015-09-08 00:34:38 +00:00
delphij
0d505bc40b Fix multiple integer overflows in expat.
Security:	CVE-2015-1283
Security:	FreeBSD-SA-15:20.expat
2015-08-18 19:30:05 +00:00
edwin
33f83ca610 MFC of 286750,tzdata10:
Update to tzdata2015f:

Changes affecting future time stamps

    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
    The abbreviation remains "KST".  (Thanks to Robert Elz.)
    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen and Pablo Camargo.)
    Changes affecting past and future time stamps
    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC. (Thanks to Roman Tudos.)
2015-08-13 23:59:53 +00:00
pfg
c32f5a21dc MFC r286074:
GCC: Add a new option "-fstack-protector-strong"

This includes additional functions to be protected: those that
have local array definitions, or have references to local frame
addresses. This is a new option in GCC-4.9 that was relicensed
by Han Shen from Google under GPLv2.

Obtained from:	OpenBSD (2014-01-14)
2015-08-13 01:02:57 +00:00
dim
3ab328cd1c MFC r286519:
In GNU as, avoid left-shifting negative integers, which is undefined.
2015-08-12 19:18:54 +00:00
gshapiro
3682d7b83b MFC: Reminder to check tools/build/mk/OptionalObsoleteFiles.inc on new
version imports.
2015-08-08 16:30:20 +00:00
bdrewery
21bbf44105 MFC r285972:
MFV r285970:

    Apply upstream changeset bf4f6ec64e:

    Fix issue 356: properly skip a sparse file entry in a tar file.

PR:		201506
Relnotes:	yes
2015-07-30 17:04:15 +00:00
dim
eedcd78b1e Add updated llvm patch corresponding to r286033. 2015-07-29 19:27:57 +00:00
dim
6b61571bde Reapply r286007, modified to compile with pre-C++11 compilers:
Pull in r219009 from upstream llvm trunk (by Adam Nemet):

  [ISel] Keep matching state consistent when folding during X86 address match

  In the X86 backend, matching an address is initiated by the 'addr' complex
  pattern and its friends.  During this process we may reassociate and-of-shift
  into shift-of-and (FoldMaskedShiftToScaledMask) to allow folding of the
  shift into the scale of the address.

  However as demonstrated by the testcase, this can trigger CSE of not only the
  shift and the AND which the code is prepared for but also the underlying load
  node.  In the testcase this node is sitting in the RecordedNode and MatchScope
  data structures of the matcher and becomes a deleted node upon CSE.  Returning
  from the complex pattern function, we try to access it again hitting an assert
  because the node is no longer a load even though this was checked before.

  Now obviously changing the DAG this late is bending the rules but I think it
  makes sense somewhat.  Outside of addresses we prefer and-of-shift because it
  may lead to smaller immediates (FoldMaskAndShiftToScale is an even better
  example because it create a non-canonical node).  We currently don't recognize
  addresses during DAGCombiner where arguably this canonicalization should be
  performed.  On the other hand, having this in the matcher allows us to cover
  all the cases where an address can be used in an instruction.

  I've also talked a little bit to Dan Gohman on llvm-dev who added the RAUW for
  the new shift node in FoldMaskedShiftToScaledMask.  This RAUW is responsible
  for initiating the recursive CSE on users
  (http://lists.cs.uiuc.edu/pipermail/llvmdev/2014-September/076903.html) but it
  is not strictly necessary since the shift is hooked into the visited user.  Of
  course it's safer to keep the DAG consistent at all times (e.g. for accurate
  number of uses, etc.).

  So rather than changing the fundamentals, I've decided to continue along the
  previous patches and detect the CSE.  This patch installs a very targeted
  DAGUpdateListener for the duration of a complex-pattern match and updates the
  matching state accordingly.  (Previous patches used HandleSDNode to detect the
  CSE but that's not practical here).  The listener is only installed on X86.

  I tested that there is no measurable overhead due to this while running
  through the spec2k BC files with llc.  The only thing we pay for is the
  creation of the listener.  The callback never ever triggers in spec2k since
  this is a corner case.

  Fixes rdar://problem/18206171

This fixes a possible crash in x86 code generation when compiling recent
llvm/clang trunk sources.

Direct commit to stable/10, since head already has llvm/clang 3.6.1,
which includes this fix.

Reported by:	jonathan, theraven
Upstream PR:	https://llvm.org/bugs/show_bug.cgi?id=24249
2015-07-29 19:25:28 +00:00
dim
e7468c5bc3 Revert r286007-r286009 for now, until I can figure out how to make the
fix compile with older gcc and libstdc++.
2015-07-29 14:07:29 +00:00
dim
0320ef6854 Add llvm patch corresponding to r286007. 2015-07-29 13:07:18 +00:00
dim
bd32a5b2ac Pull in r219009 from upstream llvm trunk (by Adam Nemet):
[ISel] Keep matching state consistent when folding during X86 address match

  In the X86 backend, matching an address is initiated by the 'addr' complex
  pattern and its friends.  During this process we may reassociate and-of-shift
  into shift-of-and (FoldMaskedShiftToScaledMask) to allow folding of the
  shift into the scale of the address.

  However as demonstrated by the testcase, this can trigger CSE of not only the
  shift and the AND which the code is prepared for but also the underlying load
  node.  In the testcase this node is sitting in the RecordedNode and MatchScope
  data structures of the matcher and becomes a deleted node upon CSE.  Returning
  from the complex pattern function, we try to access it again hitting an assert
  because the node is no longer a load even though this was checked before.

  Now obviously changing the DAG this late is bending the rules but I think it
  makes sense somewhat.  Outside of addresses we prefer and-of-shift because it
  may lead to smaller immediates (FoldMaskAndShiftToScale is an even better
  example because it create a non-canonical node).  We currently don't recognize
  addresses during DAGCombiner where arguably this canonicalization should be
  performed.  On the other hand, having this in the matcher allows us to cover
  all the cases where an address can be used in an instruction.

  I've also talked a little bit to Dan Gohman on llvm-dev who added the RAUW for
  the new shift node in FoldMaskedShiftToScaledMask.  This RAUW is responsible
  for initiating the recursive CSE on users
  (http://lists.cs.uiuc.edu/pipermail/llvmdev/2014-September/076903.html) but it
  is not strictly necessary since the shift is hooked into the visited user.  Of
  course it's safer to keep the DAG consistent at all times (e.g. for accurate
  number of uses, etc.).

  So rather than changing the fundamentals, I've decided to continue along the
  previous patches and detect the CSE.  This patch installs a very targeted
  DAGUpdateListener for the duration of a complex-pattern match and updates the
  matching state accordingly.  (Previous patches used HandleSDNode to detect the
  CSE but that's not practical here).  The listener is only installed on X86.

  I tested that there is no measurable overhead due to this while running
  through the spec2k BC files with llc.  The only thing we pay for is the
  creation of the listener.  The callback never ever triggers in spec2k since
  this is a corner case.

  Fixes rdar://problem/18206171

This fixes a possible crash in x86 code generation when compiling recent
llvm/clang trunk sources.

Direct commit to stable/10, since head already has llvm/clang 3.6.1,
which includes this fix.

Reported by:	jonathan, theraven
Upstream PR:	https://llvm.org/bugs/show_bug.cgi?id=24249
2015-07-29 12:59:16 +00:00
pkelsey
8515ac5674 MFC r285275 (only the part that fixes PR 199568):
Obtain proper capsicum rights for dump files so rotation of such files works when requested.  This is equivalent to cherry picking the following upstream commits:

commit c6d472bf63488b0c2ab7ab9f4b32c68dd2c8ea2b
commit f08eb851eedf9775e6485ab75c0d8cf8d1306be6
commit d83a284abc80d3d09f6bddd087760bb1b01d9cc7

PR: 		199568
Approved by:	re
2015-07-18 01:29:27 +00:00
delphij
2a25cee78a MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,
284864,285169-285170,285435:

ntp 4.2.8p3.

Relnotes:	yes
Approved by:	re (?)
2015-07-15 19:21:26 +00:00
gshapiro
5ed69735b2 MFC: Update for sendmail 8.15.2 import
Approved by:	re (gjb)
2015-07-09 05:27:30 +00:00
gshapiro
574e70a7ab MFC: Merge sendmail 8.15.2
Approved by:	re (gjb)
2015-07-09 05:23:17 +00:00
des
a060063a48 MFH (r276605, r282089): upgrade to latest Unbound
MFH (r276699, r276702, r277057): local control socket
MFH (r276599, r276612, r282087, r282088): build fixes

This brings in Unbound 1.5.3 from head.  Local control sockets are now
supported and will be used by default for new installations.  Existing
systems will continue to use TCP control sockets until the automated
setup script is re-run ("service local_unbound setup") and the service
restarted ("service local_unbound restart").

Approved by:	re (kib)
Relnotes:	yes
2015-07-06 13:23:27 +00:00
wblock
79b9df8c4d MFC r284914:
Fix a couple of missing lines that obscured the -p description.

Approved by:	re
2015-07-05 14:17:57 +00:00
gshapiro
2978a93517 MFC: An additional fix for the openssl Weak DH remediation:
The import of openssl to address the FreeBSD-SA-15:10.openssl security
     advisory includes a change which rejects handshakes with DH parameters
     below 768 bits.  sendmail releases prior to 8.15.2 (not yet released),
     defaulted to a 512 bit DH parameter setting for client connections.

     The first fix committed last week changed the default to 1024 bits.

     This commit fixes the case where the DHParameters option is set to a
     file which doesn't exist, which is the case on newer versions of
     FreeBSD which enable STARTTLS by default by auto-creating TLS
     certificates.
2015-06-25 01:49:44 +00:00
delphij
80cac6ebcb MFC r284237,284277:
file 5.23.

Relnotes:	yes
2015-06-24 19:58:14 +00:00
gshapiro
9b4db397fd MFC: The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
     below 768 bits.  sendmail releases prior to 8.15.2 (not yet released),
     defaulted to a 512 bit DH parameter setting for client connections.
     This commit chages that default to 1024 bits.  sendmail 8.15.2, when
     released well use a default of 2048 bits.
2015-06-17 02:39:10 +00:00
marcel
a0f8d115dc MFC 284165:
Move contrib/top/top.X to contrib/top/top.xs and move
contrib/top/top.local.H to contrib/top/top.local.hs.
Change the makefile accordingly.
2015-06-17 02:30:12 +00:00
edwin
a31e59964f MFC of 284397,tzdata10:
Update to tzdata2015e:

  Changes affecting future time stamps

    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)

    Assume Cayman Islands will observe DST starting next year, using US rules.
    Although it isn't guaranteed, it is the most likely.
2015-06-15 01:01:25 +00:00
tuexen
e9ec710324 MFC r283784:
Remove trailing whitespaces.

MFC r283785:
Require the embedded packet to contain 8 bytes after the IP header instead
of only 4. This is guaranteed by RFC 792 and the verification of GRE, ICMP
and TCP packets use 8 bytes.

MFC r283786:
There is no payload anymore. So compute the minimum packet length
correctly and use 40 as the default (if the minumum allows it), as
specified in the man page.

MFC r283806:
When the packet verification fails in verbose mode, print the correct
number of words in host byte order. Also remove a stray 'x'.

MFC r283808:
Don't send malformed SCTP probe packets.

MFC r283813:
Use an empty string for field descriptions of unknown protocols.

MFC r283817:
Don't send illegal packets when using UDP-Lite.

MFC r283819:
A TCP checksum of 0 is completely valid. Mapping 0 to 0xffff only
applies to UDP and UDP-Lite.

MFC r283820:
The code starts with base + 1 as the first port. Fix to documentation
to match that.
2015-06-03 17:45:45 +00:00
ngie
8017091a95 MFC r283170:
Import proposed fix from upstream for
atf-sh/atf_check_test:flush_stdout_on_timeout

Many thanks for jmmv for the fix!

PR: 197060

Original commit message:

From 0e546407567ea858e261e72f75c5ed61e07d0ddf Mon Sep 17 00:00:00 2001
From: Julio Merino <jmmv@google.com>
Date: Tue, 17 Feb 2015 18:10:11 -0500
Subject: [PATCH] Fix atf-sh/atf_check_test:flush_stdout_on_death

The test atf-sh/atf_check_test:flush_stdout_on_timeout was flaky as it
was playing solely with time.  Fix this by making the test more robust
and rename it while we are at it: there is nothing left about "timeouts"
in this test, considering that ATF itself does not enforce deadlines
any longer.

Fixes FreeBSD PR 197060.
2015-05-31 22:44:14 +00:00
emaste
cbcbd6fd24 MFC r283295: ipf(1): Use strchr(3) instead of deprecated index(3)
Sponsored by:	The FreeBSD Foundation
2015-05-29 17:43:14 +00:00
luigi
cf32ec5d9e MFC: 272451, 272653 add CAP_EVENT so that we can poll() on netmap and pcap
file descriptors
2015-05-26 21:12:02 +00:00
rodrigc
ddc334e56f Merge: r277829
Revert r277357 as expr has been enhanced to better detect overflow conditions,
and now the tests pass

PR: 196867
X-MFC with: r277798
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
2015-05-23 09:16:35 +00:00
delphij
05c61f3a94 MFC r282613: MFV r282611: netcat from OpenBSD 5.7. 2015-05-21 21:45:37 +00:00
delphij
51f0c42396 MFC r282932: MFV r282927,r282928,r282930 (kientzle):
Don't segfault when reading malformed cpio archives.
2015-05-21 19:05:47 +00:00
brooks
b4fe1f9ecc MFC r282436 (the portion that makes sense):
Remove "capability mode sandbox enabled" messages.

These messages serve little purpose and break some consumers.

PR:		199855
Differential Revision:	https://reviews.freebsd.org/D2440
Reviewed by:	rwatson
Approved by:	pjd
Sponsored by:	DARPA, AFRL
2015-05-19 19:01:52 +00:00
edwin
3b84fa4ac9 MFC of 283079,tzdata10:
Update to tzdata2015d:

Release 2015d - 2015-04-24 08:09:46 -0700

  Changes affecting future time stamps

    Egypt will not observe DST in 2015 and will consider canceling it
    permanently.  For now, assume no DST indefinitely.
    (Thanks to Ahmed Nazmy and Tim Parenti.)

  Change affecting past and future time zone abbreviations

    The abbreviations for Hawaii-Aleutian standard and daylight times
    have been changed from HAST/HADT to HST/HDT, as per US Government
    Printing Office style.  This affects only America/Adak since 1983,
    as America/Honolulu was already using the new style.
2015-05-18 21:07:44 +00:00
edwin
6060820399 MFC of 283042,tzdata10:
Update to tzdata2015c:

    Release 2015c - 2015-04-11 08:55:55 -0700

    Changes affecting future time stamps

    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
    not 00:00 on April's last Friday.  2015's transition will therefore be on
    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
2015-05-18 02:05:56 +00:00
dim
d78b21b38e For clang 3.4.1, when using -fformat-extensions, and warning about the
FreeBSD-specific %D and %b printf format specifiers, avoid possible
argument overruns.  Also reduce the differences with the version added
in r280031 (which has been sent upstream).

Direct commit to stable/10, since head already has clang 3.6.0.
2015-05-17 20:38:01 +00:00
dim
7de2980d9d Bring the contrib/llvm/patches directory up-to-date.
MFC r263892:
Add the llvm/clang patch for r263891.

MFC r264350:
Update the llvm/clang patch for r264345.

MFC r266675:
Add the clang patch for r266674.

MFC r275651:
Add llvm patch corresponding to r275633.

MFC r275747:
Update llvm patches for r274286 and r275633 so all the tests will pass.

MFC r275760:
Add clang patch corresponding to r275759.

MFC r275772:
Update clang patch for r275759 to use correct test cases.

Additionally:
* Remove the clang patch corresponding to r263619, as ARM EABI
  hard-float support was never MFC'd.
* Add clang patch corresponding to r279302.
2015-05-16 22:06:40 +00:00
pfg
c5245aadbb MFC r282115, r282152, r282201
MFV	r282150
libgomp: Update to version 4.3.5.
bring initial BSD support from upstream.

This was not meant to be MFC'd at first but the original OMP support
for FreeBSD was in very poor shape.  The effect of this change should
be minimal as all ports are already using the version of libgomp that
comes with the gcc ports. The local libgomp is planned to be disabled
for platforms that are not using older gcc by default so this version
of libgomp will not be shipped in tier-1 platform releases.

Discussed with:	emaste
2015-05-16 15:44:13 +00:00
ngie
6dd60c5576 MFC r281966:
Add #include sys/types.h for register_t for mips
2015-05-13 10:56:35 +00:00
ngie
47260bfd5f MFC r282056:
The fmodl compat shims on arm/mips/powerpc aren't complete

Disable the test code for now on those architectures

PR: 199422
2015-05-13 10:12:16 +00:00
gjb
5e2ef62eee MFC r282434:
MFV r225523, r282431:
   r225523 (hrs):
    Import openresolv-3.4.4.

   r282431:
    Import openresolv-3.7.0.

PR:		199854
Submitted by:	yuri@rawbw.com
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
2015-05-11 01:33:34 +00:00
tijl
b709ec868a MFC r275805:
Fix incorrect type of "invalids" argument in __iconv() prototype.

MFC r281550,281591:

Remove the const qualifier from iconv(3) to comply with POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html

Adjust all code that calls iconv.

PR:		199099
2015-04-30 16:08:47 +00:00
dim
69cb382042 MFC r281775:
Pull in r229911 from upstream llvm trunk (by Benjamin Kramer):

  MC: Allow multiple comma-separated expressions on the .uleb128 directive.

  For compatiblity with GNU as. Binutils documents this as
  '.uleb128 expressions'. Subtle, isn't it?

Reported by:	sbruno
PR:		199554

MFC r281777:

Add llvm patch corresponding to r281775.
2015-04-23 22:06:02 +00:00
allanjude
7d91984689 MFC: r277328:
Fix minor syntax and grammar errors in the markup of the ee(1) man page

Approved by:	eadler (mentor, implicit)
Sponsored by:	ScaleEngine Inc.
2015-04-16 00:44:05 +00:00