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/amd64/linux32 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)

NetBSD/src WbaPj28external/gpl3/gdb/lib/libgdb/arch/x86_64 config.h defs.mk

   regen x86_64 for i386 support

NetBSD/src P58EoL3external/gpl3/gdb/dist/gdb configure.tgt

   add missing files for 32 bit debugging on 64 bit host.

NetBSD/src 6gxsGalexternal/gpl3/gdb/dist/gdb solib.c

   Support for compat-32 type shared library paths.
VersionDeltaFile
1.8+19-2external/gpl3/gdb/dist/gdb/solib.c
+19-21 files

FreeBSD/ports 518121head/lang/gcc8-devel/files patch-clang-vec_step

Forward port r509607 | gerald | 2019-08-22 from lang/gcc8 since this has
not been addressed upstream yet:

  clang on rs6000/powerpc* unfortunately poisons user namespace by default
  (without any special options or include files being required).

  Until that changes (or GCC changes) we need to avoid using vec_step as a
  variable name.

PR:            239266

FreeNAS/freenas e468040src/middlewared/middlewared/plugins jail.py network.py

Correctly handle exceptions if remote node is unreachable

FreeBSD/ports 518120head/games Makefile mancala, head/games/mancala Makefile pkg-descr

Add new port: games/mancala

Implementation of the simple board game called Mancala.  Contains both a
user unfriendly character based interface, and a nice, user friendly X11
interface.  Be warned: If you just bother to read the rules, you may get
hooked on this!

FreeBSD/ports 518119head/databases/redis Makefile, head/databases/redis/files patch-deps_lua_src_lua__cjson.c

Fix the build with external lua, forgotten to add the patch.
Bump PORTREVISION.

Reported by:    olgeni

FreeNAS/freenas e64783asrc/middlewared/middlewared/plugins vm.py network.py

Move vm nic capabilities checking method to vm plugin

NetBSD/src NGWL7mBdistrib/common cgdroot.rc

   If gpt label "cgd.conf" contains a valid /etc/cgd file system,
   try mounting gpt label "cgdroot" as a root filesystem first and
   only mount /dev/cgd0a if that gpt label doesn't exist or fails
   to mount.

   XXX pullup to 8 and 9.
VersionDeltaFile
1.5+28-6distrib/common/cgdroot.rc
+28-61 files

FreeNAS/freenas f20ec29src/middlewared/middlewared/plugins jail.py network.py

Move jail nic capabilities checking method to jail plugin

FreeBSD/src 354989head/sys/fs/nfs nfsrvstate.h, head/sys/fs/nfsserver nfs_nfsdport.c

Fix the pNFS server's reporting of SpaceUsed (va_bytes).

The pNFS server currently reports SpaceUsed (va_bytes) for the metadata
file. This in not correct, since the metadata file is always empty and,
as such, va_bytes is just the allocation for the empty file.
This patch adds va_bytes to the list of attributes acquired from the
DS for a file, so that it includes the allocated data size and is updated
when the file is written.
For files created on a pNFS server before this patch is applied, the
va_bytes value is estimated by rounding va_size up to a multiple of
BLKDEV_IOSIZE. Once the file is written after this patch has been
applied to the metadata server, the va_bytes returned for the file
will be correct.

This patch only affects a pNFS metadata server.

Found during testing of the NFSv4.2 pNFS server for the Allocate operation.
(Not yet in head/current.)

MFC after:      2 weeks

NetBSD/pkgsrc 3Qpgy7odoc CHANGES-2019

   doc: Remove duplicate entry
VersionDeltaFile
1.5066+1-2doc/CHANGES-2019
+1-21 files

NetBSD/pkgsrc theCgWwdoc CHANGES-2019

   doc: Updated devel/libmowgli to 2.1.3
VersionDeltaFile
1.5065+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc JDade2hdevel/libmowgli PLIST Makefile, devel/libmowgli/patches patch-aa patch-ab

   libmowgli: Update to 2.1.3

   Changes: 8+ years worth

   (Not used by anything, currently a leaf package... chat/atheme uses
   internal copy.)

OpenBSD/ports vid7fRlinfrastructure/db network.conf

   Remove unused NPM bits.

   OK afresh1@
VersionDeltaFile
1.10+1-4infrastructure/db/network.conf
+1-41 files

NetBSD/pkgsrc tkYAfZFdoc CHANGES-2019

   doc: Updated audio/xmp to 4.1.0
VersionDeltaFile
1.5064+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc lXEViyTaudio/xmp options.mk Makefile, audio/xmp/patches patch-src_drivers_netbsd.c

   xmp: Update to 4.1.0

   Switch to native audio drivers for NetBSD and Solaris, which it has,
   somehow.

   4.1.0 (20160719):
        - Requires libxmp 4.4
        - Add option to force tracker emulation
        - Add option to use simulated Amiga mixers
        - Add option to set the maximum number of virtual channels
        - Add command to switch between standard and classic mixers
        - Add command to display current mixer type
        - Fix default amplification factor
        - Fix module-specific configuration file options
        - Fix screen corruption when module uses more than 255 virtual
          channels (reported by Lionel Debroux)
        - Remove option --offset-bug-emulation

   4.0.11 (20160306):
        - Mark surround channels in channel list
        - Address errors reported by Coverity Scan

FreeBSD/src 354988head/sys/kern kern_timeout.c

cc_ktr_event_name is used only with KTR

FreeBSD/src 354987head/sys/sys interrupt.h

Delete ih_thread.  Should have gone in r334170.

OpenBSD/ports 8QLWUIptelephony/asterisk Makefile distinfo

   update to asterisk-16.6.2

   AST-2019-006: SIP request can change address of a SIP peer.
   AST-2019-007: AMI user could execute system commands.
   AST-2019-008: Re-invite with T.38 and malformed SDP causes crash.
VersionDeltaFile
1.306.2.2+2-2telephony/asterisk/Makefile
1.180.2.2+2-2telephony/asterisk/distinfo
+4-42 files

OpenBSD/ports LjMUDFJtelephony/asterisk Makefile distinfo, telephony/asterisk/pkg PLIST-main

   update to asterisk-16.6.2

   AST-2019-006: SIP request can change address of a SIP peer.
   AST-2019-007: AMI user could execute system commands.
   AST-2019-008: Re-invite with T.38 and malformed SDP causes crash.

NetBSD/pkgsrc npq9YWIdoc CHANGES-2019

   doc: Updated audio/libxmp to 4.4.1
VersionDeltaFile
1.5063+3-1doc/CHANGES-2019
+3-11 files

NetBSD/pkgsrc 5zCFKthaudio/libxmp distinfo Makefile, audio/libxmp/patches patch-src_common.h

   libxmp: Update to 4.4.1

   4.4.1 (20161012):
        Fix issues reported by Saga Musix:
        - fix MDL c5spd to preserve base periods
        - fix MDL sample decoder loop with corrupted data
        - fix MASI loader OPLH and PPAN subchunks parsing
        Other changes:
        - fix MacOS Tiger build issues (reported by Misty De Meo)
        - fix sample loop corner case (reported by knight-ryu12)
        - fix set pan effect in multichannel MODs (reported by Leilei)
        - fix global volume on module loop (reported by Travis Evans)
        - fix IT pan right value (by NoSuck)
        - fix MASI effects based on OpenMPT PSM loader
        - fix memory leak in XMs with 256 patterns
        - fix anticlick when rendering only one sample
        - fix anticlick in His Master's Noise instruments
        - fix anticlick in MED synth instruments

   4.4.0 (20160719):
        Fix bugs caught in the OpenMPT test cases:
        - fix XM arpeggio in FastTracker 2 compatible mode
        - fix IT bidirectional loop sample length
        - fix MOD vibrato and tremolo in Protracker compatible mode
        Fix multichannel MOD issues reported by Leilei:

    [66 lines not shown]

NetBSD/pkgsrc LVB2CdUdoc CHANGES-2019

   doc: Updated archivers/innoextract to 1.8
VersionDeltaFile
1.5062+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc hDdNNVVarchivers/innoextract distinfo Makefile

   innoextract: Update to 1.8

   innoextract 1.8 (2019-09-15)
    - Added support for Inno Setup 6.0.0 installers
    - Added support for pre-release Inno Setup 5.6.2 installers used by GOG
    - Added support for two modified Inno Setup 5.5.7 variants
    - Added support for Inno Setup 1.3.0 to 1.3.23
    - Added support for My Inno Setup Extensions installers older than 3.0.6.1
    - Added support for modified Inno Setup variants using an alternative setup loader 
magic
    - Added support for using boost_{zlib,bzip2} when statically linking Boost
    - Added support for automatically reading external setup.0 files
    - Encoding for non-Unicode installers is now determined from the languages supported 
by the installer, overridable using the --codepage option
    - Implemented parsing of GOG Galaxy architecture constraints
    - The architecture-specific suffixes @32bit and @64bit are now used to disambiguate 
colliding files
    - Fixed extracting files from slices larger than 2 GiB with 32-bit builds
    - Fixed output path for files with absolute paths (canonicalization now strips all 
unsafe characters)
    - Fixed output directory being created even when not extracting files
    - Fixed a hang when using the --language option
    - Improved checksum verification for files reconstructed from GOG Galaxy file parts
    - Changed header parsing to select the first version without warnings and failing that 
the first without errors

    [2 lines not shown]

FreeBSD/ports 518118head/math/gnuplot Makefile, head/math/gnuplot/files patch-term-fig.trm

Fix the 'fig' terminal

PR:            242097
Submitted by:   mjl at luckie.org.nz

OpenBSD/ports qRbM9Yssecurity/yubico Makefile

   +yubikey-manager
VersionDeltaFile
1.5+2-1security/yubico/Makefile
+2-11 files

OpenBSD/ports YeCKjn4security/yubico/yubikey-manager Makefile distinfo, security/yubico/yubikey-manager/patches patch-ykman_cli___main___py patch-ykman_cli___main___py

   Initial revision

OpenBSD/ports G6mr1UClang/php Makefile.inc, lang/php/7.2/patches patch-acinclude_m4 patch-aclocal_m4

   MFC update to php-7.2.25/php-7.3.12

OpenBSD/ports lvCxzhYlang/php Makefile.inc, lang/php/7.2 distinfo

   update to php-7.2.25/php-7.3.12

NetBSD/pkgsrc MJSq3Zndoc CHANGES-2019

   doc: Updated devel/libidn2 to 2.3.0
VersionDeltaFile
1.5061+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc 7SA7uwcdevel/libidn2 distinfo Makefile

   libidn2: Update to 2.3.0

   * Version 2.3.0 (released 2019-11-14)

   ** Mitre has assigned CVE-2019-12290 which was fixed by
      the roundtrip feature introduced in 2.2.0 (commit 241e8f48)

   ** Update the data tables from Unicode 6.3.0 to Unicode 11.0

   ** Turn _idn2_punycode_encode, _idn2_punycode_decode
      into compat symbols (Fixes #74)
VersionDeltaFile
1.7+5-5devel/libidn2/distinfo
1.8+2-2devel/libidn2/Makefile
+7-72 files

OpenBSD/src B94laFWsys/scsi scsi_base.c ch.c

   Be consistent and always use [!]ISSET() to test flags in xs->flags.
VersionDeltaFile
1.240+8-8sys/scsi/scsi_base.c
1.55+2-2sys/scsi/ch.c
1.232+2-2sys/scsi/cd.c
+12-123 files

FreeBSD/ports 518117head/lang/erlang-runtime22 distinfo Makefile

Update lang/erlang-runtime22 to version 22.1.8.

NetBSD/src www2ejklib/libc/tls tls.c

   Fix PR/54074 and PR/54093 completely.

   More similar to the ld.elf_so logic, it is necessary to align with
   p_align first.  Also, invert the #ifdef condition for consistency.

   Should fix regression for static linking binaries:
   http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03
   http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33
VersionDeltaFile
1.13+9-5lib/libc/tls/tls.c
+9-51 files

FreeBSD/doc 53625head/pt_BR.ISO8859-1/articles/contributors pt_BR.po article.xml

pt_BR/articles/contributors: Sync with en_US r53598

Approved by:    ebrandi
Obtained from:  
https://weblate.eastus.cloudapp.azure.com/projects/freebsd-doc/articles_contributors/pt_BR/
Differential Revision:  https://reviews.freebsd.org/D22420

FreeBSD/doc 53624head/pt_BR.ISO8859-1/articles/freebsd-releng pt_BR.po article.xml

pt_BR/articles/freebsd-releng: Sync with en_US r53598

Approved by:    ebrandi
Obtained from:  
https://weblate.eastus.cloudapp.azure.com/projects/freebsd-doc/articles_freebsd-releng/pt_BR/
Differential Revision:  https://reviews.freebsd.org/D22419

FreeBSD/doc 53623head/pt_BR.ISO8859-1/books/faq pt_BR.po book.xml

pt_BR/books/faq: Sync with en_US r53598

Fix failing strings reported by Weblate (Quality checks).

Approved by:    ebrandi
Obtained from:  
https://weblate.eastus.cloudapp.azure.com/projects/freebsd-doc/boooks_faq/pt_BR/
Differential Revision:  https://reviews.freebsd.org/D22418

FreeBSD/doc 53622head/pt_BR.ISO8859-1/books/fdp-primer pt_BR.po book.xml

pt_BR/books/fdp-primer: Sync with en_US r53598

Fix several failing strings reported by Weblate (Quality checks).

Approved by:    ebrandi
Obtained from:  
https://weblate.eastus.cloudapp.azure.com/projects/freebsd-doc/boooks_fdp-primer/pt_BR/
Differential Revision:  Revision: https://reviews.freebsd.org/D22417

FreeBSD/doc 53621head/pt_BR.ISO8859-1/books/porters-handbook pt_BR.po book.xml

pt_BR/books/porters-handbook: Sync with en_US r53598

Fix several failing strings reported by Weblate (Quality checks).

Approved by:    ebrandi
Obtained from:  
https://weblate.eastus.cloudapp.azure.com/projects/freebsd-doc/boooks_porters-handbook/pt_BR/
Differential Revision:  https://reviews.freebsd.org/D22416

OpenBSD/src lElaLmhsys/scsi cd.c scsi_ioctl.c

   Be consistent and always use SET() to set flags in xs->flags.
VersionDeltaFile
1.231+10-10sys/scsi/cd.c
1.58+7-7sys/scsi/scsi_ioctl.c
1.239+2-2sys/scsi/scsi_base.c
+19-193 files

NetBSD/src iULoA7udistrib/amd64/uefi-installimage Makefile.bootimage Makefile.installimage, distrib/common/bootimage Makefile.bootimage Makefile.installimage

   Merge amd64's UEFI logic back into the generic bootimage handling.

FreeBSD/ports 518116head/devel/mdb Makefile

Use clang 7 as compiler on 11.x and 12.x to fix build.

clang 8 and later error for duplicate definitions of enum values.  mdb
depends on having identical but duplicate definitions.  This was fixed
differently in 13 with a change to the kernel, but that change is
disruptive and cannot be easily backported.

Reported by:    pkg-fallout, Attila Nagy
Approved by:    bdrewery
MFH:           2019Q3
Differential Revision:  https://reviews.freebsd.org/D22486

DragonFlyBSD/src f51d778usr.bin/dsynth build.c

dsynth - Set pty cols and finally fix ^M in handshake

* Set the pty columns to 80 (fixes textproc/po4a).  Leave rows
  set to 0.

* Set tty modes and CR filtering before issuing the handshake.

* Reorder the handshake.  Now the ^M's no longer show up in the logs.