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/compat/cloudabi64 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)

FreeBSD/ports 520217head/sysutils/pftop Makefile distinfo

- Move the project to github and mark it as fetchable again.
- While here, do some cosmetic changes on ports Makefile.

Reported by:    many

FreeBSD/src 355799head/sys/dev/kbd kbd.c

kbd: patch linker set methods, too

This is needed after r355796. Some double-registration of kbd drivers needs
to be sorted out, then this sysinit will simply add these drivers into the
normal list and kill off any other bits in the driver that are aware of the
linker set, for simplicity.

OpenBSD/src bhGldkssys/dev/pci/bktr bktr_core.c bktr_audio.c

   bktr(4): tsleep(9) -> tsleep_nsec(9)

   ok deraadt@

DragonFlyBSD/src a2b1d49sys/conf kern.pre.mk

kern.pre.mk: Add back some Makefile code to fix VKERNEL64 (2)

* Conditionalize the last commit so it only occurs
  for vkernel64 builds.

FreeBSD/ports 520216head/sysutils/cfengine-devel distinfo Makefile, head/sysutils/cfengine-masterfiles-devel distinfo Makefile

Update to the latest cfengine commits on github.

FreeBSD/ports 520215head/shells/ksh93-devel distinfo Makefile

Update to the latest att/ast github commit.

NetBSD/pkgsrc 7ILYCVvdoc CHANGES-2019

   doc: Updated wm/marco to 1.22.4
+2-11 files

NetBSD/pkgsrc WkBpRgSwm/marco distinfo Makefile

   marco: update to 1.22.4

   Change log:

   ### marco 1.22.4

     * update translations
     * Revert "compositor: fix possible crash closing/destroying window"
     * theme.c: Fix window control hidpi rendering for all themes.
     * theme: Render window control buttons and icons as surfaces

   ### marco 1.22.3

     * update translations
     * frames: bump priority of style providers
     * window: add _GTK_THEME_VARIANT to initial window properties
     * frames: apply modified hack from Mutter/Metacity
     * frames: avoid infinite loop on the variants GList
     * frames: use style_updated instead of style_set
     * Fixed moving windows to edges to work with CSD clients.
     * window: Update allowed action hints
     * build: Remove rationales.txt from EXTRA_DIST target
     * Fix use of RBGA visual in frame.c when compositing is not in use
     * drop old and obsolete rationales.txt
     * boxes: Actually check for rectangle containment
+7-82 files

NetBSD/pkgsrc R7unWySdoc CHANGES-2019

   doc: Updated print/atril to 1.22.3
+2-11 files

NetBSD/pkgsrc 36wIkRfprint/atril distinfo PLIST

   atril: update to 1.22.3

   Change log:

   ### atril 1.22.3

     * update translations
     * libview: fixing memory leak
     * Revert "First page should not reloaded"
     * libview: Reset `pressed_button` when starting Drag and Drop

   ### atril 1.22.2

     * update translations
     * fixed greek translation for user guide
     * prevent segfaults when no document loaded
     * Fix buffer overflow in backend/tiff-document.c
+12-93 files

FreeBSD/ports 520214head/audio/zam-plugins-lv2 distinfo Makefile

audio/zam-plugins-lv2: Update 3.11-1 -> 3.12

Reported by:    portscout

FreeBSD/ports 520213head/sysutils/doctl distinfo Makefile

sysutils/doctl: Update to v1.36.0

Upstream changes:

Sponsored by:   DigitalOcean [1]

[1] DigitalOcean provided VM credit to test doctl

FreeBSD/ports 520212head/textproc/py-genshi Makefile distinfo

textproc/py-genshi: Update to 0.7.3

Genshi 0.7 doesn't support Python 3.5+, but the port currently allows it
to be built with any Python version. This doesn't affect the build, but
produces a broken runtime, including for all Genshi dependents:

Genshi (0.7) tests:

  2.7: Ran 854 tests in 3.623s - FAILED (failures=1)
  3.5: Ran 858 tests in 3.607s - FAILED (failures=4, errors=34)
  3.6: Ran 858 tests in 3.610s - FAILED (failures=4, errors=34)
  3.7: Ran 858 tests in 3.313s - FAILED (failures=11, errors=91)
  3.8: Ran 858 tests in 3.094s - FAILED (failures=32, errors=359)

Genshi added 3.5+ support in subsequent versions [1]:

  0.7.2: Add support for Python 3.8.
  0.7.1: Add support for Python 3.5, 3.6 and 3.7

Given Genshi 0.7 -> 0.7.3 involves only additional Python version support
and bugfix-only changes, this change updates the port to 0.7.3, instead of
restricting (correctly) its use to USES=python:-3.4, and is intended to be
merged to the quarterly branch accordingly.

While I'm here:

    [18 lines not shown]

OpenBSD/src nWQ5I7Dusr.bin/ssh myproposal.h

   sort sk-* methods behind their plain key methods cousins for now
+5-51 files

FreeBSD/src 355798head/sys/dev/kbd kbdreg.h kbd.c, head/sys/sys param.h

kbd: remove kbdsw, store pointer to driver in each keyboard_t

The previous implementation relied on a kbdsw array that mirrored the global
keyboards array. This is fine, but also requires extra locking consideration
when accessing to ensure that it's not being resized as new keyboards are

The extra pointer costs little in a struct that there are relatively few of
on any given system, and simplifies locking requirements ever-so-slightly as
we only need to consider the locking requirements of whichever method is
being invoked.

__FreeBSD_version is bumped as any kbd modules will need rebuilt following
this change.

FreeBSD/ports 520211head/math/libRmath distinfo Makefile

math/libRmath: Update to version 3.6.2

See the NEWS file for upstream changes:

FreeBSD/ports 520210head/math/libRmath Makefile

math/libRmath: Standardize formatting using ports-mgmt/portfmt

FreeBSD/src 355797head/sys/arm/samsung/exynos chrome_kb.c

chrome_kb: remove default get_fkeystr/diag implementations

This file was missed in r355796, but no harm would have come from this.

FreeBSD/ports 520209head/net/grpcurl distinfo Makefile

net/grpcurl: Update 0.1.0 -> 1.4.0

PR:            242309
Approved by:    seanc (maintainer's timeout 16 days)

NetBSD/src e6UuZoKsys/dev/pci/ixgbe ixv.c ixgbe.h

   No functional change:

    - Remove unused code.
    - Remove extra spaces.
    - KNF.

FreeBSD/src 355796head/sys/dev/adb adb_kbd.c, head/sys/dev/atkbdc atkbd.c

kbd: provide default implementations of get_fkeystr/diag

Most keyboard drivers are using the genkbd implementations as it is;
formally use them for any that aren't set and make
genkbd_get_fkeystr/genkbd_diag private.

OpenBSD/src EmntKXGregress/usr.bin/ssh test-exec.sh keytype.sh

   test security key host keys in addition to user keys

FreeBSD/src 355795stable/11/sys/contrib/ipfilter/netinet ip_fil_freebsd.c fil.c, stable/12/sys/contrib/ipfilter/netinet ip_fil_freebsd.c fil.c

MFC r355670:

Rather than pass the address of the packet information control block to
ipf_pcksum6(), directly pass the adddress of the mbuf to it. This reduces
one pointer dereference. ipf_pcksum6() doesn't use the packet information
control block except to obtain the mbuf address.

FreeBSD/ports 520208head/math/darknet Makefile distinfo

math/darknet: Update g20180914 -> 3-446

Update to a maintained fork under the AlexeyAB GitHub account.

FreeBSD/src 355794head/sys/dev/adb adb_kbd.c, head/sys/dev/atkbdc atkbd.c

keyboard switch definitions: standardize on c99 initializers

A future change will provide default implementations for some of these where
it makes sense and most of them are already using the genkbd
implementation (e.g. get_fkeystr, diag).

FreeBSD/ports 520207head/misc Makefile py-gluoncv, head/misc/py-gluoncv Makefile pkg-descr

New port: misc/py-gluoncv: Gluon CV toolkit for state-of-the-art deep learning in computer 

FreeBSD/src 355793head/sys/arm/versatile pl050.c, head/sys/dev/gpio gpiokeys.c

kbd drivers: use kbdd_* indirection for diag invocation

These invocations were directly calling enkbd_diag(), rather than
indirection back through kbdd_diag/kbdsw. While they're functionally
equivent, invoking kbdd_diag where feasible (i.e. not in a diag
implementation) makes it easier to visually identify locking needs in these
other drivers.

FreeBSD/src 355792head/sys/sys sched.h

Remove a declaration of sched_clock() redundant after r355779.

NetBSD/pkgsrc-wip e08731b. Makefile, py-setuptools-rust PLIST Makefile

py-setuptools-rust: Imported into pkgsrc

NetBSD/pkgsrc 2BEPSE4doc CHANGES-2019

   doc: Added devel/py-setuptools-rust version 0.10.6
+2-11 files

NetBSD/pkgsrc tHDbVGndevel Makefile

   devel/Makefile: Add py-setuptools-rust
+2-11 files

NetBSD/pkgsrc 8X3uyX4devel/py-setuptools-rust PLIST Makefile

   devel/py-setuptools-rust: Import version 0.10.6

   Setuptools helpers for rust Python extensions implemented with PyO3
   and rust-cpython.

NetBSD/pkgsrc 0k3MSwpdoc CHANGES-2019

   doc: Updated x11/xfce4-exo to 0.12.10
+2-11 files

NetBSD/pkgsrc vjsRWwex11/xfce4-exo distinfo Makefile, x11/xfce4-exo/patches patch-exo_exo-icon-view.c

   xfce4-exo: update to 0.12.10

   Also add an upstream patch to adjust a minor display padding issue.

   Change log:

   - Bug Fixes:
     - Fix typeahead search regression (Xfce #16191)
   - Translation Updates:

   - Bug Fixes:
     - Explicitly depend on gio-unix-2.0 (Xfce #15825)
     - Fix alignment of multi-line filenames when text beside icons (Xfce #16107)
     - Fix cursor missing in search popup widget (Xfce #16068)
     - Fix desktop item creation on symbolic link directories
     - Fix excess clickable area of multiline filenames (Xfce #16075)
     - Fix issues with displaying icon view contents (Xfce #14737)
     - Fix prelight deactivation (Xfce #11806)
     - Hide search widget when doing a fullscreen resize (Xfce #15106)
     - Make user-created launchers executable by default

    [3 lines not shown]

FreeBSD/ports 520206head/misc/mxnet Makefile

misc/mxnet: Add the OPENCV option

NetBSD/pkgsrc CwXGqvudoc CHANGES-2019

   doc: Updated security/php-pecl-mcrypt to 1.0.3
+2-11 files

NetBSD/pkgsrc khplZQysecurity/php-pecl-mcrypt distinfo Makefile

   security/php-pecl-mcrypt: update to 1.0.3

   Update php-pecl-mcrypt to 1.0.3.

   o pkgsr change: allow build on php74.

   1.0.3 (2019-09-17)

   * Addressed Windows build issues

FreeBSD/ports 520205head/net-im/mikutter distinfo Makefile

FreeBSD/src 355791head/sys/tools vnode_if.awk

vfs: allow tail call optimisation in vops in the common case

Most frequently used vops boil down to checking SDT probes, doing the call and
checking again. There is no vop_post/pre in their case but the check after the
call prevents tail call optimisation from taking place. Instead, check once
upfront. Kernels with debug or vops with non-empty vop_post still don't short

Reviewed by:    kib
Tested by:      pho
Differential Revision:  https://reviews.freebsd.org/D22739

FreeBSD/src 355790head/sys/fs/nfsclient nfs_clvnops.c, head/sys/kern vfs_lookup.c vfs_subr.c

vfs: flatten vop vectors

This eliminates the following loop from all VOP calls:

while(vop != NULL && \
    vop->vop_spare2 == NULL && vop->vop_bypass == NULL)
        vop = vop->vop_default;

Reviewed by:    jeff
Tesetd by:      pho
Differential Revision:  https://reviews.freebsd.org/D22738

OpenBSD/ports mCtdha7mail/dovecot-pigeonhole Makefile distinfo, mail/dovecot-pigeonhole/pkg PLIST

   update to dovecot-pigeonhole 0.5.9

FreeBSD/src 355789head/sys/kern kern_mutex.c

mtx: eliminate recursion support from thread lock

Now that it is not used after schedlock changes got merged.

Note the unlock routine temporarily still checks for it on account of just using
regular spin unlock.

This is a prelude towards a general clean up.

OpenBSD/ports TMjQOYpmail/dovecot Makefile distinfo, mail/dovecot/patches patch-doc_example-config_Makefile_in patch-doc_example-config_conf_d_Makefile_in

   update to Dovecot

NetBSD/src RxVikShsys/arch/aarch64/aarch64 efi_machdep.c, sys/arch/arm/arm efi_runtime.c efi_runtime.h

   Enable FP access for EFI RT and improve error handling.