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/compat/freebsd32 capabilities.conf, sys/i386/linux Makefile

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/ports 515240head/graphics/drm-current-kmod distinfo Makefile

graphics/drm-current-kmod: Update snapshot

Update graphics/drm-current-kmod to the latest snapshot, which fixes runtime
issues and panics on recent CURRENT.

FreeBSD/ports 515239head/graphics/drm-devel-kmod distinfo Makefile

graphics/drm-devel-kmod: Update snapshot

Update graphics/drm-devel-kmod to the latest snapshots.  This includes
runtime fixes on recent CURRENT, as well as minor fixes to aarch64, ppc64
and sysfs usage.

FreeBSD/ports 515238head/sysutils/shim/files patch-lib-console.c

sysutils/shim: fix building

  * files/
    patch-lib-console.c: %s/EFI_WARN_UNKOWN_GLYPH/EFI_WARN_UNKNOWN_GLYPH/g

NetBSD/pkgsrc-wip 8ad63d9fusionpbx TODO

fusionbox: Add reference to recent CVEs
DeltaFile
+6-1fusionpbx/TODO
+6-11 files

DragonFlyBSD/src 79043b3sys/vfs/msdosfs msdosfs_vnops.c

sys/vfs/msdosfs: uniqdosname() assumes 12 bytes char[]

from freebsd/freebsd at 522790ec8013b64a66fe7410c116e018b63bb9b3

See uniqdosname() and unix2dosfn().

DragonFlyBSD/src abca108sys/vfs/msdosfs msdosfs_vnops.c

sys/vfs/msdosfs: Don't set DE_ACCESS on read if readonly mount

from freebsd/freebsd at 1b90da9ab8a3ec94fb70dbd7a4204352c038ddda

DragonFlyBSD/src 0e16c4fsbin/fsck_hammer2 test.c

sbin/fsck_hammer2: Sort PFS names to scan on -p

DragonFlyBSD/src 3e4c7e6sys/vfs/msdosfs msdosfs_vnops.c

sys/vfs/msdosfs: Avoid loop after bread()

from freebsd/freebsd at 992424e04cb1bcbf73836635d42aeefd1bde73b9

DragonFlyBSD/src 5e944fdsys/vfs/msdosfs msdosfs_vnops.c msdosfs_conv.c

sys/vfs/msdosfs: Rewrite msdosfs_readdir()

Don't make the entire function look different from FreeBSD when
vop_write_dirent() (since fc46f680a7 in 2005) is just a wrapper.
Revive dirent local variable to make it easier to sync with FreeBSD
changes, and sync with FreeBSD.

OpenBSD/src L9BPnVQusr.sbin/rpki-client mft.c

   Rewrite the time validity check for mfts. Using ASN1_GENERALIZEDTIME_print
   and strptime to convert the timestamp does not correctly account for the
   timezone. Instead use X509_cmp_time which later on should be replaced with
   ASN1_time_tm_cmp since the ASN1_STRING_cmp() check at the end will fail
   around 2049.

   Problem with timezone reported by Alexandre Hamada (hamada at registro.br).
   He also tested this diff.
   OK tb@
VersionDeltaFile
1.8+48-55usr.sbin/rpki-client/mft.c
+48-551 files

FreeBSD/src 353916head/sys/vm vm_fault.c

Assert that vm_fault_lock_vnode() returns locked saved vnode.

Reviewed by:    alc, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      2 weeks
Differential revision:  https://reviews.freebsd.org/D22113

NetBSD/pkgsrc fEG6h2Sdoc CHANGES-2019

   Note update of vim
VersionDeltaFile
1.4497+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc fvlpYHJeditors/vim-gtk2 Makefile, editors/vim-gtk3 Makefile

   Reset PKGREVISION

DragonFlyBSD/src 2f7891dsbin/fsck_hammer2 fsck_hammer2.c fsck_hammer2.8

sbin/fsck_hammer2: Minor fix/cleanup

DragonFlyBSD/src 01a14fbsys/vfs/msdosfs msdosfs_vnops.c

sys/vfs/msdosfs: Fix FAT32 dotdot dirent corruption

from freebsd/freebsd at 96b12145fb2d0521fe7cd4e58d4691a3cf2861ea

DragonFlyBSD/src 9d6d26csys/gnu/vfs/ext2fs ext2_vnops.c, sys/kern vfs_subr.c

sys/kern: Add init_va_filerev()

from freebsd/freebsd at 1912367ebb1a5029d72a6b3b028c32f0af41f0b5

Note that init_va_filerev() implementation is not same as FreeBSD.
The existing FAT code using long in union _qcvt was probably a bug.

NetBSD/pkgsrc Kc2w7dVeditors/vim-share distinfo PLIST

   Update to version 8.1.2200.

   Patches:
   8.1.1779  not showing the popup window right border is confusing
   8.1.1780  warning for file no longer available is repeated
   8.1.1781  Amiga: no builtin OS readable version info
   8.1.1782  MS-Windows: system() has temp file error with 'noshelltemp'
   8.1.1783  MS-Windows: compiler test may fail when using %:S
   8.1.1784  MS-Windows: resolve() does not work if serial nr duplicated
   8.1.1785  map functionality mixed with character input
   8.1.1786  double click in popup scrollbar starts selection
   8.1.1787  cannot resize a popup window
   8.1.1788  missing changes in proto file
   8.1.1789  cannot see file name of preview popup window
   8.1.1790  :mkvimrc is not tested
   8.1.1791  'completeslash' also applies to globpath()
   8.1.1792  the vgetorpeek() function is too long
   8.1.1793  mixed comment style in globals
   8.1.1794  tests are flaky
   8.1.1795  no syntax HL after splitting windows with :bufdo
   8.1.1796  :argdo is not tested
   8.1.1797  the vgetorpeek() function is too long
   8.1.1798  warning for unused variable in tiny version
   8.1.1799  cannot avoid mapping for a popup window
   8.1.1800  function call functions have too many arguments

    [400 lines not shown]

NetBSD/pkgsrc SVRq8Ofdoc CHANGES-2019

   Note update of www/wordpress
VersionDeltaFile
1.4496+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc PTUFNl7www/wordpress distinfo Makefile

   Maintenance and security update to version 5.2.4.

   Changes:
   5.2.4:

   Props to Evan Ricafort for finding an issue where stored XSS (cross-site scripting) 
could be added via the Customizer.
   Props to J.D. Grimes who found and disclosed a method of viewing unauthenticated posts.
   Props to Weston Ruter for finding a way to create a stored XSS to inject Javascript 
into style tags.
   Props to David Newman for highlighting a method to poison the cache of JSON GET 
requests via the Vary: Origin header.
   Props to Eugene Kolodenker who found a server-side request forgery in the way that URLs 
are validated.
   Props to Ben Bidner of the WordPress Security Team who discovered issues related to 
referrer validation in the admin.

   5.2.3:
   #38415: New Custom Link menu item has a wrong fallback label
   #45739: Block Editor: $editor_styles bug.
   #45935: A URL in do_block_editor_incompatible_meta_box function does not have 
classic-editor__forget parameter
   #46757: Media Trash: The Bulk Media options when in the Trash shouldn’t provide two 
primary buttons
   #46758: Media Trash: Primary button(s) should be on the left

    [43 lines not shown]
VersionDeltaFile
1.71+5-5www/wordpress/distinfo
1.88+2-2www/wordpress/Makefile
+7-72 files

FreeBSD/ports 515237head/cad/ghdl pkg-plist llvm-plist, head/cad/ghdl/files patch-configure patch-src_ghdldrv_ghdldrv.adb

Re-add cad/ghdl: GNU VHDL simulator

FreeBSD/ports 515236head/x11/xfindproxy Makefile, head/x11/xfwp Makefile

x11/xfindproxy, x11/xfwp: Deprecate

Deprecate x11/xfindproxy and x11/xfwp, they are deprecated upstream.
Make the deprecation timer extra short, since these ports are in the way of
other updates on x11 land.

PR:            241314 (related)
MFH:           2019Q4 (do we MFH deprecation notices?)

NetBSD/src HUKikvJlib/libnvmm libnvmm.c, sys/dev/nvmm nvmm.c nvmm.h

   Miscellaneous changes in NVMM, to address several inconsistencies and
   issues in the libnvmm API.

    - Rename NVMM_CAPABILITY_VERSION to NVMM_KERN_VERSION, and check it in
      libnvmm. Introduce NVMM_USER_VERSION, for future use.

    - In libnvmm, open "/dev/nvmm" as read-only and with O_CLOEXEC. This is to
      avoid sharing the VMs with the children if the process forks. In the
      NVMM driver, force O_CLOEXEC on open().

    - Rename the following things for consistency:
          nvmm_exit*              -> nvmm_vcpu_exit*
          nvmm_event*             -> nvmm_vcpu_event*
          NVMM_EXIT_*             -> NVMM_VCPU_EXIT_*
          NVMM_EVENT_INTERRUPT_HW -> NVMM_VCPU_EVENT_INTR
          NVMM_EVENT_EXCEPTION    -> NVMM_VCPU_EVENT_EXCP
      Delete NVMM_EVENT_INTERRUPT_SW, unused already.

    - Slightly reorganize the MI/MD definitions, for internal clarity.

    - Split NVMM_VCPU_EXIT_MSR in two: NVMM_VCPU_EXIT_{RD,WR}MSR. Also provide
      separate u.rdmsr and u.wrmsr fields. This is more consistent with the
      other exit reasons.

    - Change the types of several variables:

    [28 lines not shown]

OPNSense/ports 188195aopnsense/google-api-php-client Makefile

opnsense/google-api-php-client fix category category

NetBSD/src IQekMNUusr.sbin/sysinst disks.c

   Pull up following revision(s) (requested by martin in ticket #369):
        usr.sbin/sysinst/disks.c: revision 1.51
   PR install/54480: when upgrading a system and re-mounting the target /
   with proper options, and the installed system does not use NAME= syntax
   in fstab(5), use the device name we used to get here, instead of the
   name from fstab, it might be different to what the real system calls the
   device (compact flash root showing up as wd0 native, but sd? on the
   card reader used for updating it right now).
   This is an abuse of the upgrade functionality and in general pretty dangerous
   when multiple devices are used in the upgraded fstab (e.g. separate /usr),
   and it used to work more by accident with the old code.
   However, it is a quite usefull way to upgrade tiny systems with compact flash
   root, and it used to work - so support it properly (as far as we can).
VersionDeltaFile
1.44.2.9+35-8usr.sbin/sysinst/disks.c
+35-81 files

NetBSD/src hLdYJKYusr.sbin/sysinst disks.c bsddisklabel.c

   Pull up following revision(s) (requested by martin in ticket #365):
        usr.sbin/sysinst/bsddisklabel.c: revision 1.28
        usr.sbin/sysinst/disks.c: revision 1.53
   Skip unwanted (zero sized) partitions.
VersionDeltaFile
1.44.2.8+4-1usr.sbin/sysinst/disks.c
1.23.2.4+3-1usr.sbin/sysinst/bsddisklabel.c
+7-22 files

NetBSD/src EChRNWVusr.sbin/sysinst disklabel.c

   Pull up following revision(s) (requested by martin in ticket #364):
        usr.sbin/sysinst/disklabel.c: revision 1.14
   When translating (internal) indices to device names, properly deal with
   gaps in partition allocations (e.g. no swap partition).
VersionDeltaFile
1.10.2.4+14-6usr.sbin/sysinst/disklabel.c
+14-61 files

NetBSD/src YFfyC2Ousr.sbin/sysinst msg.mi.fr msg.mi.en

   Pull up following revision(s) (requested by martin in ticket #363):
        usr.sbin/sysinst/msg.mi.en: revision 1.23
        usr.sbin/sysinst/msg.mi.fr: revision 1.21
   Sentence begins with capital letter ("yes or no?"). Also add a few french
   sentences, to make it less awful, but not complete. Not tested.
VersionDeltaFile
1.17.2.3+6-7usr.sbin/sysinst/msg.mi.fr
1.19.2.3+2-2usr.sbin/sysinst/msg.mi.en
+8-92 files

NetBSD/src DvFM9ZBusr.sbin/sysinst disks.c

   Pull up following revision(s) (requested by martin in ticket #362):
        usr.sbin/sysinst/disks.c: revision 1.52
   Remove a hardcoded assumption that for BIOS boot we always will have
   the first partition as root - in mixed EFI/BIOS setups this might not
   be true (and in general the user is free to define arbitrary orders).
   Pointed out by Robert Nestor.
VersionDeltaFile
1.44.2.7+21-3usr.sbin/sysinst/disks.c
+21-31 files

OPNSense/src b39b84dcontrib/tzdata leapseconds.awk europe

Import tzdata 2019c.

Approved by:    so
Security:       FreeBSD-EN-19:18.tzdata

NetBSD/src 1airN3asys/arch/arm/imx/fdt imx6_sdhc.c, sys/dev/sdmmc sdhc.c sdhcvar.h

   Add SDHC flags.

   + SDHC_FLAG_BROKEN_ADMA2_ZEROLEN
     Broken ADMA2 Zero length descriptor.
     Can't 64K Byte data transfer.
   + SDHC_FLAG_NO_1_8_V
     Support no 1.8V Supply.
     Disable UHS-I bus speed mode (SDR50, DDR50, SDR104).

OpenBSD/ports DgC5RU1net/hexchat Makefile distinfo, net/hexchat/patches patch-src_common_meson_build

   Update to hexchat-2.14.2.

   Changelog can be found at
   https://hexchat.readthedocs.io/en/latest/changelog.html.

   Includes feedback from sthen@ and cwen@. Thank you!

   OK cwen@

HardenedBSD/hardenedbsd f7ed9d2sys/dev/cxgbe t4_main.c, sys/dev/nctgpio nctgpio.c

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master: (26 commits)
  cap_sysctl: correct typo from r347534-ish
  tuntap(4): Fix NOINET build after r353741
  libcasper/services: include <src.opts.mk> to hook tests to build
  Correct spelling, apply appropriate respect.
  powerpc/booke: Fix Book-E boot post-minidump
  Belatedly remove stale debug symbols after r339270.
  amd64 pmap: conditionalize per-superpage locks on NUMA
  amd64 pmap: fixup invlgen lookup for fictitious mappings
  pseudofs: hashed vncache
  Replace an uninitialized variable with the correct element from the superblock when 
doing recovery with journalled soft updates.
  arm: correct kernelstack allocation size
  Split Chelsio send tags into a generic base tag and a ratelimit tag.
  Always allocate the atid table during attach.
  blacklistd: remove reference to NetBSD npfctl
  [PPC] Avoid underflows in NUMA domains
  Allow epoch tracker to use the very last byte of the stack.  Not sure this will help to 
avoid panic in this function, since it will also use some stack, but makes code more 
strict.
  Apply r353893 to arm64.
  Initialize thread0.td_kstack_pages on arm.
  Fix thread0 kernel stack initialization on riscv.

    [2 lines not shown]

FreeBSD/doc 53502head/share/security/advisories FreeBSD-EN-19:18.tzdata.asc, head/share/security/patches EN-19:18

Add FreeBSD-EN-19:18.tzdata.

Approved by:    so

FreeBSD/src 353915releng/11.2/contrib/tzdata leapseconds.awk europe, releng/11.3/contrib/tzdata leapseconds.awk europe

Import tzdata 2019c.

Approved by:    so
Security:       FreeBSD-EN-19:18.tzdata

HardenedBSD/hardenedbsd 6b5b767lib/libcasper/services/cap_sysctl cap_sysctl.c

cap_sysctl: correct typo from r347534-ish

operation & ~limit where limit is a bool is clearly not what was intended,
given the line prior. Correct it to use the calculated mask for validation.

The cap_sysctl tests should now be functional again.

FreeBSD/src 353914head/lib/libcasper/services/cap_sysctl cap_sysctl.c

cap_sysctl: correct typo from r347534-ish

operation & ~limit where limit is a bool is clearly not what was intended,
given the line prior. Correct it to use the calculated mask for validation.

The cap_sysctl tests should now be functional again.

FreeBSD/src 353913projects/nfsv42/sys/fs/nfsclient nfs_clvnops.c

Fix typo in comment.

OpenBSD/ports 0b0I8cQdevel/valgrind Makefile, devel/valgrind/patches patch-coregrind_m_syswrap_syswrap_openbsd_c patch-coregrind_m_syswrap_priv_syswrap_openbsd_h

   Add sys_unveil()

NetBSD/src yWez1Srsys/arch/arm/imx/fdt imx6_platform.c

   Implement platform reset for i.MX6.
VersionDeltaFile
1.8+24-2sys/arch/arm/imx/fdt/imx6_platform.c
+24-21 files

FreeBSD/ports 515235head/sysutils/xjobs distinfo Makefile

- update to 20191016

FreeBSD/src 353912head/sys/net if_tuntap.c

tuntap(4): Fix NOINET build after r353741

Shuffle headers around to more appropriate #ifdef OPTION blocks (INET vs.
INET6) -- double checked LINT-{NOINET,NOINET6,NOIP}, all seem good.

Reported by:    cem

HardenedBSD/hardenedbsd 83fa880sys/net if_tuntap.c

tuntap(4): Fix NOINET build after r353741

Shuffle headers around to more appropriate #ifdef OPTION blocks (INET vs.
INET6) -- double checked LINT-{NOINET,NOINET6,NOIP}, all seem good.

Reported by:    cem

FreeBSD/src 353911head/lib/libcasper Makefile

libcasper/services: include <src.opts.mk> to hook tests to build

Note that the cap_sysctl tests are currently failing and need some
attention.

HardenedBSD/hardenedbsd febc320lib/libcasper Makefile

libcasper/services: include <src.opts.mk> to hook tests to build

Note that the cap_sysctl tests are currently failing and need some
attention.

NetBSD/src LDiKhqosys/dev/usb uvideo.c

   we want to check that the allocation is going to be zero, not whether
   some pointer is NULL (oops).

   Should be the right version this time!
VersionDeltaFile
1.52+3-3sys/dev/usb/uvideo.c
+3-31 files

FreeBSD/src 353910projects/nfsv42/sys/fs/nfsclient nfs_clvnops.c nfsmount.h

Add a flag for Advise not supported and fix Copy for length == 0.

When an NFSv4.2 reports that the Advise operation is not supported,
note that so that no more Advise operations will be attempted for the mount.
For Copy where the NFSv4.2 server replies a copied length == 0, fix the
client so that it recognizes this as "at EOF".
This will not normally happen, since the client clips the requested
copy length at EOF, however if another client truncates the file, this
could happen for a Linux style NFSv4.2 server.

FreeBSD/src 353909head/usr.bin/calendar/calendars calendar.holiday

Correct spelling, apply appropriate respect.