HardenedBSD/hardenedbsd a906febsys/vm vm_unix.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
+0-51 files

HardenedBSD/hardenedbsd 887d9e4lib/libcasper/services/cap_sysctl cap_sysctl.c cap_sysctl.3, lib/libcasper/services/cap_sysctl/tests sysctl_test.c

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

        sys/vm/vm_unix.c (unresolved)

FreeBSD/ports 509607head/lang/gcc8/files patch-clang-vec_step

clang on rs6000/powerpc* unfortunately poisons user namespace by default
(without any special options or include files being required).

Until that changes (or GCC changes) we need to avoid using vec_step as a
variable name.

PR:            239266

LLVM/llvm 369665llvm/trunk/lib/Target/X86 X86MCInstLower.cpp

[X86] Remove MCInstLower code that drops operands from some CALL and TAILJMP instructions. 
Add asserts to verify operand count

It appears the FIXME here was handled at some point. r159728 from 2012 seems to be at 
least aportion of fixing it.

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

OpenBSD/ports VOzgOu4security/clamav Makefile distinfo, security/clamav/patches patch-etc_clamd_conf_sample

   update to clamav 0.101.4,
   - out of bounds write in NSIS bzip2 library
   - improvements to the zip bomb mitigations added in 0.101.3, there is now
   a maximum scan time limit, defaulting to 2 minutes

LLVM/llvm 369664llvm/trunk/lib/CodeGen MachineBlockPlacement.cpp, llvm/trunk/test/CodeGen/PowerPC atomics-regression.ll

[MBP] Disable aggressive loop rotate in plain mode

Patch https://reviews.llvm.org/D43256 introduced more aggressive loop layout optimization 
which depends on profile information. If profile information is not available, the 
statically estimated profile information(generated by BranchProbabilityInfo.cpp) is used. 
If user program doesn't behave as BranchProbabilityInfo.cpp expected, the layout may be 

To be conservative this patch restores the original layout algorithm in plain mode. But 
user can still try the aggressive layout optimization with 

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

NetBSD/pkgsrc HlvT7TCdoc CHANGES-2019

   doc: Updated multimedia/vlc to 3.0.8
+2-11 files

NetBSD/pkgsrc j5DDhCCmultimedia/vlc distinfo Makefile

   vlc: Update to 3.0.8

   XXX libarchive option is broken with netbsd-9 so has to be disabled
   (version number detection fails)

   Changes between and 3.0.8:

    * Fix stuttering for low framerate videos

    * Fix channel ordering in some MP4 files
    * Fix glitches in TS over HLS
    * Add real probing of HLS streams
    * Fix HLS MIME type fallback

    * Fix WebVTT subtitles rendering

   Stream filter:
    * Improve network buffering

    * Update Youtube script

    [26 lines not shown]

OpenBSD/ports Th8VlDGnet/isc-bind Makefile distinfo, net/isc-bind/patches patch-lib_isc_unix_net_c patch-lib_isc_unix_socket_c

   update to bind-9.11.10

FreeNAS/freenas e92b2f6build/escrowd escrowd.c escrowd.8, nas_ports/freenas/freenas-files Makefile

feat(build): add escrowd

Ticket: NAS-102415

NetBSD/src qROwHLxsbin/route route.c

   route(8): print RTM_CHANGE messages

   XXX Pullup -9
+3-21 files

FreeNAS/freenas d4bd864src/extract-tarball extract-tarball.c Makefile, src/fix_ea fix_ea.c Makefile

Merge branch 'master' into freenas/12-devel

FreeBSD/src 351395head/sys/fs/msdosfs msdosfs_fat.c

msdosfs_fat: reduce diffs with NetBSD and makefs

Use pointer arithmetic (as now done in makefs, and in NetBSD) instead of
taking the address of array element.  No functional change, but this
makes it easier to compare different versions of this file.

Reviewed by:    kib
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D21365

HardenedBSD/hardenedbsd 8780bf5contrib/mandoc main.c man_term.c

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

* freebsd/12-stable/master:
  MFC r350351:

NetBSD/pkgsrc-wip 7e06065proxychains-ng Makefile DESCR

proxychains-ng: updated to 4.14 & added maintainer

Changes since 4.11:
- allow alternative proto://user:pass at ip:port syntax for proxylist
- skip connection attempt to nullrouted ips
- allow hostnames for proxylist under specific circumstances
- add support for Solaris
- buildfixes & bugfixes

ZFS on Linux/src 20f7b91tests/zfs-tests/tests/functional/vdev_zaps vdev_zaps_005_pos.ksh

ZTS: Fix vdev_zaps_005_pos on CentOS 6

The ancient version of blkid (v2.17.2) used in CentOS 6 will not
detect the newly created pool unless it has been written to.
Force a pool sync so `zpool import` will detect the newly created

Reviewed-by: John Kennedy <john.kennedy at delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1 at llnl.gov>
Closes #9199 

FreeNAS/freenas 1a1711cbuild/escrowd escrowd.c, src/freenas/usr/local/lib/middlewared_truenas/alert/source license_status.py

Merge pull request #3490 from freenas/issues/tnfiles

Bring in most of TrueNAS code

LLVM/llvm 369663llvm/branches release_90, llvm/branches/release_90/lib/Target/Mips/AsmParser MipsAsmParser.cpp

Merging r367580:
r367580 | atanasyan | 2019-08-01 18:04:29 +0200 (Thu, 01 Aug 2019) | 18 lines

[mips] Fix lowering load/store instruction in PIC case

If an operand of the `lw/sw` instructions is a symbol, these instructions
incorrectly lowered using not-position-independent chain of commands.
For PIC code we should use `lw/addiu` instructions with the `R_MIPS_GOT16`
and `R_MIPS_LO16` relocations respectively. Instead of that LLVM generates
position dependent code with the `R_MIPS_HI16` and `R_MIPS_LO16`

This patch provides a fix for the bug by handling PIC case separately in
the `MipsAsmParser::expandMemInst`. The main idea is to generate a chain
of PIC instructions to load a symbol address into a register and then
load the address content.

The fix is not optimal and does not fix all PIC-related problems. This
is a task for subsequent patches.

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

OPNSense/plugins b63dfadmisc/theme-cicada Makefile, misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets main.scss

Themes - Cicada/Tukan - sensei color update (#1456)

LLVM/llvm 369662llvm/trunk/lib/CodeGen/SelectionDAG DAGCombiner.cpp, llvm/trunk/test/CodeGen/PowerPC qpx-recipest.ll

[DAGCombiner] Remove explicit call to AddToWorklist in sqrt and reciprocal computations

Summary: These nodes end up being processed regardless due to DAGCombiner ensuring 
arguments are processed. This changes the order in which nodes are processed, which fixes 
an issue on PowerPC.

Reviewers: craig.topper, efriedma, RKSimon, lebedev.ri, mcberg2017, stefanp, hfinkel

Subscribers: nemanjai, MaskRay, jsji, steven.zhang, llvm-commits

Tags: #llvm

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

DragonFlyBSD/src 6a3a20busr.bin/dsynth repo.c build.c

dphase - Stabilization

* Fix a memory leak in scanit()

* When fork()/forkpty() fails, provide a reason in log 00.

DragonFlyBSD/src 1991e94sys/dev/disk/vn vn.c, sys/dev/misc/snp snp.c

kernel - Fix devfs bitmap races for pty and other devices

* Use an internal lock to protect the integrity of bitmap
  operations for devfs_clone_bitmap_*() functions, allowing
  devices to use the functions without having to lock themselves.

* Devices which use devfs_clone_bitmap_chk() + devfs_clone_bitmap_set()
  sequences have to be more careful, either having their own covering
  lock or checking the return code from devfs_clone_bitmap_set() and

* This fixes serious /dev/ptmx pty allocation races which become obvious
  when pty's are allocated concurrently at a high rate, such as by the
  dsynth code.

FreeNAS/freenas ac6575bsrc/middlewared/middlewared/etc_files rc.conf.py

NFS rc.conf for HA

FreeNAS/freenas 6491384src/freenas/etc rc.conf.local

Merge pull request #3494 from freenas/NAS-102894

NAS-102894 / 11.2 / Proper NFS rc.conf for HA

FreeNAS/freenas 3b4045esrc/middlewared/middlewared/etc_files rc.conf.py

NFS rc.conf for HA

FreeBSD/ports 509606head/net/liferea distinfo Makefile

Update liferea to 1.12.7.

LLVM/llvm 369661llvm/trunk/test/tools/llvm-mca/X86/BtVer2 resources-x86_64.s xadd.s

[X86][BtVer2] Fix latency/throughput of scalar integer MUL instructions.

Single operand MUL instructions that implicitly set EAX have the following
latency/throughput profile (see below):

imul %cl              # latency: 3cy - uOPs: 1 - 1 JMul
imul %cx              # latency: 3cy - uOPs: 3 - 3 JMul
imul %ecx             # latency: 3cy - uOPs: 2 - 2 JMul
imul %rcx             # latency: 6cy - uOPs: 2 - 4 JMul

mul %cl               # latency: 3cy - uOPs: 1 - 1 JMul
mul %cx               # latency: 3cy - uOPs: 3 - 3 JMul
mul %ecx              # latency: 3cy - uOPs: 2 - 2 JMul
mul %rcx              # latency: 6cy - uOPs: 2 - 4 JMul

Excluding the 64bit variant, which has a latency of 6cy, every other instruction
has a latency of 3cy. However, the number of decoded macro-opcodes (as well as
the resource cyles) depend on the MUL size.

The two operand MULs have a more predictable profile (see below):

imul %dx, %dx         # latency: 3cy - uOPs: 1 - 1 JMul
imul %edx, %edx       # latency: 3cy - uOPs: 1 - 1 JMul
imul %rdx, %rdx       # latency: 6cy - uOPs: 1 - 4 JMul

    [8 lines not shown]

LLVM/llvm 369660lldb/trunk/source/Commands CommandObjectProcess.cpp

[lldb] Remove ')' to fix the build

That ')' slipped in by accident in the reformatting commit.

FreeNAS/freenas 41646ccsrc/freenas/etc rc.conf.local

Proper NFS rc.conf for HA

OpenBSD/src sCWmh0Alib/libcrypto/man X509_check_purpose.3 BASIC_CONSTRAINTS_new.3

LLVM/llvm 369659llvm/trunk/test/CodeGen/PowerPC qpx-recipest.ll

[PowerPC] Regenerate reciprocal tests, as discussed on D66548

LLVM/llvm 369658llvm/trunk/lib/Target/PowerPC PPCISelLowering.cpp PPCRegisterInfo.td

[PowerPC] Add combined ELF ABI and 32/64 bit queries to the subtarget. [NFC]

A lot of places in the code combine checks for both ABI (SVR4/Darwin/AIX) and
addressing mode (64-bit vs 32-bit). In an attempt to make some of the code more
readable I've added a couple functions that combine checking for the ELF abi and
64-bit/32-bit code at once. As we add more AIX support I intend to add similar
functions for the AIX ABI.

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

LLVM/llvm 369657llvm/trunk/include/llvm/MC MCSymbolXCOFF.h, llvm/trunk/lib/MC XCOFFObjectWriter.cpp

[PowerPC][XCOFF][MC] Explicitly set containing csect on symbols. [NFC]

Previously we would get the csect a symbol was contained in through its
fragment. This works only if we are writing an object file, and only for
defined symbols. To fix this we set the contating csect explicitly on the
MCSymbolXCOFF object.

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

FreeBSD/src 351394head/etc/mtree BSD.tests.dist, head/sbin/ping6 Makefile tests

ping6: add a basic functional test

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

FreeNAS/freenas b41954b

Empty commit to create PR on github.

You should reset it
+0-00 files

FreeNAS/freenas 1fa1c09src/freenas/etc rc.conf.local

Merge pull request #3491 from freenas/NAS-102894

NAS-102894 / 11.2 / Do not start NFS on HA standby node

FreeBSD/ports 509605head/print/cups-filters distinfo Makefile

Update to 1.25.3.

FreeBSD/ports 509604head/devel/systemc Makefile

Restrict to this port to only architectures where it is known to build.

Approved by:    portmgr (tier-2 blanket)

FreeNAS/freenas 7d84b32gui/failover detect.py

fix(ha): identify using processor product

Suggested by:   @amotin

FreeNAS/freenas 8b87c1egui/failover detect.py

feat(ha): detect BHYVE HA mode

Ticket: #60741
+14-301 files

FreeNAS/freenas d7f3d28gui/failover detect.py

Add new/alternative Warp enclosure name detection.

FreeNAS/freenas b270813gui/failover detect.py

Fix WARP platform detection.

It appeared that in production enclosure will have different name.

FreeBSD/src 351393head/sbin/ping/tests ping_test.sh ping_c1_s56_t1.out

ping: add a basic functional test

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

FreeNAS/freenas e6515fbgui/failover detect.py

fix(ha): set HA to MANUAL if no platform was detected

Ticket: #27202

FreeNAS/freenas bd622b1gui/failover detect.py

Replace abandoned AIC platform support with new ECHOWARP.
+15-141 files

FreeNAS/freenas dec3249gui/failover detect.py

fix(ha): getencstat can return non-utf8 bytes on SBB

Ticket: #26793

FreeNAS/freenas 53fe267gui/failover detect.py

Various VMware hacks
+30-111 files

FreeBSD/ports 509603branches 2019Q3, branches/2019Q3/www/node8 distinfo Makefile

MFH: r509479

www/node8: Update 8.16.0 -> 8.16.1

This is a security release. All Node.js users should consult the security
release summary at
for details on patched vulnerabilities.

Security:       c97a940b-c392-11e9-bb38-000d3ab229d6
Sponsored by:   Miles AS

Approved by:    ports-secteam (joneum)

FreeNAS/freenas ccecd97gui/failover detect.py

Add PUMA detection based on enclosure information.

Previous approach based on license appeared to be too inconvenient.

Ticket: #25109
+35-181 files

FreeNAS/freenas ffbc3b9gui/failover detect.py

Update baseboard-product-name to one used in GA BIOS.

Ticket: #25045