FreshBSD

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/vm/vm_unix.c (unresolved)

Fix typo in port directory name.

PR:            240071 [1]
Reported by:    jbeich@, Dries Michiels <driesm.michiels at gmail.com> [1]

   +py-rfc6555

   update to rss2email-2.71, from wen heping, plus add FIX_EXTRACT_PERMISSIONS=Yes

   Initial revision

   MesaLib: disable egl/gbm on SunOS for now. failure reported by wilbury

Update to 3.0.6

Changes:        https://github.com/rubygems/rubygems/blob/master/History.txt
PR:            240024
Exp-run by:     antoine

Sort TEST_DEPENDS

Update to 2.0.7

Changes:        https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md

Update to 2.0.7

Changes:        https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md

Update to 2.0.7

Changes:        https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md

Update to 1.3.4

Changes:        https://github.com/googleapis/google-cloud-ruby/releases
               
https://github.com/googleapis/google-cloud-ruby/blob/master/stackdriver-core/CHANGELOG.md

Update to 1.7.0

Changes:        https://github.com/googleapis/google-cloud-ruby/releases
               
https://github.com/googleapis/google-cloud-ruby/blob/master/google-cloud-logging/CHANGELOG.md

Update to 1.2.1

- Update version requirement of RUN_DEPENDS

Changes:        https://github.com/googleapis/google-cloud-ruby/releases
               
https://github.com/googleapis/google-cloud-ruby/blob/master/google-cloud-env/CHANGELOG.md

Update to 1.3.1

- Update version requirement of RUN_DEPENDS

Changes:        https://github.com/googleapis/google-cloud-ruby/releases
               
https://github.com/googleapis/google-cloud-ruby/blob/master/google-cloud-core/CHANGELOG.md

Update to 2.11.339

Changes:        https://github.com/aws/aws-sdk-ruby/releases

Update to 2.11.339

Changes:        https://github.com/aws/aws-sdk-ruby/releases

Update to 2.11.339

Changes:        https://github.com/aws/aws-sdk-ruby/releases

Update to 1.0.8

Changes:        https://github.com/jupyterlab/jupyterlab/commits/master

Update to 4.34.0

Changes:        
https://github.com/HypothesisWorks/hypothesis/blob/master/hypothesis-python/docs/changes.rst

Update to 0.80

Changes:        https://metacpan.org/changes/distribution/YAML-LibYAML

Update to 0.9907

Changes:        https://metacpan.org/changes/distribution/Perl-PrereqScanner-NotQuiteLite

Update to 0.599

Changes:        https://metacpan.org/changes/distribution/Color-RGB-Util

Remove p5-Color-RGB-Util version hack as 0.599 is released now

Update to 4.3.2

Changes:        https://github.com/keybase/client/releases

Update to 878.260.1

Update build glue for a build of clang plus the extra tools (enabled via
MK_CLANG_EXTRAS).

Remove empty categories; d'oh!

devel/pthreadpool: fix build with GCC architectures

Use newer GCC than what base offers:
/wrkdirs/usr/ports/devel/pthreadpool/work/pthreadpool-6673a4c/src/threadpool-pthreads.c:59:4: 
error: #error "Unsupported platform"

Approved by:    mentors (implicit approval)

mail/mairix: fix build with GCC-based architectures

C11 compiler is necessary:
parse.c:1889: error: expected '=', ',', ';', 'asm' or '__attribute__' before ':' token

Approved by:    mentors (implicit approval)

Publish the 2019Q2 status report.

Add Quarterly Status Report for 2019Q2.

Reviewed by:    bcr (earlier version)
Differential Revision:  https://reviews.freebsd.org/D21381

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

* freebsd/current/master:
  ping: fix unaligned access to ancillary data
  last(1): correction after r351413
  Add nvdimm(4) man page.
  amd64: rework PCPU allocation
  Do not constrain allocations for doublefault, boot, and mce stacks.
  Style.
  Remove unecessary VM_ALLOC_ZERO from allocation of the domain-local page for pcpu.
  Make stack grow use the same gap as stack create.
  dtso: allwinner: Add an overlay for H3 thermal node

Merge tag 'hyperv-fixes-signed' of 
git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull Hyper-V fixes from Sasha Levin:

 - Fix for panics and network failures on PAE guests by Dexuan Cui.

 - Fix of a memory leak (and related cleanups) in the hyper-v keyboard
   driver by Dexuan Cui.

 - Code cleanups for hyper-v clocksource driver during the merge window
   by Dexuan Cui.

 - Fix for a false positive warning in the userspace hyper-v KVP store
   by Vitaly Kuznetsov.

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE
  Tools: hv: kvp: eliminate 'may be used uninitialized' warning
  Input: hyperv-keyboard: Use in-place iterator API in the channel callback
  Drivers: hv: vmbus: Remove the unused "tsc_page" from struct hv_context

   Bump keybase to 4.3.2.

   - Fix readme.
   - Add 'run_keybase' for easy startup.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
 "Two KVM/arm fixes for MMIO emulation and UBSAN.

  Unusually, we're routing them via the arm64 tree as per Paolo's
  request on the list:

    https://lore.kernel.org/kvm/21ae69a2-2546-29d0-bff6-2ea825e3d968 at redhat.com/

  We don't actually have any other arm64 fixes pending at the moment
  (touch wood), so I've pulled from Marc, written a merge commit, tagged
  the result and run it through my build/boot/bisect scripts"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity
  KVM: arm/arm64: Only skip MMIO insn once

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Four fixes, three for edge conditions which don't occur very often.
  The lpfc fix mitigates memory exhaustion for some high CPU systems"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: Mitigate high memory pre-allocation by SCSI-MQ
  scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()
  scsi: target: tcmu: avoid use-after-free after command timeout
  scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure

Merge tag 'xfs-5.3-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull xfs fix from Darrick Wong:
 "A single patch that fixes a xfs lockup problem when a chown/chgrp
  operation fails due to running out of quota. It has survived the usual
  xfstests runs and merges cleanly with this morning's master:

   - Fix a forgotten inode unlock when chown/chgrp fail due to quota"

* tag 'xfs-5.3-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT

Merge tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm

Pull more drm fixes from Dave Airlie:
 "Although the tree built for me fine on arm here, it appears either
  header cleanups in next or some kconfig combo it breaks, so this
  contains a fix to mediatek to include dma-mapping.h explicitly.

  There was also one nouveau fix that came in late that I was going to
  leave until next week, but since I was sending this I thought it may
  as well be in here:

  mediatek:
   - fix build in some cases

  nouveau:
   - fix hang with i2c and mst docks"

* tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm:
  drm/mediatek: include dma-mapping header
  drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX

   Try to fix bulk-build PLIST problems I can't reproduce.

ping: fix unaligned access to ancillary data

Use CMSG_FIRSTHDR rather than assume that an array is correctly aligned.
Fixes warnings on sparc64 and powerpcspe.

Submitted by:   Ján Sučan <sucanjan at gmail.com>
MFH:           2 weeks
Sponsored by:   Google LLC (Google Summer of Code 2019)
Differential Revision:  https://reviews.freebsd.org/D21406

ping: fix unaligned access to ancillary data

Use CMSG_FIRSTHDR rather than assume that an array is correctly aligned.
Fixes warnings on sparc64 and powerpcspe.

Submitted by:   Ján Sučan <sucanjan at gmail.com>
MFH:           2 weeks
Sponsored by:   Google LLC (Google Summer of Code 2019)
Differential Revision:  https://reviews.freebsd.org/D21406

science/opensim-core: Update 4.0 -> 4.0-601 (a2574fcda)

Add the PYTHON option that enables the pythin binding.
Asked the upstream to make the python binding build separately.

[TLI] Simplify code. NFCI.

MFH: r509729

Update to upstream version 0.21.14

Details:
- Bugfix release, see
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.14/NEWS
- Includes a fix for rare crash after song change

Approved by:    ports-secteam (riggs)

Update to upstream version 0.21.14

Details:
- Bugfix release, see
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.14/NEWS
- Includes a fix for rare crash after song change

MFH:           2019Q3 (hat: ports-secteam)

[clang-tidy] Manually enable exceptions in tesst that uses them

kcollect - Remove system calls from graph

* System calls make the graph too scratchy.  Remove them for now.

Add an entry for FOSDEM 2020.