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

Revert r354896, r354899, r354900:
 Fix build.

Sponsored by:   Rubicon Communications, LLC (

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

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.

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.

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:

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.

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

Reported by:    upstream

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

devel/rust-cbindgen: update to 0.10.0 now supplies Cargo.lock, so dependencies got downgraded.

Reported by:    Repology

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

MFH: r518062

emulators/citra: update to s20191120

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


FreeBSD/ports 518064head/multimedia/aom distinfo Makefile

multimedia/aom: update to


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

multimedia/svt-av1: update to


FreeBSD/ports 518062head/emulators/citra distinfo Makefile

emulators/citra: update to s20191120


FreeBSD/ports 518061head/emulators/yuzu distinfo Makefile

emulators/yuzu: update to s20191119


FreeBSD/ports 518060head/emulators/rpcs3 distinfo Makefile

emulators/rpcs3: update to


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

MFC r354694, r354699

elf_aux_info: Add support for AT_EXECPATH.

Reviewed by:    emaste, sef
Sponsored by:   DARPA, AFRL
Differential Revision:

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

FreeBSD/src 354925head/usr.sbin/efibootmgr efibootmgr.c efibootmgr.8

Add --esp/-E argument to print the currently booted ESP

Add code to decode the BootCurrent and BootXXXX variable it points at
to deduce the ESP used to boot the system. By default, it prints the
path to that device. With --unix-path (-p) it will instead print the
current mount point for the ESP, if any (or an error). With
--device-path (-d) it wil print the UEFI device path for the ESP.

Note: This is the best guess based on the UEFI variables. If the ESP
is part of a gmirror, etc, that won't be reported. If by some weird
chance there was a complicated series of chain boots, this may not be
what you want. For setups that don't add layers on top of the raw
devices, it is accurate.

Differential Revision:

FreeBSD/src 354924head/contrib/openresolv

MFV 354917, 354918, 354919
openresolv: update to version 3.9.2

MFC after:      3 weeks

FreeBSD/src 354923stable 12, stable/12/sys/dev/ahci ahci.c ahci.h

MFC r351589: Fix AHCI Enclosure Management, broken by r351356.

ivars value of -1 was used to distinguish EM device, and r351356 left some
wrong checks for it.  Give EM device separate flag there instead.

FreeBSD/src 354922head/etc Makefile, head/libexec/rc rc.conf

Create /etc/os-release file.

Each boot, regenerate /var/run/os-release based on the currently running
system. Create a /etc/os-release symlink pointing to this file (so that this
doesn't create a new reason /etc can not be mounted read-only).

This is compatible with what other systems do and is what the sysutil/os-release
port attempted to do, but in an incomplete way. Linux, Solaris and DragonFly all
implement this natively as well. The complete standard can be found at

Moving this to the base solves both the non-standard location problem with the
port, as well as the lack of update of this file on system update.

Bump __FreeBSD_version to 1300060

PR: 238953
Differential Revision:

FreeBSD/src 354921stable 12, stable/12/sys/mips/mips pmap.c

MFC r354688:

Fix a typo in the PMAP_PTE_SET_CACHE_BITS macro.

The second argument should have been "pa" not "ps".  It worked by
accident because the argument was always "pa" which was an in-scope
local variable.

Submitted by:   sson
Reviewed by:    jhb, kevans
Obtained from:  CheriBSD
Sponsored by:   DARPA, AFRL
Differential Revision:

FreeBSD/ports 518059head/devel/freebsd-gcc6 pkg-plist pkg-plist.i386

Use per-architecture packing list files for architecture-specific files.

Reviewed by:    imp
Differential Revision:

FreeBSD/ports 518058head/Mk

Permit multiple packing list files to be listed in PLIST.

This permits a port to use separate packing lists for optional
components instead of depending on PLIST_SUB.

Approved by:    portmgr (bapt)
Differential Revision:

FreeBSD/src 354920vendor/openresolv/3.9.2

Tag openresolv 3.9.2.

More information at:

FreeBSD/src 354919vendor/openresolv/dist

Import openresolv 3.9.2

More information at:

FreeBSD/src 354918vendor/openresolv/dist

Undo r354917 to correct the log: it was actually version 3.9.2

FreeBSD/src 354917vendor/openresolv/dist

Import openresolv 3.9.0

More information at:

FreeBSD/ports 518057head/devel/jetbrains-phpstorm distinfo Makefile

devel/jetbrains-phpstorm: update to version 2019.2.5.

Approved by:    thierry (mentor)

FreeBSD/ports 518056head/net/asterisk13 Makefile, head/net/asterisk16 Makefile

Really build the opus module when the OPUS option is enabled.

PR:            242103
Submitted by:   ben at
MFH:           2019Q4

FreeBSD/src 354916svnadmin/conf approvers

Allow csprng group to approve PRNG code changes

Approved by:    core (brooks), csprng (cem), so (emaste)
Differential Revision:

FreeBSD/ports 518055branches/2019Q4/dns/bind911 distinfo, branches/2019Q4/dns/bind911/files extrapatch-bind-min-override-ttl patch-configure

MFH: r514624 r518053 r518054

Update to 9.11.13, 9.14.8.

Security:       CVE-2019-6477

FreeBSD/ports 518054head/dns/bind914 distinfo Makefile, head/dns/bind914/files extrapatch-bind-min-override-ttl

Update to 9.14.8.

MFH:           2019Q4
Security:       CVE-2019-6477

FreeBSD/ports 518053head/dns/bind911 distinfo Makefile, head/dns/bind911/files extrapatch-bind-min-override-ttl

Update to 9.11.13.

MFH:           2019Q4
Security:       CVE-2019-6477

FreeBSD/ports 518052head/sysutils/am-utils Makefile

Make the installation of the rc script conditional to avoid conflict
with base.

MFH:           2019Q4

FreeBSD/ports 518051head/sysutils/am-utils Makefile, head/sysutils/am-utils/files

Add rc.d support, stealing the rc.d file from base.

MFH:           2019Q4

FreeBSD/ports 518050head/textproc/jarnal Makefile distinfo

Unbreak by upgrading to 1079.

FreeBSD/src 354915head/etc/mtree BSD.root.dist, head/share/man/man7 hier.7

Standardize EFI's ESP mount point.

Mount the UEFI ESP on /boot/efi. No current system uses this by default, but
there are many ad-hoc schemes that do this in /efi or /esp or /uefi and adding a
new directory at the top-level would have a much higher likelihood of
collision. Document this in /etc/mtree/BSD.root.mtree and create EFIDIR and
related variables in

Differential Revision:

FreeBSD/ports 518049head/devel/pycharm-ce distinfo Makefile

devel/pycharm-ce: Update to version 2019.2.5.

FreeBSD/ports 518048head/science/medit Makefile pkg-descr

Unbreak medit.

Since I'm here, explicit USE_GL.

FreeBSD/ports 518047head/www/nginx-devel distinfo Makefile.extmod

Update third-party auth_ldap module to the recent version.