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 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 
hardened/12-stable/master

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

HardenedBSD/hardenedbsd 6357299sys/compat/cloudabi64 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)

FreeBSD/src 354935head/usr.sbin/jail Makefile

Revert r354896, r354899, r354900:
 Fix build.

Sponsored by:   Rubicon Communications, LLC (netgate.com)

OpenBSD/src ajJXNzpsbin/slaacd slaacd.c

   Configure the default route with RTP_NONE so that the kernel assigns
   different priorities for wired vs. wireless interfaces for us.
   Gleaned from dhclient.
VersionDeltaFile
1.43+2-2sbin/slaacd/slaacd.c
+2-21 files

NetBSD/pkgsrc VPvae59games/ksudoku Makefile PLIST

   ksudoku: fix install of ksudokurc
VersionDeltaFile
1.32+12-1games/ksudoku/Makefile
1.3+2-1games/ksudoku/PLIST
+14-22 files

NetBSD/pkgsrc e0grGAmgames/ksnakeduel Makefile PLIST

   ksnakeduel: fix install of ksnakeduel.knsrc
VersionDeltaFile
1.32+12-1games/ksnakeduel/Makefile
1.3+2-1games/ksnakeduel/PLIST
+14-22 files

OpenBSD/ports HptVZBftextproc/py-pandocfilters Makefile

   Change NO_TEST from "Yes" to the reason why there are no tests.
   Same effect.

NetBSD/pkgsrc Byxdj0rgames/ksirk Makefile PLIST

   ksirk: fix install of ksirk.knsrc
VersionDeltaFile
1.32+12-1games/ksirk/Makefile
1.3+2-1games/ksirk/PLIST
+14-22 files

NetBSD/pkgsrc 5JORPRjgames/kigo Makefile PLIST

   kigo: fix install of kigo*.knsrc
VersionDeltaFile
1.32+14-1games/kigo/Makefile
1.3+3-1games/kigo/PLIST
+17-22 files

NetBSD/pkgsrc ePLhJ6lgames/kgoldrunner Makefile PLIST

   kgoldrunner: fix install of kgoldrunner.knsrc

OpenBSD/ports y3EaPdktextproc/py-spdx-lookup Makefile

   Changing NO_TEST from "Yes" to reason for lack of tests.
   Functions the same as answering "Yes"
VersionDeltaFile
1.4+2-2textproc/py-spdx-lookup/Makefile
+2-21 files

FreeBSD/src 354934head/sys/arm/conf DB-78XXX DB-88F5XXX

mark arm.arm (v4/v5) kernels as NO_UNIVERSE for now

r354290 removed arm.arm from universe, but arm.arm kernels were still
found and built during the kernel stage.  I'm not aware of a better way
to address this at the moment, but since there aren't many arm.arm
kernels anyhow just add an explicit NO_UNIVERSE to them.

Reported by:    rpokala

NetBSD/pkgsrc cZtyGyngames/kdiamond Makefile PLIST

   kdiamond: fix install of kdiamond.knsrc
VersionDeltaFile
1.32+12-1games/kdiamond/Makefile
1.3+2-1games/kdiamond/PLIST
+14-22 files

NetBSD/src wc72e7rsys/dev/mii ipgphy.c ipgphyreg.h

Add missing NetBSD RCS Id. Reported by Andrius V.
VersionDeltaFile
1.5+2-1sys/dev/mii/ipgphy.c
1.3+1-0sys/dev/mii/ipgphyreg.h
+3-12 files

NetBSD/pkgsrc nnIw147games/kblocks Makefile PLIST

   kblocks: fix install of kblocks.knsrc
VersionDeltaFile
1.32+12-1games/kblocks/Makefile
1.3+2-1games/kblocks/PLIST
+14-22 files

NetBSD/src dRT7IATsys/dev/pci if_vge.c

   - Set duplex correctly when user setting is not IFM_AUTO.
   - When the link is up, set VGE_DIAGCTL not from user media setting but from
     the current active link status.
VersionDeltaFile
1.77+22-21sys/dev/pci/if_vge.c
+22-211 files

NetBSD/pkgsrc 2CZdyV5games/katomic Makefile PLIST

   katomic: fix install of katomic.knsrc
VersionDeltaFile
1.32+12-1games/katomic/Makefile
1.3+2-1games/katomic/PLIST
+14-22 files

FreeBSD/src 354933head/sys/arm/broadcom/bcm2835 bcm2835_sdhci.c

bcm2835_sdhci: clean up DMA segments in error handling path

Later parts assume that this would've been done if interrupts are enabled,
but this is the only case in which that wouldn't have been true. This commit
also reorders operations such that we're done touching slot/slot->intmask
before we call back into the SDHCI framework and exit.

NetBSD/pkgsrc 8t0pnvmmisc/step Makefile PLIST

   step: fix install of xdg file
VersionDeltaFile
1.42+11-1misc/step/Makefile
1.4+2-1misc/step/PLIST
+13-22 files

FreeBSD/src 354932head/sys/arm/broadcom/bcm2835 bcm2835_sdhci.c

bcm2835_sdhci: roll back r354823

r354823 kicked DATA_END handling out of the DMA interrupt path "to make
things easy", but this was likely a mistake -- if we know we're done after
we've finished pending DMA operations, we should go ahead and acknowledge
it rather than waiting for the controller to finalize it. If it's not ready,
we'll simply re-enable interrupts and wait for it anyways, to be re-entered
in sdhci_data_intr.

FreeBSD/src 354931head/sys/arm/broadcom/bcm2835 bcm2835_sdhci.c

Revert r354930: wrong diff, right message.

FreeBSD/src 354930head/sys/arm/broadcom/bcm2835 bcm2835_sdhci.c

bcm2835_sdhci: clean up DMA segments in error handling path

Later parts assume that this would've been done if interrupts are enabled,
but this is the only case in which that wouldn't have been true. This commit
also reorders operations such that we're done touching slot/slot->intmask
before we call back into the SDHCI framework and exit.

NetBSD/pkgsrc y3BRJwxmath/cantor Makefile PLIST

   cantor: fix installation of xdg files
VersionDeltaFile
1.54+26-1math/cantor/Makefile
1.5+9-1math/cantor/PLIST
+35-22 files

FreeBSD/ports 518075head/irc/eggdrop-devel pkg-plist Makefile, head/irc/eggdrop-devel/files patch-eggdrop.conf patch-src-match.c

irc/eggdrop-devel: Update to latest commit

FreeBSD/ports 518074head/security/gnupg Makefile

security/gnupg: rebuild man pages on every build

gnupg ships its man pages as texinfo files, precompiled into info files.
This change causes make to rebuild them every time.  There are two reasons:

* Rebuilding them automatically corrects several Linuxisms in paths (e.g.
  /etc => /usr/local/etc).

* Rebuilding them is a neccessary precondition for making any local changes
  that will affect the content of the man pages, which I intend to do in a
  future commit.

Reviewed by:    adamw
Approved by:    adamw (maintainer)
Sponsored by:   Axcient
Differential Revision:  https://reviews.freebsd.org/D22471

OpenBSD/ports BdW4ihydevel/quirks Makefile, devel/quirks/files Quirks.pm

   Add quirk for yabause
VersionDeltaFile
1.814+2-2devel/quirks/Makefile
1.831+2-1devel/quirks/files/Quirks.pm
+4-32 files

OpenBSD/ports ms9Wxyeemulators Makefile, emulators/yabause Makefile distinfo

   Send yabause to the Attic

   No longer runs Saturn games, even after updating to the latest version.
   These days, Saturn can be emulated to mednafen, and users are encouraged
   to switch to that.

   OK fcambus@

ZFS on Linux/src 67a6c3btests/zfs-tests/tests/functional/channel_program/synctask_core tst.terminate_by_signal.ksh

ZTS: tst.terminate_by_signal increase test threshold

The tst.terminate_by_signal test case may occasionally fail when
running in a less consistent virtual environment.  For all observed
failures the process was terminated correctly but it took longer than
expected resulting in too many snapshot being created.

To minimize the likelyhood of this occuring increase the threshold
from 50 to 90 snapshots.  The larger limit will still verifiy that
the channel program was correctly terminated early.

Reviewed-by: Don Brady <don.brady at delphix.com>
Reviewed-by: Reviewed-by: Kjeld Schouten <kjeld at schouten-lebbing.nl>
Signed-off-by: Brian Behlendorf <behlendorf1 at llnl.gov>
Closes #9601 

FreeBSD/src 354929head/sbin/reboot boot_i386.8, head/share/man/man4 sio.4 snp.4

Remove sio(4).
It had been disconnected from build in r181233 in 2008.

Reviewed by:    imp

FreeBSD/ports 518073head/multimedia/wlrobs Makefile

multimedia/wlrobs: define license

FreeBSD/ports 518072head/games/tome4 distinfo Makefile

update game/tome4 to 1.6.1

FreeBSD/ports 518071branches 2019Q4, branches/2019Q4/security/ca_root_nss distinfo Makefile

FreeBSD/ports 518070head/multimedia Makefile wlrobs, head/multimedia/wlrobs Makefile pkg-descr

multimedia/wlrobs: add new port

wlrobs is an obs-studio plugin that allows you to screen capture on
wlroots-based Wayland compositors.

https://hg.sr.ht/~scoopta/wlrobs

FreeBSD/ports 518069head/audio/wavbreaker Makefile pkg-descr

audio/wavbreaker: update to 0.12

- Switch to new home on GitHub
- Drop NLS option as gtk30 depends on gettext unconditionally
- Update COMMENT and pkg-descr based on upstream strings
- Add LICENSE_FILE to avoid "+" using placeholder
- Drop "Created by" after refactor

Changes:        https://github.com/thp/wavbreaker/releases/tag/0.12
Reported by:    upstream

FreeBSD/ports 518068head/devel/rust-cbindgen distinfo Makefile

devel/rust-cbindgen: update to 0.10.0

crates.io now supplies Cargo.lock, so dependencies got downgraded.

Changes:        https://github.com/eqrion/cbindgen/compare/v0.9.1...v0.10.0
Reported by:    Repology

FreeBSD/ports 518067branches 2019Q4, branches/2019Q4/emulators/citra distinfo Makefile

MFH: r518062

emulators/citra: update to s20191120

Changes:        https://github.com/citra-emu/citra/compare/5fa71d425...15ed600c9
Approved by:    ports-secteam (swills, implicit for snapshots)

FreeBSD/ports 518066head/security/ca_root_nss distinfo Makefile, head/security/nss distinfo Makefile

FreeBSD/ports 518065head/lang/rust-nightly distinfo Makefile

lang/rust-nightly: update to 1.41.0.20191121

Changes:        https://github.com/rust-lang/rust/compare/3e525e3f6d9e...f1b882b55805

FreeBSD/ports 518064head/multimedia/aom distinfo Makefile

multimedia/aom: update to 1.0.0.2695

Changes:        https://aomedia.googlesource.com/aom/+log/d5353a1d5..b646a945f

FreeBSD/ports 518063head/multimedia/ffmpeg distinfo Makefile, head/multimedia/svt-av1 distinfo Makefile

multimedia/svt-av1: update to 0.7.0.196

Changes:        https://github.com/OpenVisualCloud/SVT-AV1/compare/2f349b3b...ebd9c80d

FreeBSD/ports 518062head/emulators/citra distinfo Makefile

emulators/citra: update to s20191120

Changes:        https://github.com/citra-emu/citra/compare/5fa71d425...15ed600c9

FreeBSD/ports 518061head/emulators/yuzu distinfo Makefile

emulators/yuzu: update to s20191119

Changes:        https://github.com/yuzu-emu/yuzu/compare/3026aec9b...c52f37f25

FreeBSD/ports 518060head/emulators/rpcs3 distinfo Makefile

emulators/rpcs3: update to 0.0.6.9160

Changes:        https://github.com/RPCS3/rpcs3/compare/2152a7700...8d5ef2c7b

FreeBSD/src 354928stable 12, stable/12/lib/libc/gen auxv.c auxv.3

MFC r354694, r354699

r354694:
elf_aux_info: Add support for AT_EXECPATH.

Reviewed by:    emaste, sef
Sponsored by:   DARPA, AFRL
Differential Revision:  https://reviews.freebsd.org/D22353

r354699:
Improve the description of AT_EXECPATH availability.

Reported by:    kib
Sponsored by:   DARPA, AFRL

FreeBSD/src 354927stable/12/sys/contrib/dev/iwm iwm-9000-34.fw.uu iwm-9260-34.fw.uu, stable/12/sys/dev/iwm if_iwm.c if_iwmreg.h

MFC r354201, r354276, r354492-r354517, r354562:
Add firmware images and support for Intel 9000-series devices.

FreeBSD/src 354926head/usr.sbin/rtsold cap_llflags.c

Avoid relying on pollution from libcasper.h.

Reported by:    sjg
Sponsored by:   The FreeBSD Foundation