HardenedBSD/hardenedbsd a906febsys/vm vm_unix.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-5sys/vm/vm_unix.c
+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

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

HardenedBSD/hardenedbsd 6357299sys/amd64/linux32 Makefile, sys/compat/freebsd32 capabilities.conf

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

Conflicts:
        sys/i386/ibcs2/ibcs2_proto.h (deleted)
        sys/i386/ibcs2/ibcs2_syscall.h (deleted)
        sys/i386/ibcs2/ibcs2_sysent.c (deleted)

NetBSD/pkgsrc aE9Fbssmath/py-xarray Makefile

   math/py-xarray: Make this incompatible with py27

   One of its dependencies, py-pandas, has PYTHON_VERSIONS_INCOMPATIBLE.

   While here, remove a redundant buildlink.mk.
VersionDeltaFile
1.2+3-2math/py-xarray/Makefile
+3-21 files

LLVM/llvm 372488llvm/trunk/docs/_templates indexsidebar.html

[Docs] Updates sidebar links

Adds sidebar links to mailing lists, IRC, and meetups and social events.

FreeBSD/src 352586projects/clang900-import/contrib/llvm/tools/clang/lib/AST ExprConstant.cpp

Pull in r371557 from upstream clang trunk (by Richard Smith):

  When evaluating a __builtin_constant_p conditional, always enter
  constant-folding mode regardless of the original evaluation mode.

  In order for this to be correct, we need to track whether we're
  checking for a potential constant expression or checking for
  undefined behavior separately from the evaluation mode enum, since we
  don't want to clobber those states when entering constant-folding
  mode.

This should fix "ld: error: undefined symbol: ix86_isa_flags" (and many
other symbol names) during the initial stages of the lang/gcc* ports.

The issue was that without optimization, the __builtin_constant_p()
expressions generated in gencondmd.c would emit references to global
variables that were undefined, such as ix86_isa_flags.

PR:            240629

LLVM/llvm 372487llvm/trunk/docs index.rst GettingInvolved.rst

[Docs] Adds new page for Getting Involved articles

Adds a new page for existing Getting Involved, Development Process, and Community 
Proposals articles. Also moves Mailing Lists, Meetups and social events, and IRC sections.

NetBSD/src ZRX7DwWshare/examples/npf soho_gw-npf.conf

   Add descriptions for all rules and make use of localnet variable in place of direct IP 
address
VersionDeltaFile
1.15+21-3share/examples/npf/soho_gw-npf.conf
+21-31 files

NetBSD/src XnrLzgUshare/examples/npf soho_gw-npf.conf

   default policy is to blockall
VersionDeltaFile
1.14+1-2share/examples/npf/soho_gw-npf.conf
+1-21 files

FreeBSD/ports 512541head/math/z3 distinfo Makefile, head/math/z3/files patch-scripts_mk__util.py

math/z3: Update to 4.8.6.

NetBSD/src qRrssi2share/examples/npf soho_gw-npf.conf

   Drop the final keyword to use the default policy of last matching rule wins
VersionDeltaFile
1.13+11-11share/examples/npf/soho_gw-npf.conf
+11-111 files

FreeBSD/ports 512540head/security Makefile

Fix INDEX

FreeBSD/ports 512539head/security php74-hash

Delete security/php74-hash

The hash module is now part of the PHP core. It can't be disabled or enabled anymore.
Therefore we remove this port.

Sponsored by:   PHP Upgrade Service

FreeBSD/ports 512538head/math/p5-Math-Int128 Makefile

Appease portlint.

FreeBSD/src 352585head/sys/kern imgact_elf.c

kern.elf{32,64}.pie_base sysctl: enforce page alignment.

Requested by:   rstone
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

FreeBSD/ports 512537head/math/p5-Math-Int128 Makefile

Remove hardcoding from 2013 and replace it with the modern equivalent.
Found while working on powerpc64.

Tested on: amd64, powerpc64.

Approved by:    portmgr (tier-2 blanket)

FreeBSD/src 352584head/sys/arm64/arm64 pmap.c

In case a translation fault on the kernel address space occurs from
within a critical section, we must perform a lock-free check on the
faulting address.

Reported by:    andrew
Reviewed by:    andrew, markj
X-MFC with:     r350579
Differential Revision:  https://reviews.freebsd.org/D21685

FreeBSD/ports 512536head/games Makefile tome4-beta, head/games/tome4 Makefile

add new port: games/tome4-beta

This adds a beta of 1.6 patch for games/tome4

It's a major update. Read more in announcements:
https://te4.org/blogs/darkgod/2019/04/news/whats-next-tales-majeyal-lot-and-then-some
https://te4.org/blogs/darkgod/2019/09/news/tales-majeyal-16-beta1-upon-you

XigmaNAS/svn 6877branches/11.2.0.4/build xigmanas.files, trunk/build xigmanas.files

add mpsutil and mprutil Utility for managing LSI Fusion-MPT 2/3 controllers

NetBSD/src 9KDlQlldist/pf/usr.sbin/ftp-proxy ftp-proxy.8

   grammar

XigmaNAS/svn 6876branches/11.2.0.4/build/ports/e2fsprogs Makefile, trunk/build/ports/e2fsprogs Makefile

add missing lib

NetBSD/pkgsrc-wip 9cbb10apy-cesium Makefile, py-hydrointerp Makefile

py-xarray: Removed

A newer version has been imported into pkgsrc.

LLVM/llvm 372486lldb/trunk/source/Host/common Socket.cpp, lldb/trunk/tools/lldb-vscode lldb-vscode.cpp

[LLDB] Cast -1 (as invalid socket) to the socket type before comparing

This silences warnings about comparison of integers between unsigned
long long (which is what the Windows SOCKET type is) and signed int
when building in MinGW mode.

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

LLVM/llvm 372485lldb/trunk/source/Plugins/Process/Windows/Common ProcessWindows.cpp NativeProcessWindows.cpp

[LLDB] Use SetErrorStringWithFormatv for cases that use LLVM style format strings

SetErrorStringWithFormat only supports normal printf style format
strings.

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

LLVM/llvm 372484lldb/trunk/source/Plugins/Process/Windows/Common NativeProcessWindows.cpp

[LLDB] Use LLVM_FALLTHROUGH instead of a custom comment

This fixes a warning when built with Clang in MinGW mode.

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

LLVM/llvm 372483lldb/trunk/source/Plugins/Process/Windows/Common TargetThreadWindows.cpp RegisterContextWindows.cpp

[LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC 
defines

This matches how it is done in all other similar ifdefs throughout
lldb.

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

LLVM/llvm 372482lldb/trunk/source/Plugins/Process/Windows/Common NativeRegisterContextWindows.h

[LLDB] Fix compilation for MinGW, remove redundant class name on inline member

This fixes build errors like these:

NativeRegisterContextWindows.h:22:33: error: extra qualification on member 
'NativeRegisterContextWindows'
  NativeRegisterContextWindows::NativeRegisterContextWindows(
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^

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

LLVM/llvm 372481llvm/trunk/include/llvm/DebugInfo/CodeView CodeViewRegisters.def

[CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header

This fixes (one aspect of) compilation of LLDB with MSVC for ARM64.

LLDB source files include intrin.h, and the MSVC intrin.h transitively
includes arm64intr.h, which has an ARM64_FPSR define, which clashes
with the enum declaration.

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

FreeBSD/src 352583head/sys/kern subr_lock.c

lockprof: use CPUFOREACH and drop always false lp_cpu NULL checks

Sponsored by:   The FreeBSD Foundation

FreeBSD/ports 512535head/devel/openmp distinfo Makefile, head/devel/openmp/files patch-bug32279 patch-runtime_cmake_LibompHandleFlags.cmake

devel/openmp: update to 9.0.0

- Connect tests to the framework to help QA remaining patches
- Force rebuild all consumers after https://reviews.llvm.org/D59783

Changes:        
http://llvm.org/viewvc/llvm-project/openmp/tags/RELEASE_900/final/?view=log
ABI:           https://abi-laboratory.pro/tracker/timeline/llvm_openmp/

FreeBSD/ports 512534head/security/clamsmtp Makefile distinfo

security/clamsmtp: Unbreak by switching to new master site

PR:            240731
Submitted by:   Yasuhiro KIMURA <yasu at utahime.org>

FreeBSD/ports 512533head/graphics/rapid-photo-downloader Makefile pkg-descr, head/graphics/rapid-photo-downloader/files patch-raphodo_storage.py patch-raphodo_rapid.py

New port: graphics/rapid-photo-downloader

Rapid Photo Downloader imports photos and videos from cameras, phones,
memory cards and other devices at high speed. It can be configured to
rename photos and videos with meaningful filenames you specify. It can
also back up photos and videos as they are downloaded. It downloads
from and backs up to multiple devices simultaneously.

WWW: http://www.damonlynch.net/rapid/

PR:            240601
Submitted by:   m.ne at gmx.net
Reviewed by:    koobs

FreeBSD/ports 512532head/sysutils Makefile p5-File-Rename, head/sysutils/p5-File-Rename Makefile pkg-descr

New port: sysutils/p5-File-Rename

rename renames the filenames supplied according to the rule specified as the
first argument. The perlexpr argument is a Perl expression which is expected
to modify the $_ string in Perl for at least some of the filenames specified.
If a given filename is not modified by the expression, it will not be renamed.
If no filenames are given on the command line, filenames will be read via
standard input.

WWW: https://metacpan.org/release/File-Rename

PR:            240728
Submitted by:   Vidar Karlsen <vidar at karlsen.tech>

NetBSD/pkgsrc 51BZORcdoc CHANGES-pkgsrc-2019Q2

   Pullup tickets up to #6057
VersionDeltaFile
1.1.2.15+10-1doc/CHANGES-pkgsrc-2019Q2
+10-11 files

NetBSD/pkgsrc AUEP3Smmisc/fbreader distinfo, misc/fbreader/patches patch-fbreader_src_formats_doc_OleStorage.cpp patch-fbreader_src_formats_doc_OleStorage.cpp

   Pullup ticket #6057 - requested by maya
   misc/fbreader: build fix

   Revisions pulled up:
   - misc/fbreader/distinfo                                        1.13
   - misc/fbreader/patches/patch-fbreader_src_formats_doc_OleStorage.cpp 1.1

   ---
      Module Name:      pkgsrc
      Committed By:     maya
      Date:            Mon Sep  9 13:31:53 UTC 2019

      Modified Files:
        pkgsrc/misc/fbreader: distinfo
      Added Files:
        pkgsrc/misc/fbreader/patches:
            patch-fbreader_src_formats_doc_OleStorage.cpp

      Log Message:
      fbreader: avoid narrowing conversion warning. Taken from gentoo.

      Fixes PR pkg/54107: pkgsrc-2019Q1/misc/fbreader doesn't build with
      newer compiler(s)

NetBSD/src seCSg1Odoc CHANGES-8.2

   Ammend ticket #1380 for additional changes
VersionDeltaFile
1.1.2.39+2-1doc/CHANGES-8.2
+2-11 files

NetBSD/src KT2xgd2sys/arch/xen/include/xen-public platform.h

   Apply patch, requested by manu in ticket #1380: add definitions to query
   the ACI RSDP table.
VersionDeltaFile
1.1.1.2.42.1+47-1sys/arch/xen/include/xen-public/platform.h
+47-11 files

FreeBSD/ports 512531head/games/tome4 Makefile

clean up games/tome4 port

- reorder sections
- remove LLD_UNSAFE, not needed after openal update
- prepare for a slave port

NetBSD/pkgsrc F3MnGEOdoc CHANGES-2019

   doc: Added py-xarray
VersionDeltaFile
1.4016+2-1doc/CHANGES-2019
+2-11 files

FreeBSD/ports 512530head/audio/grip Makefile

Fix build on GCC-based systems:

  /usr/local/lib/libgraphite2.so.3: undefined reference to 
`__cxa_throw_bad_array_new_length at CXXABI_1.3.8'

Approved by:    portmgr (tier-2 blanket)

LLVM/llvm 372480llvm/trunk/lib/Transforms/Scalar SROA.cpp, llvm/trunk/test/Transforms/SROA vector-promotion-different-size.ll

SROA: Check Total Bits of vector type

While Promoting alloca instruction of Vector Type, 
Check total size in bits of its slices too.
If they don't match, don't promote the alloca instruction.

Bug : https://bugs.llvm.org/show_bug.cgi?id=42585

NetBSD/pkgsrc 26AAJxmmath Makefile

   math/Makefile: Add py-xarray
VersionDeltaFile
1.435+2-1math/Makefile
+2-11 files

NetBSD/pkgsrc DitfF15math/py-xarray PLIST Makefile

   math/py-xarray: Import version 0.5.1

   xarray (formerly xray) is an open source project and Python package
   that aims to bring the labeled data power of pandas to the physical
   sciences, by providing N-dimensional variants of the core pandas data
   structures.

   Packaged by K.I.A.Derouiche for pkgsrc-wip, and updated by me.

FreeBSD/ports 512529head/astro/routino Makefile

Fix build on GCC-based installations:

  xmlparse.c:1244: error: #pragma GCC diagnostic not allowed inside functions

Approved by:    portmgr (tier-2 blanket)

FreeBSD/ports 512528head/audio/oss pkg-message Makefile, head/audio/oss/files patch-setup_FreeBSD_sbin_soundon

audio/oss: Improve handling when sound.ko is compiled into the kernel.

Now, soundon checks for its presence and fails with an appropriate error.

While here, add it to pkg-message.

I use this still as I have a Xonar D2X which FreeBSD's drivers don't support,
so I'll take maintainership.

PR:            ports/240200

Linux/linux 104c0d6drivers/mtd/ubi block.c wl.c, fs/jffs2 fs.c gc.c

Merge tag 'upstream-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs

Pull UBI, UBIFS and JFFS2 updates from Richard Weinberger:
 "UBI:
   - Be less stupid when placing a fastmap anchor
   - Try harder to get an empty PEB in case of contention
   - Make ubiblock to warn if image is not a multiple of 512

  UBIFS:
   - Various fixes in error paths

  JFFS2:
   - Various fixes in error paths"

* tag 'upstream-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  jffs2: Fix memory leak in jffs2_scan_eraseblock() error path
  jffs2: Remove jffs2_gc_fetch_page and jffs2_gc_release_page
  jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()
  ubi: block: Warn if volume size is not multiple of 512
  ubifs: Fix memory leak bug in alloc_ubifs_info() error path
  ubifs: Fix memory leak in __ubifs_node_verify_hmac error path
  ubifs: Fix memory leak in read_znode() error path
  ubi: ubi_wl_get_peb: Increase the number of attempts while getting PEB
  ubi: Don't do anchor move within fastmap area
  ubifs: Remove redundant assignment to pointer fname

Linux/linux 9dca343arch/um/drivers virtio_uml.c vector_user.c, arch/um/os-Linux signal.c file.c

Merge tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:

 - virtio support

 - fixes for our new time travel mode

 - various improvements to make lockdep and kasan work better

 - SPDX header updates

* tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (25 
commits)
  um: irq: Fix LAST_IRQ usage in init_IRQ()
  um: Add SPDX headers for files in arch/um/include
  um: Add SPDX headers for files in arch/um/os-Linux
  um: Add SPDX headers to files in arch/um/kernel/
  um: Add SPDX headers for files in arch/um/drivers
  um: virtio: Implement VHOST_USER_PROTOCOL_F_REPLY_ACK
  um: virtio: Implement VHOST_USER_PROTOCOL_F_SLAVE_REQ
  um: drivers: Add virtio vhost-user driver
  um: Use real DMA barriers
  um: Don't use generic barrier.h
  um: time-travel: Restrict time update in IRQ handler

    [10 lines not shown]

LLVM/llvm 372479llvm/trunk/lib/Transforms/Scalar SROA.cpp

Test mail. NFC.

Testing commit acces. NFC.

FreeBSD/src 352582head/sys/kern imgact_elf.c

Make non-ASLR pie base tunable.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

Linux/linux 4553d46drivers/mtd cmdlinepart.c, drivers/mtd/devices m25p80.c

Merge tag 'mtd/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Pull MTD updates from Richard Weinberger:
 "MTD core changes:
   - add debugfs nodes for querying the flash name and id
   - mtd parser reorganization

  SPI NOR core changes:
   - always use bounce buffer for register read/writes
   - move m25p80 code in spi-nor.c
   - rework hwcaps selection for the spi-mem case
   - rework the core in order to move the manufacturer specific code out
     of it:
       - regroup flash parameters in 'struct spi_nor_flash_parameter'
       - add default_init() and post_sfdp() hooks to tweak the flash
         parameters
       - introduce the ->set_4byte(), ->convert_addr() and ->setup()
         methods, to deal with manufacturer specific code
       - rework the SPI NOR lock/unlock logic
   - fix an error code in spi_nor_read_raw()
   - fix a memory leak bug
   - enable the debugfs for the partname and partid
   - add support for few flashes

  SPI NOR controller drivers changes:

    [52 lines not shown]