HardenedBSD/hardenedbsd 4099236crypto/openssl/crypto/rand drbg_lib.c, crypto/openssl/doc/man3 EVP_PKEY_CTX_ctrl.pod

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Revert r340706.  Some files became symlinks and vice versa.
  git-svn-init: Add docs to the choice of repos
  linuxkpi: Remove duplicated text
  linuxkpi: Add some basic swap functions
  Define AHCI_PORT_IDENT and increase by 1 the VTBLK_BLK_ID_BYTES to avoid buffer accessed 
out of bounds, also switch to snprintf(3).
  Remove stale manual pages after OpenSSL 1.1.1a merge.
  csu: use BSD-1-clause license on csu files
  Add NT_FREEBSD_FEATURE_CTL ELF note to csu
  Clear pad bytes in the struct exported by kern.ntp_pll.gettime.
  Enable evdev on ppc32
  Import OpenSSL 1.1.1a.
  Make multiline APPLY_MASK() macro to be function-like.
  Plug a trivial memory leak.
  Avoid clobbering a user-specified -g value after r340547.

FreeBSD/src 340717head/sbin/ipfw ipfw.8

Fix incorrect DSCP value range from 0..64 to 0..63.

PR:            232786
Submitted by:   Sergey Akhmatov <sergey at akhmatov.ru>
Reviewed by:    AllanJude
MFC after:      1 week

FreeBSD/src 340716head/sys/x86/include specialreg.h

Add definitions for Intel Speed Shift

These definitions will be used by a driver to implement Hardware
P-States (autonomous control of HWP, via Intel Speed Shift technology).

Reviewed by:    kib
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D18050

FreeBSD/src 340715releng 12.0, releng/12.0 ObsoleteFiles.inc

MFC:    r340714

Revert r340708.  Some files became symlinks and vice versa.

Approved by:    re (gjb)

FreeBSD/doc 52502head/share/xml news.xml

Fix build.

FreeBSD/src 340714stable 12, stable/12 ObsoleteFiles.inc

MFC:    r340713.

Revert r340708.  Some files became symlinks and vice versa.

LLVM/llvm 347367libcxx/trunk/test/std/language.support/support.dynamic/new.delete/new.delete.array sized_delete_array_fsizeddeallocation.sh.cpp, libcxx/trunk/test/std/language.support/support.dynamic/new.delete/new.delete.single sized_delete_fsizeddeallocation.sh.cpp

[NFC] Rename lit feature to '-fsized-deallocation' for consistency

The '-faligned-allocation' flag uses a feature with the same name (with a
leading dash).

FreeNAS/freenas bb7853etests/api2 core.py

Merge pull request #2119 from freenas/ericbsd-patch27

QA-Test tkt-59049 Adding tests for core api v2
DeltaFile
+17-4tests/api2/core.py
+17-41 files

FreeBSD/src 340713head ObsoleteFiles.inc

Revert r340706.  Some files became symlinks and vice versa.

Pointy hat to:  jkim

HardenedBSD/hardenedbsd cb3eaa5. ObsoleteFiles.inc

Revert r340706.  Some files became symlinks and vice versa.

Pointy hat to:  jkim
DeltaFile
+0-8ObsoleteFiles.inc
+0-81 files

FreeBSD/doc 52501head/en_US.ISO8859-1/articles/contributors contrib.committers.xml, head/share/pgpkeys bwidawsk.key pgpkeys.ent

Steps for new commits 1-4

Unfortunately I am doing this late and so the new committer info is
backdated.

NetBSD/pkgsrc V6pQuAxdoc CHANGES-2018

   doc: Updated net/torsocks to 2.3.0
VersionDeltaFile
1.4774+2-1doc/CHANGES-2018
+2-11 files

NetBSD/pkgsrc iXoQNaQnet/torsocks distinfo Makefile, net/torsocks/patches patch-src_lib_torsocks.c patch-src_bin_torsocks.in

   torsocks: Update net/torsocks to 2.3.0

   pkgsrc changes:
    - Update MASTER_SITES to avoid MASTER_SITE_DEBIAN

   Changes:
   2018-11-19 torsocks 2.3.0
    * Fix a bunch of stuff in the wrapper script, #24967
    * gethostbyaddr_r: always assign result
    * log: Remove log line when logging is stopped
    * gethostbyaddr_r: Don't put garbage in data->hostname
    * gethostbyaddr_r: Populate h_addrtype field
    * log: Avoid crash or file corruption when closing logs
    * connect: Always pass .onion IP cookie to connection object
    * Merge remote-tracking branch 'yawning/bug23715'
    * Make torsocks always connect to the configured Tor port
    * test: Make getpeername test connect to moria1
    * socks5: Always use ATYP 0x03 for CONNECT command
    * Merge remote-tracking branch 'upstream/master'
    * doc: Clarify the libc limitation in README
    * accept4: Initialize libc symbol early
    * Bug 23715: Support memfd_create(2).
    * test: Detect if tor is running in test_fd_passing
    * No tab in the README
    * Merge remote-tracking branch 'debian/bugfix/typo-subsytem'

    [16 lines not shown]

HardenedBSD/hardenedbsd f9c018atools/tools/git git-svn-init

git-svn-init: Add docs to the choice of repos

FreeBSD/src 340712head/tools/tools/git git-svn-init

git-svn-init: Add docs to the choice of repos

LLVM/llvm 347366clang-tools-extra/trunk/clang-tidy/bugprone SuspiciousMemsetUsageCheck.cpp MisplacedWideningCastCheck.cpp, clang-tools-extra/trunk/clang-tidy/cert ProperlySeededRandomGeneratorCheck.cpp

Update EvaluateAsInt to the new syntax.

LLVM/llvm 347365lldb/trunk/source/Symbol ClangASTContext.cpp

Update call to EvaluateAsInt() to the new syntax.

LLVM/llvm 347364cfe/trunk/lib/AST ExprConstant.cpp Expr.cpp, cfe/trunk/lib/CodeGen CGBuiltin.cpp

Reinstate 347294 with a fix for the failures.

EvaluateAsInt() is sometimes called in a constant context. When that's the
case, we need to specify it as so.

HardenedBSD/hardenedbsd 107e83dcrypto/openssl Makefile, crypto/openssl/crypto/bn bn_mod.c bn_lib.c

Merge remote-tracking branch 'origin/hardened/11-stable/master' into 
hardened/11-stable/unstable

* origin/hardened/11-stable/master:
  Merge OpenSSL 1.0.2q.

OpenBSD/ports BHVPGOssysutils/ansible-lint Makefile distinfo, sysutils/ansible-lint/pkg PLIST

   update to ansible-lint-3.5.1, from Edward Lopez-Acosta

   set NO_TEST=Yes, the tests aren't in the distfile (same in previous version
   in ports 3.4.23).

LLVM/llvm 347363libcxx/trunk/include __config

[NFC] Reformat availability #defines in __config

Aligning everything makes what we're doing more obvious.

HardenedBSD/hardenedbsd ed7a006crypto/openssl Makefile, crypto/openssl/crypto/bn bn_mod.c bn_lib.c

Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master:
  Merge OpenSSL 1.0.2q.

FreeBSD/src 340711releng/12.0/crypto/openssl/crypto/rand drbg_lib.c, releng/12.0/crypto/openssl/doc/man3 EVP_PKEY_CTX_ctrl.pod

MFC:    r340705, r340708

Merge OpenSSL 1.1.1a.

Approved by:    re (gjb)

LLVM/llvm 347362libcxx/trunk/docs/DesignDocs AvailabilityMarkup.rst

[NFC] Fix formatting in availability documentation

FreeBSD/src 340710head/sys/compat/linuxkpi/common/include/linux swap.h

linuxkpi: Remove duplicated text

Somehow this got botched while moving from git -> svn

HardenedBSD/hardenedbsd 0c21a36sys/compat/linuxkpi/common/include/linux swap.h

linuxkpi: Remove duplicated text

Somehow this got botched while moving from git -> svn

LLVM/llvm 347361llvm/trunk/lib/Target/X86 X86ISelLowering.cpp, llvm/trunk/test/CodeGen/X86 vector-reduce-mul.ll

[X86] Emit a PACKUS instead of a VECTOR_SHUFFLE from LowerTRUNCATE for v16i16->v16i8.

We can't guarantee that demanded bits passing through the vector shuffle won't cause the 
AND in front of this to be removed. This would prevent the PACKUS from being matched 
during shuffle lowering.

Unfortunately, this adds a packuswb to one of the vector-reduce-mul.ll tests since we were 
removing the shuffle via SimplifyDemandedVectorElts. We appear to have similar issues with 
vpmovwb on the same test case on other targets.

NetBSD/pkgsrc-wip b7c5661mosquitto distinfo, mosquitto/patches patch-CMakeLists.txt

mosquitto: add upstream bug report

LLVM/llvm 347360libcxx/trunk/test/std/strings/basic.string.literals literal.pass.cpp, libcxx/trunk/test/std/strings/string.view/string_view.literals literal.pass.cpp

A couple of tests were broken when clang implemented the compiler parts of P0482 (support 
for char8_t). Comment out those bits until we implement the corresponding bits in libc++

LLVM/llvm 347359llvm/trunk/include/llvm/DebugInfo/CodeView TypeRecord.h

Fix pointer options mask.  It was off by 1 bit.

NetBSD/pkgsrc-wip b23f1a1mosquitto Makefile

mosquitto: munge config stuff in pre-configure

instead of post-extract, so that "make extract" lets one look at the
upstream bits.
DeltaFile
+2-2mosquitto/Makefile
+2-21 files

FreeBSD/ports 485491head/textproc/elasticsearch6 Makefile

textproc/elasticsearch6: Add elasticsearch-cli to package

This script is required for elasticsearch-plugin script to function.

PR:            233238

LLVM/llvm 347358compiler-rt/trunk/lib/sanitizer_common sanitizer_platform_interceptors.h sanitizer_common_interceptors.inc, compiler-rt/trunk/test/sanitizer_common/TestCases/NetBSD setvbuf.cc

Revert "[Sanitizer] intercept setvbuf on other platforms where it is supported"

FreeBSD/src 340709head/sys/compat/linuxkpi/common/include/linux swap.h, head/sys/vm vm_swapout.c vm_pageout.h

linuxkpi: Add some basic swap functions

These are used by kms-drm to determine various heuristics relate
memory conditions.

The number of free swap pages is just a variable, and it can be
much cheaper by either adding a new getter, or simply extern'ing
swap_total. However, this patch opts to use the more expensive,
existing interface - since this isn't an operation in a high per
path.

This allows us to remove some more gpl linuxkpi and do the follo
kms-drm:
git rm linuxkpi/gplv2/include/linux/swap.h

Reviewed by:    mmacy, Johannes Lundberg <johalun0 at gmail.com>
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D18052

HardenedBSD/hardenedbsd 82426acsys/compat/linuxkpi/common/include/linux swap.h, sys/vm vm_swapout.c vm_pageout.h

linuxkpi: Add some basic swap functions

These are used by kms-drm to determine various heuristics relate
memory conditions.

The number of free swap pages is just a variable, and it can be
much cheaper by either adding a new getter, or simply extern'ing
swap_total. However, this patch opts to use the more expensive,
existing interface - since this isn't an operation in a high per
path.

This allows us to remove some more gpl linuxkpi and do the follo
kms-drm:
git rm linuxkpi/gplv2/include/linux/swap.h

Reviewed by:    mmacy, Johannes Lundberg <johalun0 at gmail.com>
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D18052

NetBSD/pkgsrc-wip 823da76mosquitto Makefile

mosquitto: add URLs to upstream bug reports
DeltaFile
+3-1mosquitto/Makefile
+3-11 files

Illumos/gate dbad738usr/src/man/man1m eeprom.1m, usr/src/uts/common/io consconfig_dacf.c

9930 uts: kmdb should use "diag-device" when set
Reviewed by: John Levon <john.levon at joyent.com>
Approved by: Joshua M. Clulow <josh at sysmgr.org>

LLVM/llvm 347357compiler-rt/trunk/test/sanitizer_common/TestCases/Posix setvbuf.cc

[Sanitizer] Unbreak non NetBSD builds.

FreeBSD/ports 485490head/devel/ignition-transport pkg-plist Makefile, head/devel/ignition-transport/files patch-log_include_ignition_transport_log_SqlStatement.hh patch-src_NetUtils.cc

New port: devel/ignition-transport: Ignition transport classes and functions for robot 
applications

FreeBSD/ports 485489head/math/ipopt distinfo pkg-plist

math/ipopt: Update 3.12.11 -> 3.12.12

Reported by:    portscout

Linux/linux c8ce94barch/mips/configs cavium_octeon_defconfig, arch/mips/kernel traps.c setup.c

Merge tag 'mips_fixes_4.20_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Paul Burton:
 "A few MIPS fixes for 4.20:

   - Re-enable the Cavium Octeon USB driver in its defconfig after it
     was accidentally removed back in 4.14.

   - Have early memblock allocations be performed bottom-up to more
     closely match the behaviour we used to have with bootmem, which
     seems a safer choice since we've seen fallout from the change made
     in the 4.20 merge window.

   - Simplify max_low_pfn calculation in the NUMA code for the Loongson3
     and SGI IP27 platforms to both clean up the code & ensure
     max_low_pfn has been set appropriately before it is used"

* tag 'mips_fixes_4.20_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Loongson3,SGI-IP27: Simplify max_low_pfn calculation
  MIPS: Let early memblock_alloc*() allocate memories bottom-up
  MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver

LLVM/llvm 347356llvm/trunk/lib/CodeGen/SelectionDAG DAGCombiner.cpp, llvm/trunk/test/CodeGen/AArch64 arm64-ld1.ll

[DAGCombiner] look through bitcasts when trying to narrow vector binops
  
This is another step in vector narrowing - a follow-up to D53784
(and hoping to eventually squash potential regressions seen in
D51553).

The x86 test diffs are wins, but the AArch64 diff is probably not.
That problem already exists independent of this patch (see PR39722), but it
went unnoticed in the previous patch because there were no regression tests
that showed the possibility.

The x86 diff in i64-mem-copy.ll is close. Given the frequency throttling
concerns with using wider vector ops, an extra extract to reduce vector
width is the right trade-off at this level of codegen.

Differential Revision: https://reviews.llvm.org/D54392

FreeBSD/src 340708stable 12, stable/12 ObsoleteFiles.inc

MFC:    r340706

Remove stale manual pages after OpenSSL 1.1.1a merge.

HardenedBSD/hardenedbsd 7ff46f6. ObsoleteFiles.inc

MFC:    r340706

Remove stale manual pages after OpenSSL 1.1.1a merge.
DeltaFile
+8-0ObsoleteFiles.inc
+8-01 files

OpenBSD/ports kyVp0xwgames/urbanterror/patches patch-Makefile

   allow text relocations on i386 due to non-PIC assembly code

HardenedBSD/hardenedbsd 23731afusr.sbin/bhyve pci_ahci.c pci_virtio_block.c

Define AHCI_PORT_IDENT and increase by 1 the VTBLK_BLK_ID_BYTES
to avoid buffer accessed out of bounds, also switch to snprintf(3).

PR:            200859
Submitted by:   Caglar <caglar at 10ur.org>
Obtained from:  https://github.com/mist64/xhyve/pull/24
MFC after:      4 weeks
Sponsored by:   iXsystems Inc.

FreeBSD/src 340707head/usr.sbin/bhyve pci_ahci.c pci_virtio_block.c

Define AHCI_PORT_IDENT and increase by 1 the VTBLK_BLK_ID_BYTES
to avoid buffer accessed out of bounds, also switch to snprintf(3).

PR:            200859
Submitted by:   Caglar <caglar at 10ur.org>
Obtained from:  https://github.com/mist64/xhyve/pull/24
MFC after:      4 weeks
Sponsored by:   iXsystems Inc.

OpenBSD/ports SmUeXDnsecurity/openssl/1.1 Makefile distinfo, security/openssl/1.1/patches patch-Configurations_unix-Makefile_tmpl

   update to openssl-1.1.1a

OpenBSD/ports y5i061ksecurity/openssl/1.0.2 Makefile distinfo, security/openssl/1.0.2/patches patch-crypto_rand_randfile_c

   update to openssl-1.0.2q

LLVM/llvm 347355compiler-rt/trunk/lib/sanitizer_common sanitizer_platform_interceptors.h sanitizer_common_interceptors.inc, compiler-rt/trunk/test/sanitizer_common/TestCases/NetBSD setvbuf.cc

[Sanitizer] intercept setvbuf on other platforms where it is supported

Unit tests enabled only in platform tested.

Reviewers: krytarowski, vitalybuka

Reviewed By: krytarowski, vitalybuka

Differential Revision: https://reviews.llvm.org/D54739