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)

HardenedBSD/hardenedbsd dd0f9ebsys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_rlock.c vdev_indirect.c, sys/dev/nctgpio nctgpio.c

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

HardenedBSD/hardenedbsd 878f67bsys/riscv/riscv elf_machdep.c

HBSD: Resolve merge conflict

Keep FreeBSD's ASR disabled for RISC-V.

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

HardenedBSD/hardenedbsd 657ef51share/man/man4 superio.4, share/man/man9 superio.9

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

        sys/riscv/riscv/elf_machdep.c (unresolved)

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

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

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

FreeNAS/freenas 4318bdfsrc/middlewared/middlewared/plugins disk.py

Correctly retrieve disk identifier with gpt partition uuids

FreeBSD/ports 519091head/x11-fonts Makefile blackout, head/x11-fonts/blackout Makefile pkg-plist

New port: x11-fonts/blackout

Blackout is a stencil sans-serif font. Its author describes it in the
following words: "Eats holes for breakfast lunch and dinner. Inspired by
filling in sans-serif newspaper headlines. Continually updated with coffee
and music. Makes your work louder than the next person's."

The font comes in three styles: Midnight (solid), 2AM (reversed), & Sunrise

WWW: https://www.theleagueofmoveabletype.com/blackout

PS: This is the font featured in the official 36C3 style guide.

FreeBSD/ports 519090head/games/rawgl Makefile pkg-descr, head/games/rawgl/files pkg-message.in patch-Makefile

- Add games/rawgl

rawgl is a re-implementation of the engine used in the game Another World.

WWW: https://github.com/cyxx/rawgl

PR:            227299
Submitted by:   pkubaj at FreeBSD.org

FreeBSD/src 355424head/release/arm RPI-B.conf, head/release/arm64 RPI3.conf

release: chase ports r519089 (rpi-firmware update)

The recent rpi-firmware update renamed "0" to "zero" in the RPi0 DTB

It also included the components needed to boot the RPi4, so install those
now -- interested parties can install sysutils/u-boot-rpi4 and copy
config_rpi4.txt to config.txt on the FAT partition in order to boot the
board. Do note that we currently don't support ethernet/usb/pci.

Reviewed by:    manu
MFC after:      3 days

FreeBSD/ports 519089head/sysutils/rpi-firmware pkg-plist Makefile, head/sysutils/rpi-firmware/files config_rpi4.txt config_rpi_0_w.txt

rpi-firmware: update to a recent commit

The purpose of this update being primarily for RPi4 support to ease the
burden of anyone wanting to try -CURRENT and assist with driver -- note that
we currently don't support ethernet/usb/pci on the RPi4.

Some cleanup has also been done to not duplicate variables that the ports
framework already provides (${WRKSRC_${tag}}) and simplify.

This update does include a rename of some dtb that will require a
corresponding change in base to ^/release, which will follow this commit.

Approved by:    manu (maintainer (uboot), ports)

FreeNAS/freenas f44fd96src/middlewared/middlewared/plugins/device_ device_info_linux.py

Make device.get_disk work on linux with all attributes

OpenBSD/src OsAW6P1share/man/man9 uvm_pagealloc.9 uvm_km_alloc.9

   tweak previous;

FreeBSD/ports 519088head/sysutils/di distinfo Makefile, head/sysutils/di/files patch-C-Makefile

- Update to 4.47.2

PR:            242331
Submitted by:   cyberbotx at cyberbotx.com (maintainer)

NetBSD/src A5jXNnusys/dev/dm dm_ioctl.c device-mapper.c

   dm: Remove unneeded dm_get_version_ioctl()

   "version" is implemented and handled in userspace,
   hence dm ioctl doesn't need to support it.

   taken-from: DragonFlyBSD
+8-183 files

OpenBSD/src mHFd74csbin/unwind resolver.c

   be less verbose in debug logging; ok florian@
+4-41 files

FreeBSD/ports 519087head/sysutils/py-scarab distinfo Makefile

- Update to 0.1.3

PR:            242301
Submitted by:   driesm.michiels at gmail.com (maintainer)

FreeNAS/freenas 4ed3f46src/middlewared/middlewared/plugins network.py, src/middlewared/middlewared/plugins/interface/netif_linux address.py interface.py

interface.query for Linux

FreeBSD/ports 519086head/math/teyjus Makefile

math/teyjus: Spell SHEBANG_GLOB correctly

Drop no longer needed post-patch.

FreeBSD/ports 519085head/www/p5-RT-Extension-LDAPImport Makefile

www/p5-RT-Extension-LDAPImport: Do not set MAN3PREFIX twice

NetBSD/pkgsrc Dk09ocywww/grafana Makefile

   grafana: Move go-package.mk to before bsd.prefs.mk.

   We need to ensure the *_SUPPORTED variables from go/version.mk are set before
   being used in bsd.prefs.mk
+2-21 files

FreeBSD/ports 519084head/devel/ghq pkg-descr Makefile

devel/ghq: Attempt to improve COMMENT and pkg-descr

FreeBSD/ports 519083head/graphics/urho3d Makefile

graphics/urho3d: Add missing USES=xorg

FreeBSD/src 355423head UPDATING

UPDATING: Add long-belated note about certs in base

While the interaction between this and the ETCSYMLINK option of
security/ca_root_nss isn't necessarily fatal, one should be aware and
attempt to understand the ramifications of mixing the two.

ports-secteam will be contacted to discuss the default option for branches
where certs are being included in base.
+10-01 files

OpenBSD/ports GOd0YRYdevel/llvm Makefile, devel/llvm/pkg PLIST-main PFRAG.no-powerpc-main

   Build all targets on powerpc

   Supposedly ld -relax fixes the relocation overflow problems.
   Diff from Brad tested by cwen@

FreeBSD/src 355422head/sys/dev/mlx5 driver.h, head/sys/dev/mlx5/mlx5_core mlx5_main.c

mlx5: Do not poke hardware for statistic after teardown is started.

Sponsored by:   Mellanox Technologies
MFC after:      1 week

OpenBSD/src MM7wGuksys/conf files, sys/uvm uvm_meter.c uvm_stat.c

   Move uvmexp_print() to a better place.

   ok mlarkin@
+63-43 files

FreeBSD/src 355421head/sys/dev/mlx5 mlx5_ifc.h tls.h, head/sys/dev/mlx5/mlx5_core mlx5_tls.c mlx5_cmd.c

Add basic support for TCP/IP based hardware TLS offload to mlx5core.

The hardware offload is primarily targeted for TLS v1.2 and v1.3,
using AES 128/256 bit pre-shared keys. This patch adds all the needed
hardware structures, capabilites and firmware commands.

Sponsored by:   Mellanox Technologies

OpenBSD/src cxrTJVkshare/man/man9 uvm_init.9 uvm_map.9

   Split uvm(9) into smaller manuals.

   ok jmc@, deraadt@, schwarze@

OpenBSD/src aKMKZK9sbin/unwind unwind.conf.5

   Tell a little bit how "preference" works these days; ok florian@
+4-31 files

FreeBSD/src 355420head/sys/geom geom_int.h geom.h, head/sys/geom/mirror g_mirror_ctl.c

Remove duplicate g_debugflags declaration.

While there, define G_F_FOOTSHOOTING instead of numeric constants.

MFC after:      13 days
X-MFX-with:     r355412

FreeNAS/freenas 02441eesrc/middlewared/middlewared/plugins/device_ device_info_base.py device_info_freebsd.py

Remove fwheads and fwsectors keys from device.get_disks output

FreeBSD/src 355419stable 10, stable/10/sys/kern kern_linker.c subr_firmware.c

MFC r355108 and r355170:
Fix panic when loading kernel modules before root file system is mounted.
Make sure the rootvnode is always NULL checked.

Differential Revision:  https://reviews.freebsd.org/D22545
PR:            241639
Sponsored by:   Mellanox Technologies

FreeBSD/src 355418stable 11, stable/11/sys/kern kern_linker.c subr_firmware.c

MFC r355108 and r355170:
Fix panic when loading kernel modules before root file system is mounted.
Make sure the rootvnode is always NULL checked.

Differential Revision:  https://reviews.freebsd.org/D22545
PR:            241639
Sponsored by:   Mellanox Technologies

NetBSD/pkgsrc 1KgJ8Dkdoc CHANGES-2019

   Updated sysutils/py-xattr, devel/py-daemon
+3-11 files

NetBSD/pkgsrc 99RnPFKdevel/py-daemon distinfo Makefile

   py-daemon: updated to 2.2.4

   Version 2.2.4

   Bugs Fixed:
   * Run the Setuptools `egg-info` command as part of the `build`
   * Create the socket and catch “non-socket” errors.
   * Only deal with a range of file descriptors if the range is not empty.
   * Declare Twine as a build dependency.
   * Reformat the change log entries with keepachangelog.com sub-sections.

   * Upgrade Tox dependency to version “3.7.0”.
   * Significant speed-up to discovery of file descriptors to close.
   * Refactor the build system to use Makefile modules for each topic.

OpenBSD/ports S3QGG6gmisc/mc Makefile

   Add debug package for mc.

   Discussed with robert@
+4-21 files

FreeBSD/src 355417stable 12, stable/12/sys/kern kern_linker.c subr_firmware.c

MFC r355108 and r355170:
Fix panic when loading kernel modules before root file system is mounted.
Make sure the rootvnode is always NULL checked.

Differential Revision:  https://reviews.freebsd.org/D22545
PR:            241639
Sponsored by:   Mellanox Technologies

OpenBSD/src CIBao1musr.sbin/smtpd smtpd.conf.5

   revert previous; ingo said it
+52-521 files

FreeBSD/ports 519082head/graphics/mandelbulber distinfo Makefile

- Update to 2.20

NetBSD/pkgsrc hrWRbq9sysutils/py-xattr distinfo Makefile

   py-xattr: updated to 0.9.7

   Version 0.9.7
   * Fix xattr().update() in Python 3

OpenBSD/src 0v1WnMAlib/libcrypto/man X509_STORE_CTX_new.3

   Document X509_STORE_CTX_set_flags() which is a handy way to change the
   verification param flags of a context. While this function is marked as
   likely to be deprecated in OpenSSL it seems that this may not happen.
   This is why we decided to still document it.
   OK and input from ingo@ tb@
+18-31 files

FreeBSD/ports 519081head/devel/kdev-python/files patch-cgite23fa8f

- devel/kdev-python: unbreak with py38

No PORTREVISION bump, build was always broken

Obtained from:  KDE git

FreeBSD/doc 53659head/en_US.ISO8859-1/books/porters-handbook/versions chapter.xml

Porters Handbook: document versions 1300057 through 1300061.

While here fix the date of 1300056.

FreeBSD/ports 519080head/audio/ocp Makefile distinfo, head/audio/ocp/files patch-playogg_oggplay.c

- Update to 0.2.1
- Move to github

OpenBSD/src DRUPr1lusr.sbin/smtpd smtpd.conf.5

   replace "Pf < ... Ns >" with Aq; tidy up lists a little;
+54-541 files

NetBSD/pkgsrc pi8bp6edoc CHANGES-2019

   doc: Updated sysutils/nnn to 2.8.1
+2-11 files

NetBSD/pkgsrc j84WgL9sysutils/nnn distinfo Makefile

   sysutils/nnn: update to 2.8.1

    - Fix always archiving current file
    - More elaborate docs on selection changes
+7-72 files

FreeBSD/src 355416head/sys/kern kern_sx.c

sx: check for SX_LOCK_SHARED | SX_LOCK_WRITE_SPINNER when exclusive-locking

First, this removes a spurious difference compared to rw locks.
More importantly though this avoids a trip through sleepq code if the lock
happens to be caught in this state.

FreeBSD/src 355415head/sys/fs/nullfs null_subr.c

nullfs: locklessly check for entries in null_hashget

During random sampling over poudriere -j 104 over 10% of calls returned NULL.