Ticket #1705

(martin)

Pull up following revision(s) (requested by nia in ticket #1705):

lib/libcrypt/crypt-sha1.c: revision 1.10

libcrypt: Fix a floating point exception when a low number of HMAC-SHA1
iterations are specified.

(martin)

Fix merge mishap from previous (ticket #1704)

(martin)

Ticket #1704

(martin)

Pull up following revision(s) (requested by ryo in ticket #1704):

sys/net/if_ethersubr.c: revision 1.302

frame's vlan tag must be ntohs()'ed.

VLAN 0 Priority tag was misrecognized on non vlan-hwtagging interfaces.

(martin)

Ticket #1703

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #1703):

sys/conf/files: revision 1.1288
sys/kern/uipc_mbuf.c: revision 1.244
share/man/man4/options.4: revision 1.520

Fix a bug that NMBCLUSTERS(kern.mbuf.nmbclusters) can't be changed by sysctl.

Update the description of the NMBCLUSTERS. Add NMBCLUSTERS_MAX.

defparam NMBCLUSTERS_MAX.

(martin)

Tickets #1700 and #1701

(martin)

Pull up the following, requested by msaitoh in ticket #1701:

share/man/man4/wm.4 1.42
sys/dev/pci/files.pci 1.434
sys/dev/pci/if_wm.c 1.686-1.687,1.692-1.693,
1.697,1.699-1.703,
1.706-1.715 via patch
sys/dev/pci/if_wmvar.h 1.46

- Add missing drain for pcq in wm_stop_locked().
- Add support for I219V 15-19 and I219LM 16-19.
- Fix Tx stall.
- Use wm_flush_desc_rings() workaround more on I219.
- Change DMA physical address in wm_flush_desc_rings() to match other
  OSes.
- Check return value correctly in wm_lv_jumbo_workaround_ich8lan().
- Add new sysctl hw.wmN.debug_flags. This sysctl can be used if
  WM_DEBUG is set.
- Add some sysctl values for debugging TX/RX queues.
- WM_EVENT_COUNTER is enabled by default on 64 bit architectures.
- Remove extra unlock/lock processing around if_percpuq_enqueue().
- Refactor rxq->rxq_ptr updating.
- Stop legacy interrupts before calling softint.
- Disable printf()s in wm_flush_desc_rings() because the code is
  verified.
- Print I219's version number.
- Uniform INTx/MSI handler's Tx/Rx behavior to MSI-X's one.
- Fix return value of interrupt handler.
- Only print an error about missing I/O BARs for chips that need it.
- Do not return a void value from a void function.
- Add new flag named WM_F_CRC_STRIP and use it. No functional change.
- Whitespace fixes. Fix comments. No functional change.

(martin)

Regen for ticket #1700:

- Add modern QUMRANET/Red Hat VIRTIO range PCI devices.
- Add some more product IDs for mcx(4).
- Add current generation NVIDIA graphics cards (3050-3090 etc.).
- Add RDC R6022 PCI-Host bridge.
- Add a whole bunch of radeon devices.
- Add Realtek RTL8821CE.
- Add Intel 660p SSD, and expand the 760p description.
- Add Intel I219's version number.
- Add Intel I219V 15-19 and I219LM 16-19.
- Add Intel I225V, I225LM and WiFi 6 AX201.
- Add newer Intel PCH internal devices.
- Add Intel Jasper Lake devices.
- PDC20265 is Ultra/100, not 66.
- Fix Realtek RTL8125 description.
- Sort Cavium devices.

(martin)

Pull up the following (via patch), requested by msaitoh in ticket #1700:

sys/dev/pci/pcidevs 1.1420-1.1440

- Add modern QUMRANET/Red Hat VIRTIO range PCI devices.
- Add some more product IDs for mcx(4).
- Add current generation NVIDIA graphics cards (3050-3090 etc.).
- Add RDC R6022 PCI-Host bridge.
- Add a whole bunch of radeon devices.
- Add Realtek RTL8821CE.
- Add Intel 660p SSD, and expand the 760p description.
- Add Intel I219's version number.
- Add Intel I219V 15-19 and I219LM 16-19.
- Add Intel I225V, I225LM and WiFi 6 AX201.
- Add newer Intel PCH internal devices.
- Add Intel Jasper Lake devices.
- PDC20265 is Ultra/100, not 66.
- Fix Realtek RTL8125 description.
- Sort Cavium devices.

(martin)

Ticket #1698

(martin)

Pull up following revision(s) (requested by hannken in ticket #1698):

sys/kern/sys_pipe.c: revision 1.157

Fix a deadlock where one thread writes to a pipe, has more data
and no space in the pipe and waits on "pipe_wcv" while the reader
is closing the pipe and waits on "pipe_draincv".

Swap the test for "PIPE_EOF" and the "cv_wait_sig()" in "pipe_write()".

PR bin/56422 "zgrep -l sometimes hangs"

(martin)

Ticket #1697

(martin)

Pull up following revision(s) (requested by kre in ticket #1697):

bin/mkdir/mkdir.c: revision 1.39

PR bin/56398

The final component of both a/b/c and a/b/c/ is "c", so that's the one
to which the -m arg applies.

(martin)

Ticket #1696

(martin)

Pull up the following (all via patch), requested by msaitoh in ticket #1696:

sysdev/pci/ixgbe/ixgbe.c 1.252, 1.280-1.283, 1.286-1.287, 1.289-1.290 via patch
sysdev/pci/ixgbe/ixgbe.h 1.73, 1.76-1.80 via patch
sysdev/pci/ixgbe/ix_txrx.c 1.68-1.93
sysdev/pci/ixgbe/ixv.c 1.153, 1.157-1.161, 1.163-1.166 via patch
sysdev/pci/ixgbe/if_bypass.c 1.7-1.9
sysdev/pci/ixgbe/if_fdir.c 1.4-1.5
sysdev/pci/ixgbe/if_sriov.c 1.10-1.11
sysdev/pci/ixgbe/ixgbe_82598.c 1.16
sysdev/pci/ixgbe/ixgbe_82599.c 1.23
sysdev/pci/ixgbe/ixgbe_api.c 1.25
sysdev/pci/ixgbe/ixgbe_bypass.h 1.2
sysdev/pci/ixgbe/ixgbe_common.c 1.30-1.33
sysdev/pci/ixgbe/ixgbe_dcb.c 1.10-1.11
sysdev/pci/ixgbe/ixgbe_dcb.h 1.7
sysdev/pci/ixgbe/ixgbe_dcb_82598.c 1.8-1.9
sysdev/pci/ixgbe/ixgbe_dcb_82598.h 1.7
sysdev/pci/ixgbe/ixgbe_dcb_82599.c 1.8-1.9
sysdev/pci/ixgbe/ixgbe_dcb_82599.h 1.7
sysdev/pci/ixgbe/ixgbe_fdir.h 1.3
sysdev/pci/ixgbe/ixgbe_features.h 1.3
sysdev/pci/ixgbe/ixgbe_mbx.c 1.12
sysdev/pci/ixgbe/ixgbe_netbsd.c 1.16-1.17
sysdev/pci/ixgbe/ixgbe_netbsd.h 1.13-1.14
sysdev/pci/ixgbe/ixgbe_netmap.c 1.3-1.4
sysdev/pci/ixgbe/ixgbe_netmap.h 1.2
sysdev/pci/ixgbe/ixgbe_osdep.c 1.7
sysdev/pci/ixgbe/ixgbe_osdep.h 1.29-1.30
sysdev/pci/ixgbe/ixgbe_phy.c 1.24
sysdev/pci/ixgbe/ixgbe_rss.h 1.5
sysdev/pci/ixgbe/ixgbe_sriov.h 1.4
sysdev/pci/ixgbe/ixgbe_type.h 1.49
sysdev/pci/ixgbe/ixgbe_vf.c 1.27
sysdev/pci/ixgbe/ixgbe_x540.c 1.18-1.19
sysdev/pci/ixgbe/ixgbe_x540.h 1.9
sysdev/pci/ixgbe/ixgbe_x550.c 1.19-1.20
sysdev/pci/ixgbe/ixgbe_x550.h 1.6
sysdev/pci/files.pci 1.438
share/man/man4/ixg.4 1.15
share/man/man4/ixv.4 1.8

- Use MCLGET() instead of homegrown cluster (jcl) allocation mechanism.
  Before this commit, resource shortage was easily occurred because
  the total number of the clusters is small.
- Improve performance:
  - Use m_adj(ETHER_ALIGN) more.
  - Sprinkle __predict_false() in the RX path.
  - Don't pre-allocate a cluster for RXCOPY case to improve short
    packet's performance.
- Call bus_dmamap_unload(9) via ixgbe_dmamap_unload(), before freeing
  DMA buffer. Also, when the buffer is already freed, do not call
  bus_dmamap_unload(9) (no resource leaks with this change). This
  change is required to make ixg(4) work on alpha.
- Keep m_len and m_pkthdr.len consistent to prevent panic on arm.
- Fix panic when bus_dmamap_load_mbuf() failed in
  ixgbe_setup_receive_ring().
- Added BUS_DMA_COHERENT flag to bus_dmamem_map() to improve stability
  on aarch64.
- Use uint64_t instead of bus_addr_t for the TX descriptor's buffer
  address. At least, this change is required for macppc
  (sizeof(bus_addr_t) == 4) to make TX work.
- Fix little-endian dependence.
- Set rxr->next_to_refresh correctly in ixgbe_setup_receive_ring().
- Refresh unrefreshed descriptors' buffers correctly.
- Don't call bus_dmamap_sync with rx_mbuf_sz(== MCLBYTES) to prevent
  panic.
- Save the discard_multidesc state to not to forget the state by
  exiting rxeof().
- Add missing increment of no_mbuf error counter.
- Don't increment no_mbuf evcnt(9) when discarding multi-descriptor
  packet.
- ixv: Modify error message to sync with ixgbe.c
- Print the error value of ixgbe_reset_hw() for debugging.
- Remove extra unlock/lock processing around if_percpuq_enqueue().
- Refactor rxr->next_to_check updating.
- Add new sysctl "rx_copy_len".
- Add a new sysctl to read rxr->next_to_refresh.
- Print error number when error occurred.
- Rename ix{gbe,v}_stop() with ix{gbe,v}_stop_locked(). No functional
  change.
- Don't use fixed value.
- Comment out flow director processing in fast path.
- Add missing NetBSD RCS IDs and __KERNEL_RCSID()s.
- KNF.
- Fix typos.

(martin)

Fix editor mishap/typo

(martin)

Ticket #1695.

(msaitoh)

Pull up following revision(s) (requested by martin in ticket #1695):
build.sh: revision 1.348
build.sh: revision 1.349
build.sh: revision 1.350
build.sh: revision 1.351
build.sh: revision 1.352
build.sh: revision 1.356
ignore cvslatest errors in expert mode
Handle git and mercurial for reproducible builds.
for mercurial, use the latest revision instead of limiting the output to 1
(requested by joerg)
handle different flavors of date(1)
kre@ does not like the subshell :-)
Add a new operation "mkrepro-timestamp" to extract the timestamp a
build with -P would use. Example usage:
./build.sh -T /usr/tools -P mkrepro-timestamp
This allows us to extract this information once, make other use of it,
and replicate it on other machines with -V MKREPRO=yes -V MKREPRO_TIMESTAMP=..

(msaitoh)

1694

(snj)

Pull up following revision(s) (requested by martin in ticket #1694):
distrib/sets/makesrctars: revision 1.43
PR 56389: do not include top level .git or .hg directories
in source sets.

(snj)

Ticket #1693

(martin)

Pull up following revision(s) (requested by andvar in ticket #1693):

sys/dev/pci/if_vte.c: revision 1.32

Restore original MDC speed control register value after MAC reset, if
it wasn't default. Fixes PR port-i386/53494.

ok riastradh

(martin)

Ticket #1692

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #1692):

sys/netinet6/nd6.c: revision 1.277

nd6: prevent ln from being freed while releasing held packets

(martin)

Ticket #1691

(martin)

Pull up following revision(s) (requested by christos in ticket #1691):

sys/compat/common/vfs_syscalls_43.c: revision 1.67
sys/compat/common/vfs_syscalls_50.c: revision 1.26
sys/compat/common/vfs_syscalls_30.c: revision 1.42

- memset struct stat to avoid kernel memory disclosure of padded fields
  (thanks Trend Micro for the report)
- use do_fhstat
- consistency in argument order of compat functions

(martin)

Ticket #1690

(martin)

Pull up following revision(s) (requested by kardel in ticket #1690):

sys/netinet6/in6_src.c: revision 1.88

PR kern/56348

MTU discovery fails with IPv6 sockets bound to IPv4 mapped address
pick up the IPv4 route for IPv4 mapped IPv6 address to get the correct
MTU and not any unrelated/inappropriate MTU from IPv6 routes. IPv4 mapped
IPv6 addresses are always handled by the IPv4 stack and MTU discovery
is solely handled with the IPv4 routing table.

(martin)

Ticket #1689

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1689):

sys/arch/hppa/dev/sti_sgc.c: revision 1.3

Fix silent freeze on probing sti(4) framebuffer on 712/60.  PR/52162

Ok'ed by skrll@.
Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Ticket #1686

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1686):

distrib/sun3/miniroot/Makefile: revision 1.50
distrib/miniroot/install.sub: revision 1.61
distrib/miniroot/install.sub: revision 1.62 (patch)
distrib/sun2/miniroot/Makefile: revision 1.40

Replace RELEASE and VERSION strings proplery.
sun2 and sun3 don't use MI src/distrib/miniroot/list so this should
have been sync'ed with it.

http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.36
> Use proper release version strings ("9.1" rather than "91") in banners.
>
> Also define and use "MACHINE" variable to describe port names
> (no uname(1) or sysctl(8) in miniroot binary list by default).

Should be pulled up to netbsd-9.

Remove netstat(1) calls to print resolver info on upgrade using miniroot.
netstat(1) was removed from miniroot 25 years ago.
http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.5

The modules and rescue sets are also required on upgrade.
Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Tickets #1685 and #1684

(martin)

Apply patch, requested by mrg in ticket #1684 (no corresponding
change in HEAD, oabi has been removed):

compat/arm/oabi/bsd.oabi.mk (apply patch)

Fix PR 50192.

(martin)

Regen for ticket #1685

(martin)

Pull up following revision(s) (requested by dholland in ticket #1685):

sys/sys/namei.src: revision 1.59 (via patch)
sys/kern/vfs_vnops.c: revision 1.215
sys/kern/vfs_lookup.c: revision 1.226

Add a new namei flag NONEXCLHACK for open with O_CREAT and not O_EXCL.
This case needs to be distinguished from the other CREATE operations
because it is supposed to successfully return (and open) the target if
it exists. In the case where that target is the root, or a mount
point, such that there's no parent dir, "real" CREATE operations fail,
but O_CREAT without O_EXCL needs to succeed.

So (a) add the flag, (b) test for it in namei in the situation
described above, (c) set it in open under the appropriate
circumstances, and (d) because this can result in namei returning
ni_dvp of NULL, cope with that case.

Should get into -9 and maybe even -8, because it was prompted by
issues with 3rd-party code. The use of a flag (vs. adding an
additional nameiop, which would be more appropriate) was deliberate to
make the patch small and noninvasive.

(martin)

Ticket #1683

(martin)

Pull up following revision(s) (requested by hannken in ticket #1683):

sbin/dump/tape.c: revision 1.56

Bitmaps (TS_BITS and TS_CLRI) dont use the "c_addr" array as they
cannot have holes.  As bitmaps are written without TS_ADDR records
"c_count" may be larger than the "c_addr" size resulting in a
segmentation violation reading "c_addr" beyond its end.

Compute "blks" for TS_INODE and TS_ADDR only -- its used for multi
volume dumps and the bitmaps must both be on the first volume.

(martin)

Tickets #1680 - #1682

(martin)

Pull up following revision(s) (requested by nia in ticket #1682):

sys/dev/pci/if_iwmreg.h: revision 1.8

Can't left shift a signed int by 31. Found by kubsan.

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1681):

distrib/miniroot/install.sub: revision 1.60

Handle recent ifconfig(8) outputs in the miniroot installation script.

- Remove netmask slash notation for IP addresses,
  which has been changed between NetBSD 7.x and 8.0:
  http://cvsweb.netbsd.org/bsdweb.cgi/src/sbin/ifconfig/af_inet.c#rev1.24

- Ignore inet6 entries, which miniroot scripts don't support

Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1680):

sys/arch/hp300/conf/INSTALL: revision 1.67
sys/arch/hp300/conf/INSTALL: revision 1.68

Add missed 'nhpib at intio' for internal HP-IB.  Found on testing HPDisk.
Also fix comments for HP-IB devices.
Should be pulled up to netbsd-8 and netbsd-9.

Reduce maxusers to 8 as GENERIC.
Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Ticket #1679

(martin)

Apply patch, requested by mrg in ticket #1679:

xsrc/external/mit/libX11/dist/src/Font.c (apply patch)
xsrc/external/mit/libX11/dist/src/FontInfo.c (apply patch)
xsrc/external/mit/libX11/dist/src/FontNames.c (apply patch)
xsrc/external/mit/libX11/dist/src/GetColor.c (apply patch)
xsrc/external/mit/libX11/dist/src/LoadFont.c (apply patch)
xsrc/external/mit/libX11/dist/src/LookupCol.c (apply patch)
xsrc/external/mit/libX11/dist/src/ParseCol.c (apply patch)
xsrc/external/mit/libX11/dist/src/QuExt.c (apply patch)
xsrc/external/mit/libX11/dist/src/SetFPath.c (apply patch)
xsrc/external/mit/libX11/dist/src/SetHints.c (apply patch)
xsrc/external/mit/libX11/dist/src/StNColor.c (apply patch)
xsrc/external/mit/libX11/dist/src/StName.c (apply patch)
xsrc/external/mit/libX11/dist/src/xlibi18n/imKStoUCS.c (apply patch)

Apply upstream fixes for CVE-2021-31535 (and one other bug).
Reject string longer than USHRT_MAX before sending them on the wire.
Fix out-of-bound access in KeySymToUcs4().

(martin)

Ticket #1678

(martin)

Pull up following revision(s) (requested by mrg in ticket #1678):

bin/pax/options.c: revision 1.119
usr.bin/config/scan.l: revision 1.32
usr.bin/make/main.c: revision 1.274
bin/pax/extern.h: revision 1.60
usr.bin/config/defs.h: revision 1.106
usr.bin/make/make.h: revision 1.105
sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
usr.bin/config/main.c: revision 1.100
usr.sbin/installboot/Makefile: revisions 1.53,1.54 (patch)
usr.sbin/installboot/installboot.h: revision 1.41 (patch)
usr.sbin/installboot/machines.c: revisisons 1.41,1.42 (patch)

Avoid depending on common symbols.

(martin)

ticket #1677

(bouyer)

Pull up following revision(s) (requested by martin in ticket #1677):
sys/kern/kern_exec.c: revision 1.505 via patch
Fix copy&pasto in handling of POSIX_SPAWN_RESETIDS in posix_spawn(3)

(bouyer)

Tickets #1674 - #1676

(martin)

Pull up the following, requested by kre in ticket #1676:

external/public-domain/tz/dist/Makefile        up to 1.1.1.30
external/public-domain/tz/dist/NEWS            up to 1.1.1.34
external/public-domain/tz/dist/TZDATA_VERSION  up to 1.24
external/public-domain/tz/dist/africa          up to 1.1.1.25
external/public-domain/tz/dist/asia            up to 1.1.1.28
external/public-domain/tz/dist/australasia      up to 1.1.1.21
external/public-domain/tz/dist/backward        up to 1.1.1.12
external/public-domain/tz/dist/backzone        up to 1.1.1.20
external/public-domain/tz/dist/etcetera        up to 1.1.1.5
external/public-domain/tz/dist/europe          up to 1.1.1.30
external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15
external/public-domain/tz/dist/leapseconds      up to 1.1.1.18
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.12
external/public-domain/tz/dist/northamerica    up to 1.1.1.27
external/public-domain/tz/dist/theory.html      up to 1.1.1.12
external/public-domain/tz/dist/version          up to 1.1.1.21
external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.6
external/public-domain/tz/dist/zone.tab        up to 1.1.1.19
external/public-domain/tz/dist/zone1970.tab    up to 1.1.1.21
doc/3RDPARTY (apply patch)

Update from tzdata2020d to tzdata2021a.

The significant changes are:

    Volgograd switched to Moscow time on 2020-12-27 at 02:00.  (2020e)
    South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. (2021a)

(martin)

Pull up following revision(s) (requested by kre in ticket #1675):

sys/arch/xen/x86/xen_ipi.c: revision 1.24 (patch)

make compile without DDB
PR port-xen/50282

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1674):

distrib/notes/common/netboot: revision 1.39

For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory.
Pointed out by Anders Gustafsson on port-hp300@.

https://mail-index.netbsd.org/port-hp300/2021/04/21/msg000201.html

Should be pulled up to netbsd-8 and netbsd-9.

XXX: kernel should use the dhcpd/bootp server address for nfsroot
    if the specified next-server (siaddr) is 0.0.0.0?

(martin)

Ticket #1673

(martin)

Apply patch, requested by mrg in ticket #1673:

external/mit/xorg-server/dist/Xi/chgfctl.c (apply patch)
external/mit/xorg-server.old/dist/Xi/chgfctl.c (apply patch)

Fix for CVE-2021-3472 (local privilege escalation).

(martin)

Ticket #1672

(martin)

Pull up following revision(s) (requested by skrll in ticket #1672):

sys/arch/arm/include/lock.h: revision 1.37
common/lib/libc/arch/arm/atomic/atomic_swap_64.S: revision 1.11
common/lib/libc/arch/arm/atomic/atomic_swap.S: revision 1.15
common/lib/libc/arch/arm/atomic/atomic_swap.S: revision 1.16
sys/arch/arm/include/lock.h: revision 1.36

Fix ARMv8 instructions

Fix __sync_lock_release_4 to actually zeroise the whole 4bytes/32bits.

Trailing whitespace

Change #ifdef FOO to #if defined(FOO).  NFCI.

(martin)

Ticket #1671

(martin)

Apply patch, requested by mrg in ticket #1671:

external/bsd/file/dist/magic/magdir/python
external/bsd/file/dist/magic/magdir/windows

Enhance regex portability (by copying over the versions from file 5.40).

(martin)

Ticket #1669

(martin)

Pull up following revision(s) (requested by simonb in ticket #1669):

bin/ps/print.c: revision 1.133

Fix the column width calculation for the lstart column if an empty
column header is specified.

Fixes bug pointed out by Ted Spradley in
https://mail-index.netbsd.org/netbsd-users/2021/04/05/msg026808.html .

(martin)

Tickets #1667 and #1668

(martin)

Pull up the following via patch, requested by mrg in ticket #1668:

Makefile 1.30-1.31
Makefile.boot 1.7-1.9
auth-bozo.c 1.25-1.26
bozohttpd.8 1.80-1.87
bozohttpd.c 1.114-1.123,1.125-1.128
bozohttpd.h 1.61-1.68
cgi-bozo.c 1.49-1.53
content-bozo.c 1.17-1.20
daemon-bozo.c 1-.22
dir-index-bozo.c 1.33-1.34
main.c 1.23-1.27
printenv.lua 1.4-1.5
ssl-bozo.c 1.27-1.29
libbozohttpd/libbozohttpd.3 1.5-1.6
small/Makefile 1.4
testsuite/Makefile 1.14
testsuite/t16.in 1.1
testsuite/t16.out 1.1
testsuite/t17.in 1.1
testsuite/t17.out 1.1
testsuite/t18.in 1.1
testsuite/t18.out 1.1

Update to bozohttpd 20210227.

changes in bozohttpd 20210227:
o  new support for content types: .tar.bz2, .tar.xz, .tar.lz,
  .tar.zst, .tbz2, .txz, .tlz, .zipx, .xz, .zst, .sz, .lz, .lzma,
  .lzo, .7z, .lzo, .cab, .dmg, .jar, and .rar.  should fix
  netbsd PR#56026:
  MIME type of .tar.xz file on ny{cdn,ftp}.NetBSD.org is invalid

changes in bozohttpd 20210211:
o  fix various NULL derefs from malformed headers.  mostly from
  <emily@ingalls.rocks>.
o  fix memory leaks in library interface: add bozo_cleanup().

changes in bozohttpd 20201014:
o  also set -D_GNU_SOURCE in Makefile.boot.  from
  hadrien.lacour@posteo.net.
o  fix array size botch (assertion, not exploitable.)  from
  martin@netbsd.org.
o  also match %2F as well as %2f.  from leah@vuxu.org.
o  many manual and help fixes.  clean ups for higher lint levels,
  consistency/style clean ups.  various option fixes including made
  -f imply -b.  from <henrik@gulbra.net> for freebsd.

changes in bozohttpd 20200912:
o  add .m4a and .m4v file extensions.

changes in bozohttpd 20200820:
o  make this work on sun2 by reducing mmap window there.
o  fix SSL shutdown sequence.  from spz@netbsd.org.
o  add readme support to directory indexing.  from jmcneill@netbsd.org
o  add blocklist(8) support.  from jruoho@netbsd.org.

(martin)

Regen for ticket #1667 (BELKIN F5D7050E fix)

(martin)

Pull up following revision(s) (requested by nia in ticket #1667):

sys/dev/usb/usbdevs: revision 1.793

correct usb device id for BELKIN F5D7050E

matches freebsd / openbsd (sources of urtw driver), various online
sources

PR kern/56056

(martin)

Ticket #1665

(martin)

Pull up following revision(s) (requested by knakahara in ticket #1665):

sys/net/if_l2tp.h: revision 1.10

Fix l2tp(4) ioctl type. Pointed out by yamaguchi@n.o, thanks.
XXX pullup-[89]

(martin)

Ticket #1663

(martin)

Pull up the following (all via patch), requested by msaitoh in ticket #1663:

sys/dev/pci/ixgbe/ixgbe.c 1.259, 1.278-1.279
sys/dev/pci/ixgbe/ixgbe.h 1.75
sys/dev/pci/ixgbe/ixgbe_netbsd.h 1.12
sys/dev/pci/ixgbe/ixgbe_vf.c 1.24-1.26
sys/dev/pci/ixgbe/ixgbe_x550.c 1.17
sys/dev/pci/ixgbe/ixv.c 1.155-1.156
sys/dev/pci/ixgbe/ix_txrx.c 1.64-67
sys/dev/pci/files.pci 1.436
share/man/man4/ixg.4 1.13-1.14
share/man/man4/ixv.4 1.3, 1.6-1.7

- Fix a problem that the RX path stalled when the mbuf cluster is
  exhausted.
- Modify some parameters to reduce packet dropping. See also the
  manual's OPTIONS section for the detail.
- ixv(4): The max number of queue(pair) is not 7 but 8. Correctly
  reset the hardware.
- Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make
  it more understandable.
- Fix a bug that some advertise speeds can't be set with
  hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error
  message, too.
- Fix typo in comment or debug message.

(martin)

Ticket #1662

(martin)

Pull up following revision(s) (requested by christos in ticket #1662):

sys/netinet/tcp_subr.c: revision 1.286
sys/netinet/tcp_timer.c: revision 1.96
sys/netinet/in_var.h: revision 1.102
sys/netinet/in_var.h: revision 1.99

Don't increment the iss sequence on each connection because it exposes
information (Amit Klein)

Add some randomness to the iss offset

Use a random IPv4 ID because the shuffling algorithm used before could expose
information (Amit Klein)

mv <sys/cprng.h> include to the kernel portion

(martin)

Ticket #1661

(martin)

Pull up following revision(s) (requested by christos in ticket #1661):

sys/netinet6/ip6_id.c: revision 1.19-1.21
sys/netinet6/ip6_var.h: revision 1.88
sys/netinet/ip_input.c: revision 1.400
sys/netinet/tcp_subr.c: revision 1.285
sys/netinet/ip6.h: revision 1.30

netinet: Enable random IP fragment ids by default (from riastradh)

netinet: Enable RFC 1948 pseudorandom TCP ISS selection by default.
(from riastradh)

netinet6: Mark randomid unused.

Will make merging and bisection easier if anything goes wrong with
flow label or fragment id randomization changes.
(from riastradh)

netinet/netinet6: Add necessary includes to make these standalone.
(from riastradh)

Replace randomid() by cprng_fast32()

(martin)

Ticket #1660

(martin)

Pull up following revision(s) (requested by nia in ticket #1660):

usr.bin/patch/backupfile.c: revision 1.16
usr.bin/patch/backupfile.h: revision 1.7
usr.bin/patch/patch.c: revision 1.30

patch: make '-V none' work in the expected way

Internally the code confuses the concept of "the user doesn't want
a backup file" and "the user hasn't defined a type of backup file".

Introduce a new "undefined" backup type to serve the purpose "none"
previously did, and make "none" not generate backup files, as expected.

http://mail-index.netbsd.org/tech-userlevel/2021/02/19/msg012901.html

XXX pullup?

(martin)

Ticket #1659

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1659):

sys/arch/m68k/m68k/reenter_syscall.s: revision 1.5
sys/arch/m68k/m68k/reenter_syscall.s: revision 1.6
sys/arch/m68k/m68k/reenter_syscall.s: revision 1.7

Replace magic numbers with proper macros prepared in assym.h.

No binary changes.

Note this is a preparation for a possible fix of PR port-m68k/55990.

Consistently use motorola style.  No binary changes.
Seems missed in rev 1.3:
https://mail-index.netbsd.org/source-changes/2013/08/01/msg046378.html

Plug kernel stack leaks in reenter_syscall() for setcontext(2).
This fixes long standing kernel crashes (MMU fault, address error,
and silent freeze by a double bus fault etc. seen for ~10 years)
caused by kernel stack overflow, especially on x68k and sun3 running
Xorg based servers.  See PR/55990 for more details.

"This change seems perfectly reasonable" from thorpej@ and
jklos@ also reported this also solved freeze of his mac68k system
with 10 megabyes of memory.

Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Ticket #1658

(martin)

Pull up following revision(s) (requested by christos in ticket #1658):

bin/ksh/siglist.sh: revision 1.13

PR/56007: Greg A. Woods: ksh unable to execute ERR traps
(probably since 2016/03/17 - i.e. 8.x and 9.x)

(martin)

Ticket #1657

(martin)

Pull up following revision(s) (requested by knakahara in ticket #1657):

sys/arch/x86/x86/intr.c: revision 1.154 (via patch)

Fix x86's pci_intr_disestablish clean up routine.  Pointed out by t-kusaba@IIJ, thanks.

Fix panic on x86 by the following code.

====================
    sc_ih = pci_intr_establish_xname(sc_pc, ...);
    pci_intr_disestablish(sc_pc, sc_ih);
    sc_ih = pci_intr_establish(sc_pc, ...);
====================

ena(4) do such processing when ifconfig down/up.

XXX pullup-8,9

(martin)

Tickets #1655 and #1656

(martin)

Pull up following revision(s) (requested by mrg in ticket #1656):

external/mit/xorg/bin/xterm/Makefile: revision 1.20 (patch)

add new files for xterm 366.

(martin)

Pull up the following

xsrc/external/mit/xterm/dist/package/debian/xterm-dev.lintian-overrides up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/freebsd/distinfo up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/freebsd/pkg-message.wchar up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/pkgsrc/Makefile up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/pkgsrc/DESCR    up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/pkgsrc/distinfo up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/pkgsrc/PLIST    up to 1.1.1.1
xsrc/external/mit/xterm/dist/package/pkgsrc/options.mk up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/closest-rgb.pl  up to 1.1.1.2
xsrc/external/mit/xterm/dist/vttests/query-status.pl up to 1.1.1.2
xsrc/external/mit/xterm/dist/vttests/modify-keys.pl  up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/mouse-codes    up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/other-sgr.sh    up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/print-vt-chars.pl up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/query-dynamic.pl up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/query-xres.pl  up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/report-sgr.pl  up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/sgrPushPop.pl  up to 1.1.1.1
xsrc/external/mit/xterm/dist/vttests/sgrPushPop2.pl  up to 1.1.1.1
xsrc/external/mit/xterm/dist/COPYING                up to 1.1.1.1
xsrc/external/mit/xterm/dist/gen-charsets.pl        up to 1.1.1.1
xsrc/external/mit/xterm/include/Tekparse.hin        delete
xsrc/external/mit/xterm/include/VTparse.hin          delete
xsrc/external/mit/xterm/dist/INSTALL                up to 1.1.1.12
xsrc/external/mit/xterm/dist/Imakefile              up to 1.1.1.10
xsrc/external/mit/xterm/dist/MANIFEST                up to 1.1.1.16
xsrc/external/mit/xterm/dist/Makefile.in            up to 1.1.1.13
xsrc/external/mit/xterm/dist/NEWS                    up to 1.1.1.3
xsrc/external/mit/xterm/dist/THANKS                  up to 1.1.1.9
xsrc/external/mit/xterm/dist/TekPrsTbl.c            up to 1.1.1.2
xsrc/external/mit/xterm/dist/Tekproc.c              up to 1.1.1.14
xsrc/external/mit/xterm/dist/UXTerm.ad              up to 1.1.1.3
xsrc/external/mit/xterm/dist/VTPrsTbl.c              up to 1.1.1.9
xsrc/external/mit/xterm/dist/VTparse.def            up to 1.1.1.8
xsrc/external/mit/xterm/dist/VTparse.h              up to 1.1.1.10
xsrc/external/mit/xterm/dist/XTerm.ad                up to 1.11
xsrc/external/mit/xterm/dist/aclocal.m4              up to 1.1.1.14
xsrc/external/mit/xterm/dist/button.c                up to 1.1.1.16
xsrc/external/mit/xterm/dist/cachedGCs.c            up to 1.1.1.11
xsrc/external/mit/xterm/dist/charclass.c            up to 1.1.1.6
xsrc/external/mit/xterm/dist/charclass.h            up to 1.1.1.3
xsrc/external/mit/xterm/dist/charproc.c              up to 1.1.1.15
xsrc/external/mit/xterm/dist/charsets.c              up to 1.1.1.6
xsrc/external/mit/xterm/dist/config.guess            up to 1.1.1.12
xsrc/external/mit/xterm/dist/config.sub              up to 1.1.1.12
xsrc/external/mit/xterm/dist/configure              up to 1.1.1.14
xsrc/external/mit/xterm/dist/configure.in            up to 1.1.1.13
xsrc/external/mit/xterm/dist/ctlseqs.ms              up to 1.1.1.15
xsrc/external/mit/xterm/dist/ctlseqs.txt            up to 1.1.1.15
xsrc/external/mit/xterm/dist/cursor.c                up to 1.1.1.9
xsrc/external/mit/xterm/dist/data.c                  up to 1.1.1.7
xsrc/external/mit/xterm/dist/data.h                  up to 1.1.1.10
xsrc/external/mit/xterm/dist/df-install.in          up to 1.1.1.3
xsrc/external/mit/xterm/dist/doublechr.c            up to 1.1.1.9
xsrc/external/mit/xterm/dist/error.h                up to 1.1.1.6
xsrc/external/mit/xterm/dist/fontutils.c            up to 1.8
xsrc/external/mit/xterm/dist/fontutils.h            up to 1.1.1.10
xsrc/external/mit/xterm/dist/graphics.c              up to 1.1.1.6
xsrc/external/mit/xterm/dist/graphics_regis.c        up to 1.1.1.5
xsrc/external/mit/xterm/dist/graphics_sixel.c        up to 1.1.1.4
xsrc/external/mit/xterm/dist/html.c                  up to 1.1.1.3
xsrc/external/mit/xterm/dist/input.c                up to 1.1.1.13
xsrc/external/mit/xterm/dist/keysym2ucs.c            up to 1.1.1.3
xsrc/external/mit/xterm/dist/koi8rxterm              up to 1.1.1.3
xsrc/external/mit/xterm/dist/koi8rxterm.man          up to 1.1.1.3
xsrc/external/mit/xterm/dist/linedata.c              up to 1.6
xsrc/external/mit/xterm/dist/main.c                  up to 1.1.1.13
xsrc/external/mit/xterm/dist/main.h                  up to 1.1.1.6
xsrc/external/mit/xterm/dist/menu.c                  up to 1.1.1.13
xsrc/external/mit/xterm/dist/menu.h                  up to 1.1.1.12
xsrc/external/mit/xterm/dist/minstall.in            up to 1.1.1.5
xsrc/external/mit/xterm/dist/misc.c                  up to 1.17
xsrc/external/mit/xterm/dist/plink.sh                up to 1.1.1.5
xsrc/external/mit/xterm/dist/print.c                up to 1.1.1.11
xsrc/external/mit/xterm/dist/ptydata.c              up to 1.1.1.9
xsrc/external/mit/xterm/dist/ptyx.h                  up to 1.15
xsrc/external/mit/xterm/dist/resize.c                up to 1.1.1.9
xsrc/external/mit/xterm/dist/resize.man              up to 1.1.1.5
xsrc/external/mit/xterm/dist/run-tic.sh              up to 1.1.1.3
xsrc/external/mit/xterm/dist/screen.c                up to 1.1.1.12
xsrc/external/mit/xterm/dist/scrollback.c            up to 1.6
xsrc/external/mit/xterm/dist/scrollbar.c            up to 1.1.1.11
xsrc/external/mit/xterm/dist/svg.c                  up to 1.1.1.2
xsrc/external/mit/xterm/dist/tabs.c                  up to 1.1.1.6
xsrc/external/mit/xterm/dist/termcap                up to 1.1.1.6
xsrc/external/mit/xterm/dist/terminfo                up to 1.1.1.7
xsrc/external/mit/xterm/dist/testxmc.c              up to 1.1.1.7
xsrc/external/mit/xterm/dist/trace.c                up to 1.1.1.13
xsrc/external/mit/xterm/dist/trace.h                up to 1.1.1.13
xsrc/external/mit/xterm/dist/util.c                  up to 1.1.1.13
xsrc/external/mit/xterm/dist/uxterm                  up to 1.1.1.3
xsrc/external/mit/xterm/dist/uxterm.desktop          up to 1.1.1.5
xsrc/external/mit/xterm/dist/uxterm.man              up to 1.1.1.3
xsrc/external/mit/xterm/dist/version.c              up to 1.1.1.5
xsrc/external/mit/xterm/dist/version.h              up to 1.1.1.16
xsrc/external/mit/xterm/dist/vms.c                  up to 1.1.1.4
xsrc/external/mit/xterm/dist/wcwidth.c              up to 1.1.1.6
xsrc/external/mit/xterm/dist/wcwidth.h              up to 1.1.1.2
xsrc/external/mit/xterm/dist/xcharmouse.h            up to 1.1.1.5
xsrc/external/mit/xterm/dist/xstrings.c              up to 1.1.1.10
xsrc/external/mit/xterm/dist/xstrings.h              up to 1.1.1.6
xsrc/external/mit/xterm/dist/xterm.appdata.xml      up to 1.1.1.3
xsrc/external/mit/xterm/dist/xterm.dat              up to 1.1.1.3
xsrc/external/mit/xterm/dist/xterm.h                up to 1.3
xsrc/external/mit/xterm/dist/xterm.log.html          up to 1.1.1.16
xsrc/external/mit/xterm/dist/xterm.man              up to 1.17
xsrc/external/mit/xterm/dist/xterm_io.h              up to 1.1.1.7
xsrc/external/mit/xterm/dist/xtermcap.c              up to 1.1.1.9
xsrc/external/mit/xterm/dist/xtermcfg.hin            up to 1.1.1.13
xsrc/external/mit/xterm/dist/xutf8.c                up to 1.1.1.6
xsrc/external/mit/xterm/dist/icons/filled-xterm.svg  up to 1.1.1.2
xsrc/external/mit/xterm/dist/icons/mini.xterm.svg    up to 1.1.1.2
xsrc/external/mit/xterm/dist/icons/terminal_48x48.svg up to 1.1.1.2
xsrc/external/mit/xterm/dist/icons/xterm-color.svg  up to 1.1.1.2
xsrc/external/mit/xterm/dist/icons/xterm.svg        up to 1.1.1.2
xsrc/external/mit/xterm/dist/package/xterm.spec      up to 1.1.1.11
xsrc/external/mit/xterm/dist/package/debian/changelog up to 1.1.1.11
xsrc/external/mit/xterm/dist/package/debian/compat  up to 1.1.1.2
xsrc/external/mit/xterm/dist/package/debian/control  up to 1.1.1.5
xsrc/external/mit/xterm/dist/package/debian/copyright up to 1.1.1.7
xsrc/external/mit/xterm/dist/package/debian/rules    up to 1.1.1.8
xsrc/external/mit/xterm/dist/package/debian/watch    up to 1.1.1.2
xsrc/external/mit/xterm/dist/package/debian/xterm-dev.docs up to 1.1.1.2
xsrc/external/mit/xterm/dist/package/debian/xterm-dev.menu up to 1.1.1.2
xsrc/external/mit/xterm/dist/package/freebsd/Makefile up to 1.1.1.7
xsrc/external/mit/xterm/dist/package/freebsd/pkg-descr up to 1.1.1.2
xsrc/external/mit/xterm/dist/unicode/convmap.pl      up to 1.1.1.3
xsrc/external/mit/xterm/dist/unicode/keysym.map      up to 1.1.1.3
xsrc/external/mit/xterm/dist/vttests/256colors.pl    up to 1.1.1.4
xsrc/external/mit/xterm/dist/vttests/256colors2.pl  up to 1.1.1.6
xsrc/external/mit/xterm/dist/vttests/88colors.pl    up to 1.1.1.4
xsrc/external/mit/xterm/dist/vttests/88colors2.pl    up to 1.1.1.6
xsrc/external/mit/xterm/dist/vttests/dynamic.pl      up to 1.1.1.4
xsrc/external/mit/xterm/dist/vttests/paste64.pl      up to 1.1.1.5
xsrc/external/mit/xterm/dist/vttests/query-color.pl  up to 1.1.1.4
xsrc/external/mit/xterm/dist/vttests/query-fonts.pl  up to 1.1.1.3
xsrc/external/mit/xterm/dist/vttests/resize.pl      up to 1.1.1.5
xsrc/external/mit/xterm/dist/vttests/tcapquery.pl    up to 1.1.1.6
xsrc/external/mit/xterm/include/xtermcfg.h          up to 1.15

Import Xterm 366, changes too numerous to list, main fix is for CVE-2021-27135:
* correct upper-limit for selection buffer, accounting for combining
  characters

(martin)

Pull up following revision(s) (requested by oster in ticket #1655):

sys/dev/raidframe/rf_reconstruct.c: revision 1.125

Fix a long long-standing off-by-one error in computing lastPSID.

SUsPerPU is only really supported for a value of 1, and since the
first PSID is 0, the last will be numStripe-1.  Also update the
setting of pending_writes to reflect the change to lastPSID.

Needs pullups to -8 and -9.

(martin)

Tickets #1652 - #1654

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1654):

sys/arch/x68k/x68k/machdep.c: revision 1.204

Restore fixes for PR/51663 lost in r1.195 (uvm_hotplug(9) merge).

The kernel crashdump and savecore(8) on NetBSD/x68k have been broken
(even without EXTNEDED_MEMORY) since NetBSD 8.0. Oops.

Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Pull up following revision(s) (requested by ryoon in ticket #1653):

sys/fs/msdosfs/msdosfs_vfsops.c: revision 1.136

Enable to mount Raspberry Pi Pico's USB mass storage partition
Fix PR kern/55985.

O.k. by thorpej@.
Pull-up to netbsd-8 and netbsd-9.

(martin)

Pull up following revision(s) (requested by ryoon in ticket #1652):

sys/dev/scsipi/cd.c: revision 1.350
sys/dev/scsipi/sd.c: revision 1.331

PR 55986: Ryo Onodera: DK_BUSY must have mask as second argument. Make cd.c
consistent by also using __BIT()

(martin)

Ticket #1651

(martin)

Pull up following revision(s) (requested by ginsbach in ticket #1651):

usr.bin/nl/nl.c: revision 1.13
usr.bin/nl/nl.c: revision 1.14
usr.bin/nl/nl.c: revision 1.15

nl(1): remove superfluous exit

Remove exit(3) call missed when errors were converted to errx(3).

nl: fix -d delim parsing for POSIX
POSIX specifies it is possible to specify a one delimiter character.
Fix the logic so that both one and two character delimiters are accepted.

PR/55891 supress displaying separator when numbers supressed

Fix based on patch provided by Kobayashi Takashi. This brings nl(1) further
in to POSIX compliance. Verified behavior with classic SysV nl(1) and GNU
nl(1). There could still be edge cases here not specified by POSIX.

(martin)

Ticket #1650

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1650):

usr.sbin/isibootd/isibootd.c: revision 1.4

Fix "Cannot allocate memory" failure on amd64.
BIOCGBLEN ioctl of bpf(4) requires u_int, not size_t.

The problem is reported by Kenji Aoyama.
Should be pulled up to netbsd-9 and netbsd-8.

(martin)

Tickets #1648 and #1649

(martin)

Pull up following revision(s) (requested by simonb in ticket #1648):

lib/libc/arch/mips/sys/cerror.S: revision 1.20

For mips n32/n64 explicitly save the GP reg on the stack, and
restore it _after_ the call to __errno().  Fixes sending the
__errno() call off to nowhereland when this code is included
in another library (eg __posix_cerror() in libposix).  Failure
picked up by the ATF lib/libposix/posix1/t_rename test.

(martin)

Pull up following revision(s) (requested by simonb in ticket #1649):

sys/sys/param.h: revision 1.679
sys/conf/param.c: revision 1.69
sys/kern/init_main.c: revision 1.533 (via patch)

Set a better default for MAXFILES on larger RAM machines if not
otherwise specified the kernel config file.  Arbitary numbers are
20,000 files for 16GB RAM or more and 10,000 files for 1GB RAM or
more.

TODO: Adjust this and other values totally dynamically.

(martin)

Ticket #1647

(martin)

Pull up following revision(s) (requested by nonaka in ticket #1647):

sys/dev/hyperv/if_hvn.c: revision 1.20 (via patch)
sys/dev/hyperv/hvkbd.c: revision 1.7 (via patch)
sys/dev/hyperv/vmbus.c: revision 1.12 (via patch)

hvkbd(4): Don't wait forever.
vmbus(4): Don't wait forever.
hvn(4): Don't wait forever.

(martin)

Ticket #1646

(martin)

Pull up following revision(s) (requested by simonb in ticket #1646):

external/bsd/ipf/Makefile.inc: revision 1.6
compat/exec.mk: revision 1.5

Use the compat machinery to build "native" IPF binaries as ipfilter
doesn't use compat32 64-bit alignment/size safe structures.

Fixes IPF on at least mips64.

(martin)

Ticket #1645

(martin)

Pull up following revision(s) (requested by nia in ticket #1645):

sys/ufs/ufs/ufs_quota1.c: revision 1.23

Avoid potentially accessing an array with an index out of range.

(martin)

Ticket #1642

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1642):

sys/arch/hp300/dev/dnkbd.c: revision 1.11
sys/arch/hp300/dev/hil_intio.c: revision 1.4

Fix a longstanding bug in hilkbd (and dnkbd) console attachment.
cn_tab->cn_dev is initialized in wsdisplay_emul_attach()
(but not in wsdiaplay_cnattach()) so it cannot be used
when hil(4) is attached before wsdisplay(4) is attached.

Instead, use exported wsdisplay_cnputc() that is actually
set in early wsdisplay_cnattach().

Now we can use ddb and RB_ASKNAME via HIL keyboard console.

Should be pulleld up to netbsd-8 and netbsd-9.

(martin)

1643

(snj)

Pull up following revision(s) (requested by martin in ticket #1643):

etc/rc.d/ntpdate: revision 1.21

Adjust to "pool" usage in our standard ntp.conf, pointed out
by Connor McLaughlan.

(snj)

Ticket #1641

(martin)

Pull up following revision(s) (requested by maya in ticket #1160):

usr.bin/calendar/calendars/calendar.judaic: revision 1.8-1.10

Update to 2021, hopefully less errors made in this year.

(martin)

Tickets #1639 and #1640

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1640):

sys/dev/scsipi/scsiconf.c: revision 1.283

Add NOLUNS quirk for more SEAGATE SCA/WIDE drives.

Tested on NetBSD/luna68k and LUNA with SCA 80pin -> NARROW 50pin and
WIDE 68pin -> NARROW 50pin connectors.

(martin)

Pull up following revision(s) (requested by tsutsui in ticket #1639):

distrib/miniroot/install.sub: revision 1.54 (patch)
distrib/miniroot/install.sub: revision 1.56 (patch)
distrib/miniroot/install.sub: revision 1.57 (patch)
distrib/miniroot/install.sub: revision 1.58 (patch)
distrib/miniroot/install.sub: revision 1.59 (patch)
distrib/hp300/miniroot/install.md: revision 1.20
distrib/miniroot/list: revision 1.36
distrib/mvme68k/miniroot/install.md: revision 1.9
distrib/mvme68k/miniroot/install.md: revision 1.10
distrib/sun3/miniroot/install.md: revision 1.6
distrib/miniroot/install.sub: revision 1.47 (patch)
distrib/sun3/miniroot/install.md: revision 1.7
distrib/sun2/miniroot/install.md: revision 1.6
distrib/sun2/miniroot/install.md: revision 1.7
distrib/amiga/miniroot/install.md: revision 1.31
distrib/mac68k/miniroot/install.md: revision 1.6
distrib/mac68k/miniroot/install.md: revision 1.7
distrib/mac68k/miniroot/install.md: revision 1.8
distrib/miniroot/upgrade.sh: revision 1.23
distrib/miniroot/install.sh: revision 1.26
distrib/miniroot/upgrade.sh: revision 1.24
distrib/miniroot/install.sh: revision 1.27
distrib/hp300/miniroot/install.md: revision 1.18
distrib/hp300/miniroot/install.md: revision 1.19
distrib/miniroot/install.sub: revision 1.50 (patch)
distrib/miniroot/install.sub: revision 1.51 (patch)
distrib/miniroot/install.sub: revision 1.52 (patch)
distrib/miniroot/install.sub: revision 1.53 (patch)

Remove uses of test ... -a ... and test ... -o ...
eXorcize and `` -> $()
Fix miniroot installation failure on network configuration.  PR/54833
No particular comment in the PR.
Should be pulled up to netbsd-9.
Fix "[: SMALL test, no fallback usage" error on miniroot installation.
Avoid and replace use of '-a', '(' and ')' operatos marked obsolescent
by modern POSIX.1-2017:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16
as suggested by kre@ in PR/54835.
Should be pulled up to netbsd-9.
The idiom
set $whatever
while [ $# - gt 10 ]; do shift 10; done
eval echo \$$#
fails when $# turns out to be 10 (or any multiple), it would need
to be instead
while [ $# -ge 10 ]; do shift 9; done
but there hasn't been a shell that cannot handle ${10} (etc) correctly
in a very long time, so let's just use that instead (properly quoted,
in case IFS happens to contain a digit for some bizarre reason).
We should also "set -f" / "set +f" (or better, restore the prev setting of -f)
around the "set $whatever" part, but if that was ever going to cause a problem
here, it would have already, so leave that for now.
test ! -n "$foo"  is just a quaint way of saying test -z "$foo"
and test ! -z "$foo" is really just test -n "$foo"  so let's just
use the simple (and more obvious) forms.
NFCI.
The kernel and X sets should be specified in MD miniroot scripts.
Otherwise they are not listed at least on ftp installation.
The problem was reported by Martin Trusler on port-hp300@:
https://mail-index.netbsd.org/port-hp300/2020/11/21/msg000174.html
Should be pulled up to netbsd-9 and netbsd-8.
Add modules set for default sets on miniroot installation.
Should be pulled up to netbsd-9 and netbsd-8.
Add missing md_get_partition_range() that causes installation failure.
Also reported by Martin Trusler on testing hp300 miniroot.
Should be pulled up to netbsd-9 and netbsd-8.
Explicitly sort set names fetched via ftp nlist.
Several binary sets are stored as symbolic links on releases and
it seems some ftpd doesn't sort nlist outputs by name in such case.
Worth to pullup to netbsd-9 and netbsd-8.
Use proper release version strings ("9.1" rather than "91") in banners.
Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).
I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.
Worth to pullup to netbsd-9.
Inform the default installation directory in the official ftp server.
Fetch files via ftp using auto-fetching with URL per each binary set.
On slower machines, it takes more than five minutes to get a large
set binary and it could cause timeout of ftp control session, so
getting multiple binary sets in a single ftp session always fails.
Briefly tested on HP 9000/425e with 9.1 tree and ftp.netbsd.org binaries.
No particular comments on tech-install@ and port-hp300@.
Maybe should be pulled up to netbsd-9.

(martin)

Ticket #1638

(martin)

Pull up the following, requested by maya in #1638:

external/bsd/pkg_install/dist/add/perform.c    up to 1.8
external/bsd/pkg_install/dist/lib/lib.h        up to 1.11
external/bsd/pkg_install/dist/lib/parse-config.c up to 1.4
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in up to 1.4
external/bsd/pkg_install/dist/lib/pkgdb.c      up to 1.5
external/bsd/pkg_install/dist/lib/plist.c      up to 1.6
external/bsd/pkg_install/dist/lib/version.h    up to 1.19
doc/3RDPARTY (manually edited)

Merge pkg_install 20201218.

Provide silent backwards compatibility for existing package installs
using /var/db/pkg.

(martin)

Ticket #1637

(martin)

Pull up following revision(s) (requested by skrll in ticket #1637):

sys/dev/usb/ohci.c: revision 1.311
sys/dev/usb/ohci.c: revision 1.312
sys/dev/usb/ohcivar.h: revision 1.62

Restructure the abort code for TD based transfers (ctrl, bulk, intr).

In PR kern/22646 some TDs can be on the done queue when the abort start
and, if this is the case, they need to processed after the WDH interrupt.
Instead of waiting for WDH we release TDs that have been touched by the
HC and replace them with new ones.  Once WDH happens the floating TDs
will be returned to the free list.

Also addresses the issue seen in PR kern/55835

Thanks to both Andreas Gustafsson and Edgar Fu=C3=9F for testing.  Apologi=
es to
Andreas Gustafsson for not committing this to HEAD for 4y6m.w

Remove leading space that crept in in the last change

(martin)

Ticket #1636

(martin)

Pull up following revision(s) (requested by mrg in ticket #1636):

sys/dev/usb/ucom.c: revision 1.128

properly wait for refcounts to drain.
fixes panic at detach that jmnceill saw.

XXX: pullup-[89].

(martin)

Ammend ticket #1626

(martin)

Remove options unknown to all native gcc on this branch.
The version check did not work because on this branch the numbering
scheme wass different (e.g. gcc 5.x is used and HAVE_GCC is 53, which
numerically clearly is > 7 - but that is not what the new check meant).

(martin)

Ticket #1635

(martin)

Pull up following revision(s) (requested by nonaka in ticket #1635):

sys/dev/hyperv/if_hvn.c: revision 1.19 (via patch)

hvn(4): fix unable to ifconfig up/down.

(martin)

Ticket #1626

(martin)

Sync external/bsd/pkg_install with -current, requested by wiz in ticket #1626:

external/bsd/pkg_install/Makefile.inc          up to 1.7
external/bsd/pkg_install/dist/add/perform.c    up to 1.7
external/bsd/pkg_install/dist/admin/check.c    up to 1.4
external/bsd/pkg_install/dist/admin/main.c      up to 1.6
external/bsd/pkg_install/dist/admin/pkg_admin.1 up to 1.6
external/bsd/pkg_install/dist/create/perform.c  up to 1.3
external/bsd/pkg_install/dist/create/pl.c      up to 1.4
external/bsd/pkg_install/dist/info/perform.c    up to 1.3
external/bsd/pkg_install/dist/lib/iterate.c    up to 1.3
external/bsd/pkg_install/dist/lib/lib.h        up to 1.10
external/bsd/pkg_install/dist/lib/license.c    up to 1.10
external/bsd/pkg_install/dist/lib/pkgdb.c      up to 1.4
external/bsd/pkg_install/dist/lib/plist.c      up to 1.4
external/bsd/pkg_install/dist/lib/version.h    up to 1.17
external/bsd/pkg_install/dist/lib/vulnerabilities-file.c up to 1.4
external/bsd/pkg_install/lib/Makefile          up to 1.11
external/bsd/pkg_install/lib/config.h          up to 1.3

Import pkg_info 20201205, move the default pkg database from /var/db/pkg
to ${PREFIX/pkgdb.

(martin)

Tickets #1628 - #1634

(martin)

Apply patch, requested by maya in ticket #1634:

        external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c    (patch)

PR 55640: fix off by one in X Input Method.

(martin)

Pull up following revision(s) (requested by kardel in ticket #1633):

sys/dev/ic/nvme.c: revision 1.53

PR kern/55839:

handle multiple nvme_rescan()s correctly by doing the
name-space identify only once per nsid.
fixes issue where modloading triggers multiple
rescans.

(martin)

Pull up following revision(s) (requested by kardel in ticket #1632):

sys/netinet/ip_mroute.c: revision 1.164 (patch)

PR kern/55779:

restore non-desctructive guarantee of ip_mforward() mbuf
argument. This avoids generation invalid UDP checksums
on multicast packets in ip_output().

XXX the root cause of the misguided fix in 2008 should be
XXX investigated

(martin)

Pull up the following, requested by kre in ticket #1631:

external/public-domain/tz/dist/systemv          delete
external/public-domain/tz/dist/pacificnew      delete
external/public-domain/tz/dist/yearistype.sh    delete
external/public-domain/tz/dist/Makefile        up to 1.1.1.29
external/public-domain/tz/dist/NEWS            up to 1.1.1.32
external/public-domain/tz/dist/README          up to 1.1.1.9
external/public-domain/tz/dist/TZDATA_VERSION  up to 1.22
external/public-domain/tz/dist/africa          up to 1.1.1.23
external/public-domain/tz/dist/antarctica      up to 1.1.1.13
external/public-domain/tz/dist/asia            up to 1.1.1.27
external/public-domain/tz/dist/australasia      up to 1.1.1.20
external/public-domain/tz/dist/backward        up to 1.1.1.11
external/public-domain/tz/dist/backzone        up to 1.1.1.19
external/public-domain/tz/dist/checktab.awk    up to 1.1.1.10
external/public-domain/tz/dist/etcetera        up to 1.1.1.4
external/public-domain/tz/dist/europe          up to 1.1.1.29
external/public-domain/tz/dist/factory          up to 1.1.1.4
external/public-domain/tz/dist/iso3166.tab      up to 1.1.1.6
external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.14
external/public-domain/tz/dist/leapseconds      up to 1.1.1.16
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.11
external/public-domain/tz/dist/northamerica    up to 1.1.1.26
external/public-domain/tz/dist/southamerica    up to 1.1.1.17
external/public-domain/tz/dist/theory.html      up to 1.1.1.11
external/public-domain/tz/dist/version          up to 1.1.1.19
external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.5
external/public-domain/tz/dist/zishrink.awk    up to 1.1.1.7
external/public-domain/tz/dist/zone.tab        up to 1.1.1.18
external/public-domain/tz/dist/zone1970.tab    up to 1.1.1.20
external/public-domain/tz/dist/zoneinfo2tdf.pl  up to 1.1.1.4
distrib/sets/lists/base/mi (apply patch)
doc/3RDPARTY (apply patch)
external/public-domain/tz/share/zoneinfo/Makefile (apply patch)

Update tzdate from 2018i to 2020d

(martin)

Pull up following revision(s) (requested by kre in ticket #1629):

bin/sh/exec.c: revision 1.54

PR bin/55526

Fix a bug that has existed since the "command" command was added in
2003.  "command foo" would cause the definition of a function "foo"
to be lost (not freed, simply discarded) if "foo" is (in addition to
being a function) a filesystem command.  The case where "foo" is
a builtin was handled.

For now, when a function exists with the same name as a filesystem
command, the latter can never appear in the command hash table, and
when used (which can only be via "command foo", just "foo" finds
the function) will always result in a full PATH search.

XXX pullup everything (from NetBSD 2.0 onwards).  (really -8 and -9)

(martin)

Pull up following revision(s) (requested by kre in ticket #1630):

sbin/dump/dump.h: revision 1.59
sbin/dump/main.c: revision 1.78

PR bin/55834

count blocks written in unsigned 64 bit counter
rather than signed int which overflows after 2^31-1
blocks (2TiB) after which neither the 5 minute
status updates or SIGINFO (^T) reports are issued
until the negative numbers increase past 0 and
wildly inaccurate reports would be written.

(martin)

Pull up following revision(s) (requested by mrg in ticket #1628):

external/mit/xorg-server.old/dist/xkb/xkb.c: revision 1.2

merge security fixes for xkb, as found in these xserver gitlab
commits:

270e439739e023463e7e0719a4eede69d45f7a3f - xkb: only swap once in XkbSetMap
446ff2d3177087b8173fa779fa5b77a2a128988b - Check SetMap request length carefully
87c64fc5b0db9f62f4e361444f4b60501ebf67b9 - Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap overflows
de940e06f8733d87bbb857aef85d830053442cfe - xkb: fix key type index check in _XkbSetMapChecks
f7cd1276bbd4fe3a9700096dec33b52b8440788d - Correct bounds checking in XkbSetNames()

i haven't tested these run OK, and it was a 33 out of 34 hunks
did not apply cleanly, but they merge was still largely the
same (patch failed due to whitespace changes mostly), and i am
able to build-test successfully.

(martin)

Ticket #1627

(martin)

Apply patch, requested by mrg in ticket #1627:

external/mit/xorg-server/dist/xkb/xkb.c apply patch

Apply upstream patches for:
* CVE-2020-14360 / ZDI CAN 11572 XkbSetMap Out-Of-Bounds Access
* CVE-2020-25712 / ZDI-CAN-11839 XkbSetDeviceInfo Heap-based Buffer Overflow

(martin)

Ticket #1625

(martin)

Pull up following revision(s) (requested by is in ticket #1625):

lib/libc/net/getaddrinfo.c: revision 1.120
lib/libc/net/gethnamaddr.c: revision 1.93
include/arpa/nameser_compat.h: revision 1.8

Don't complain about additional DNAME records received when resolving A or
AAAA (like already done for SIG/KEY and CNAME).

(martin)

Ticket #1624

(martin)

Pull up following revision(s) (requested by hannken in ticket #1624):

libexec/httpd/bozohttpd.c: revision 1.124

Bozohttpd clobbers files greater than 4GB on 32bit archs.
Make sure the alignment mask derived from pagesize is an off_t.

(martin)

Ticket #1623

(martin)

Pull up following revision(s) (requested by rin in ticket #1623):

sys/dev/pci/if_wm.c: revision 1.696

Fix little-endian dependence in wm_rxeof(), by which packets cannot be
received by 82574 and successors on big-endian machines.

Tested by aarch64eb with I210-T1 on ROCKPro64.

Thanks msaitoh for discussion!
XXX
pullup to netbsd-9 and netbsd-8

(martin)

Ticket #1622

(martin)

Pull up following revision(s) (requested by hannken in ticket #1622):

sys/coda/coda_vnops.c: revision 1.114 (patch)
sys/coda/coda.h: revision 1.21 (patch)

Rewrite coda_readdir() to directly process the container file.

Passing this operation down to the file system holding the container
cannot work for anything but UFS and UFS doesn't allow reading
directory from a plain file since ~2015.

Fixes PR kern/55775 Coda client, its in-kernel part, opens wrong files ...

(martin)

Ticket #1620

(martin)

Pull up following revision(s) (requested by knakahara in ticket #1620):

sys/dev/pci/if_wm.c: revision 1.694
sys/dev/pci/if_wm.c: revision 1.695 (via patch)
sys/dev/pci/if_wmvar.h: revision 1.47

Add WMPHY_I350. Not used yet.

Workaround for ihphy and atphy(ICH*/PCH*, 82580 and I350).
These phys stop DMA while link is down which causes device timeout.
Fix PR/kern 40981
Reviewed and tested by msaitoh@n.o, thanks.
XXX pullup-[89]

(martin)

Ticket #1619

(martin)

Pull up the following, requested by christos in ticket #1619:

external/bsd/tmux/dist/compat/daemon-darwin.c  up to 1.1.1.1
external/bsd/tmux/dist/compat/fdforkpty.c      up to 1.1.1.1
external/bsd/tmux/dist/compat/memmem.c          up to 1.1.1.1
external/bsd/tmux/dist/menu.c                  up to 1.2
external/bsd/tmux/dist/window-tree.c            up to 1.7
external/bsd/tmux/dist/mode-tree.c              up to 1.6
external/bsd/tmux/dist/etc/ylwrap              up to 1.1.1.1
external/bsd/tmux/dist/cmd-resize-window.c      up to 1.2
external/bsd/tmux/dist/regsub.c                up to 1.3
external/bsd/tmux/dist/cmd-parse.y              up to 1.3
external/bsd/tmux/dist/window-buffer.c          up to 1.6
external/bsd/tmux/dist/spawn.c                  up to 1.3
external/bsd/tmux/dist/README.ja                up to 1.1.1.1
external/bsd/tmux/dist/window-client.c          up to 1.6
external/bsd/tmux/dist/file.c                  up to 1.1.1.1
external/bsd/tmux/dist/format-draw.c            up to 1.1.1.3
external/bsd/tmux/dist/cmd-display-menu.c      up to 1.1.1.1
external/bsd/tmux/dist/compat/fparseln.c        delete
external/bsd/tmux/dist/FAQ                      delete
external/bsd/tmux/dist/TODO                    delete
external/bsd/tmux/dist/cmd-choose-buffer.c      delete
external/bsd/tmux/dist/cmd-choose-client.c      delete
external/bsd/tmux/dist/cmd-list.c              delete
external/bsd/tmux/dist/cmd-set-hook.c          delete
external/bsd/tmux/dist/cmd-string.c            delete
external/bsd/tmux/dist/hooks.c                  delete
external/bsd/tmux/dist/pty.c                    delete
external/bsd/tmux/dist/signal.c                delete
external/bsd/tmux/dist/window-choose.c          delete
external/bsd/tmux/dist/CHANGES                  up to 1.1.1.6
external/bsd/tmux/dist/COPYING                  up to 1.1.1.2
external/bsd/tmux/dist/Makefile.am              up to 1.1.1.6
external/bsd/tmux/dist/Makefile.in              up to 1.1.1.6
external/bsd/tmux/dist/README                  up to 1.1.1.4
external/bsd/tmux/dist/aclocal.m4              up to 1.1.1.4
external/bsd/tmux/dist/alerts.c                up to 1.1.1.5
external/bsd/tmux/dist/arguments.c              up to 1.1.1.9
external/bsd/tmux/dist/attributes.c            up to 1.1.1.9
external/bsd/tmux/dist/cfg.c                    up to 1.1.1.12
external/bsd/tmux/dist/client.c                up to 1.10
external/bsd/tmux/dist/cmd-attach-session.c    up to 1.8
external/bsd/tmux/dist/cmd-bind-key.c          up to 1.1.1.9
external/bsd/tmux/dist/cmd-break-pane.c        up to 1.1.1.11
external/bsd/tmux/dist/cmd-capture-pane.c      up to 1.8
external/bsd/tmux/dist/cmd-choose-tree.c        up to 1.1.1.9
external/bsd/tmux/dist/cmd-command-prompt.c    up to 1.1.1.10
external/bsd/tmux/dist/cmd-confirm-before.c    up to 1.1.1.9
external/bsd/tmux/dist/cmd-copy-mode.c          up to 1.1.1.11
external/bsd/tmux/dist/cmd-detach-client.c      up to 1.1.1.8
external/bsd/tmux/dist/cmd-display-message.c    up to 1.10
external/bsd/tmux/dist/cmd-display-panes.c      up to 1.1.1.11
external/bsd/tmux/dist/cmd-find-window.c        up to 1.1.1.10
external/bsd/tmux/dist/cmd-find.c              up to 1.1.1.7
external/bsd/tmux/dist/cmd-if-shell.c          up to 1.10
external/bsd/tmux/dist/cmd-join-pane.c          up to 1.1.1.10
external/bsd/tmux/dist/cmd-kill-pane.c          up to 1.1.1.10
external/bsd/tmux/dist/cmd-kill-session.c      up to 1.1.1.9
external/bsd/tmux/dist/cmd-kill-window.c        up to 1.1.1.8
external/bsd/tmux/dist/cmd-list-buffers.c      up to 1.1.1.8
external/bsd/tmux/dist/cmd-list-clients.c      up to 1.1.1.8
external/bsd/tmux/dist/cmd-list-keys.c          up to 1.1.1.11
external/bsd/tmux/dist/cmd-list-panes.c        up to 1.1.1.8
external/bsd/tmux/dist/cmd-list-sessions.c      up to 1.1.1.9
external/bsd/tmux/dist/cmd-list-windows.c      up to 1.1.1.8
external/bsd/tmux/dist/cmd-load-buffer.c        up to 1.9
external/bsd/tmux/dist/cmd-lock-server.c        up to 1.1.1.8
external/bsd/tmux/dist/cmd-move-window.c        up to 1.1.1.8
external/bsd/tmux/dist/cmd-new-session.c        up to 1.8
external/bsd/tmux/dist/cmd-new-window.c        up to 1.8
external/bsd/tmux/dist/cmd-paste-buffer.c      up to 1.8
external/bsd/tmux/dist/cmd-pipe-pane.c          up to 1.1.1.10
external/bsd/tmux/dist/cmd-queue.c              up to 1.6
external/bsd/tmux/dist/cmd-refresh-client.c    up to 1.1.1.11
external/bsd/tmux/dist/cmd-rename-session.c    up to 1.1.1.9
external/bsd/tmux/dist/cmd-rename-window.c      up to 1.1.1.9
external/bsd/tmux/dist/cmd-resize-pane.c        up to 1.1.1.12
external/bsd/tmux/dist/cmd-respawn-pane.c      up to 1.1.1.9
external/bsd/tmux/dist/cmd-respawn-window.c    up to 1.1.1.11
external/bsd/tmux/dist/cmd-rotate-window.c      up to 1.1.1.10
external/bsd/tmux/dist/cmd-run-shell.c          up to 1.1.1.11
external/bsd/tmux/dist/cmd-save-buffer.c        up to 1.1.1.11
external/bsd/tmux/dist/cmd-select-layout.c      up to 1.1.1.10
external/bsd/tmux/dist/cmd-select-pane.c        up to 1.1.1.12
external/bsd/tmux/dist/cmd-select-window.c      up to 1.1.1.9
external/bsd/tmux/dist/cmd-send-keys.c          up to 1.10
external/bsd/tmux/dist/cmd-set-environment.c    up to 1.1.1.8
external/bsd/tmux/dist/cmd-set-option.c        up to 1.1.1.11
external/bsd/tmux/dist/cmd-show-environment.c  up to 1.1.1.8
external/bsd/tmux/dist/cmd-show-messages.c      up to 1.7
external/bsd/tmux/dist/cmd-show-options.c      up to 1.3
external/bsd/tmux/dist/cmd-source-file.c        up to 1.1.1.10
external/bsd/tmux/dist/cmd-split-window.c      up to 1.9
external/bsd/tmux/dist/cmd-swap-pane.c          up to 1.1.1.11
external/bsd/tmux/dist/cmd-swap-window.c        up to 1.1.1.9
external/bsd/tmux/dist/cmd-switch-client.c      up to 1.1.1.11
external/bsd/tmux/dist/cmd-wait-for.c          up to 1.7
external/bsd/tmux/dist/cmd.c                    up to 1.1.1.12
external/bsd/tmux/dist/colour.c                up to 1.9
external/bsd/tmux/dist/compat.h                up to 1.2
external/bsd/tmux/dist/configure                up to 1.1.1.6
external/bsd/tmux/dist/configure.ac            up to 1.1.1.6
external/bsd/tmux/dist/control-notify.c        up to 1.1.1.8
external/bsd/tmux/dist/control.c                up to 1.1.1.7
external/bsd/tmux/dist/environ.c                up to 1.10
external/bsd/tmux/dist/example_tmux.conf        up to 1.1.1.4
external/bsd/tmux/dist/format.c                up to 1.11
external/bsd/tmux/dist/grid-view.c              up to 1.1.1.9
external/bsd/tmux/dist/grid.c                  up to 1.10
external/bsd/tmux/dist/input-keys.c            up to 1.10
external/bsd/tmux/dist/input.c                  up to 1.14
external/bsd/tmux/dist/job.c                    up to 1.11
external/bsd/tmux/dist/key-bindings.c          up to 1.9
external/bsd/tmux/dist/key-string.c            up to 1.1.1.12
external/bsd/tmux/dist/layout-custom.c          up to 1.1.1.10
external/bsd/tmux/dist/layout-set.c            up to 1.1.1.12
external/bsd/tmux/dist/layout.c                up to 1.1.1.10
external/bsd/tmux/dist/log.c                    up to 1.14
external/bsd/tmux/dist/mdoc2man.awk            up to 1.1.1.3
external/bsd/tmux/dist/names.c                  up to 1.1.1.8
external/bsd/tmux/dist/notify.c                up to 1.6
external/bsd/tmux/dist/options-table.c          up to 1.1.1.11
external/bsd/tmux/dist/options.c                up to 1.11
external/bsd/tmux/dist/osdep-darwin.c          up to 1.1.1.9
external/bsd/tmux/dist/osdep-freebsd.c          up to 1.1.1.8
external/bsd/tmux/dist/osdep-linux.c            up to 1.1.1.7
external/bsd/tmux/dist/osdep-netbsd.c          up to 1.1.1.9
external/bsd/tmux/dist/paste.c                  up to 1.5
external/bsd/tmux/dist/proc.c                  up to 1.5
external/bsd/tmux/dist/resize.c                up to 1.2
external/bsd/tmux/dist/screen-redraw.c          up to 1.1.1.11
external/bsd/tmux/dist/screen-write.c          up to 1.12
external/bsd/tmux/dist/screen.c                up to 1.11
external/bsd/tmux/dist/server-client.c          up to 1.8
external/bsd/tmux/dist/server-fn.c              up to 1.12
external/bsd/tmux/dist/server.c                up to 1.1.1.11
external/bsd/tmux/dist/session.c                up to 1.12
external/bsd/tmux/dist/status.c                up to 1.10
external/bsd/tmux/dist/style.c                  up to 1.4
external/bsd/tmux/dist/tmux.1                  up to 1.13
external/bsd/tmux/dist/tmux.c                  up to 1.11
external/bsd/tmux/dist/tmux.h                  up to 1.16
external/bsd/tmux/dist/tty-acs.c                up to 1.9
external/bsd/tmux/dist/tty-keys.c              up to 1.14
external/bsd/tmux/dist/tty-term.c              up to 1.13
external/bsd/tmux/dist/tty.c                    up to 1.7
external/bsd/tmux/dist/utf8.c                  up to 1.7
external/bsd/tmux/dist/window-clock.c          up to 1.1.1.9
external/bsd/tmux/dist/window-copy.c            up to 1.12
external/bsd/tmux/dist/window.c                up to 1.13
external/bsd/tmux/dist/xmalloc.c                up to 1.1.1.9
external/bsd/tmux/dist/xmalloc.h                up to 1.5
external/bsd/tmux/dist/xterm-keys.c            up to 1.1.1.8
external/bsd/tmux/dist/compat/getdtablecount.c  up to 1.1.1.2
external/bsd/tmux/dist/compat/imsg-buffer.c    up to 1.9
external/bsd/tmux/dist/compat/imsg.c            up to 1.9
external/bsd/tmux/dist/etc/compile              up to 1.1.1.2
external/bsd/tmux/dist/etc/config.guess        up to 1.1.1.3
external/bsd/tmux/dist/etc/config.sub          up to 1.1.1.3
external/bsd/tmux/dist/etc/depcomp              up to 1.1.1.2
external/bsd/tmux/dist/etc/install-sh          up to 1.1.1.3
external/bsd/tmux/dist/etc/missing              up to 1.1.1.2
external/bsd/tmux/usr.bin/tmux/Makefile        up to 1.25
doc/3RDPARTY (manually modified)

Update tmux to 3.1c

(martin)

Ticket #1618

(martin)

Apply patch, requested by maya and mrg in ticket #1618:

xsrc/external/mit/freetype/dist/src/sfnt/pngshim.c (apply patch)

Fix for CVE-2020-15999.

(martin)

Ammend ticket #1603

(martin)

Pull up the following revision, requested by kim in ticket #1603
and accidently lost during initial commit:

etc/defaults/rc.conf: revision 1.159

Add optional release info in /etc/motd.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #1617):

sys/dev/pci/if_wm.c: revision 1.691

  Fixes a problem that the attach function reported
"wm_gmii_setup_phytype: Unknown PHY model. OUI=000000, model=0000" and
"PHY type is still unknown." Don't call wm_gmii_setup_phytype() three times if
the interface uses SGMII with internal MDIO.

  Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)).

(martin)

Ticket #1616

(martin)

Pull up following revision(s) (requested by kim in ticket #1616):

external/bsd/ntp/bin/ntpq/ntpq.8: file removal
external/bsd/ntp/bin/Makefile.inc: revision 1.4
external/bsd/ntp/bin/ntpd/ntpd.8: file removal
external/bsd/ntp/bin/ntpq/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntpd/Makefile: revision 1.28 (patch)
external/bsd/ntp/bin/sntp/sntp.1: file removal
external/bsd/ntp/bin/ntpd/ntp.keys.5: file removal
external/bsd/ntp/bin/ntpd/ntp.conf.5: file removal
external/bsd/ntp/Makefile.inc: revision 1.20
external/bsd/ntp/Makefile.inc: revision 1.21
external/bsd/ntp/bin/sntp/Makefile: revision 1.8
external/bsd/ntp/bin/ntp-keygen/Makefile: revision 1.7 (patch)
external/bsd/ntp/bin/sntp/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8: file removal
external/bsd/ntp/bin/ntpdc/ntpdc.8: file removal
external/bsd/ntp/bin/ntpdc/Makefile: revision 1.7 (patch)

Fix build; clean manpages only if they are generated automatically.
include bsd.own.mk so that ../../Makefile.inc does not do it...

Add rules for manual pages builds, remove including Makefile.inc

Use .PARSEDIR

PR/55710: Kimmo Suominen: Delete manual pages so that they get copy from the
imported, already generated ones.

(martin)

Ticket #1615

(martin)

Pull up following revision(s) (requested by kim in ticket #1615):

external/bsd/ntp/dist/libntp/work_fork.c: revision 1.15

Wait for the asynchronous dns resolver child to be done (and close the
socket descriptors) before returning. Otherwise we might get bind errors.

Reported by kim@, fixed by mlelstv@.

(martin)

Ticket #1614

(martin)

Pull up following revision(s) (requested by nia in ticket #1614):

sys/compat/common/tty_43.c: revision 1.38

tty_43: Check a bitset from userspace is valid before shifting it

Passing a negative value to these legacy compat ioctls results in
left shift on a negative value which is undefined behaviour and results
in the tty (at least, possibly other things) locking up.
The argument to the ioctl should always be > 0. Return EINVAL otherwise.

While here, adjustments to code style to match current guidelines.
Found by UBSan.

(martin)

Tickets #1611 - #1613

(martin)

Pull up following revision(s) (requested by roy in ticket #1613):

sys/netinet/in.c: revision 1.241
sys/netinet6/in6.c: revision 1.282

inet: Treat LINK_STATE_UNKNOWN as LINK_STATE_UP when changing

It's something we have always done.
it's really rare for anything to transition to UNKNOWN from either
UP or DOWN, but technically it is possible.

(martin)

Pull up following revision(s) (requested by knakahara in ticket #1612):

sys/netipsec/xform_esp.c: revision 1.101

Make sequence number of esp header MP-safe for IPsec Tx side. reviewed by ozaki-r@n.o

In IPsec Tx side, one Security Association can be used by multiple CPUs.
On the other hand, in IPsec Rx side, one Security Association is used
by only one CPU.

XXX pullup-{8,9}

(martin)

Pull up following revision(s) (requested by kim in ticket #1611):

etc/ntp.conf: revision 1.21
etc/ntp.conf: revision 1.22

Use "pool" for the pool.ntp.org servers. Add some new hints.
- Use the "pool" keyword for obtaining servers from ntp.pool.org.
  - Add "tos minclock" and "tos maxclock" to limit the number of servers.
  - Add "restrict source" to apply appropriate restrictions to servers.
    (Specifically "nopeer" cannot be applied to "pool" servers.)
  - A single "pool" entry suffices -- using "2.netbsd.pool.ntp.org" so
    that we get both IPv4 and IPv6 addresses. (No addresses are returned
    for just "netbsd.pool.ntp.org.")
- Add a comment about "tinker panic 0" -- useful for VMs and laptops.
- Add a comment about "discard minimum" -- useful for some SNTP clients.
- Add an explanation for the "limited" restriction keyword.
- Unify whitespace and comment formatting.

Add iburst to peer and server.

(martin)

Ticket #1610

(martin)

Pull up following revision(s) (requested by kardel in ticket #1610):

sys/dev/ic/ld_nvme.c: revision 1.24 (patch)
sys/dev/ic/nvme.c: revision 1.50 (patch)

PR kern/55674:
move name space availability check from ld_nvme.c:ld_nvme_attach()
to nvme.c:nvme_rescan().
this avoids allocation of ld(4) instances for every possible
name space, even if it is not usable. it also reduces the device
node flood generated from that strategy.

(martin)

Ticket #1609

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #1609):

sys/dev/pci/virtio_pci.c: revision 1.13 (patch)
(applied to sys/dev/pci/virtio.c)

Ensure MSI-X is disabled if allocation of MSI-X interrupts fail.

The virtio device config space moves out from under us when MSI-X
remains enabled, and/or INTx interrupts are masked if we don't ensure
this.

This un-breaks virtio devices that run out of MSI-X interrupts.
Particularly a problem on uniproc x86, where there are only 8 or 9
vectors available, allowing for only about 4 virtio devices to use
MSI-X.

(martin)

Ticket #1608

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #1608):

sys/dev/pci/virtio_pci.c: revision 1.12

Ensure interrupt handles buffer is zeroed on allocation
Prevents crashes trying to deallocate interrupts at shutdown.

Found by kim and mlelstv, confirmed by me

(martin)

Ticket #1606

(martin)

Pull up following revision(s) (requested by nonaka in ticket #1606):

sys/dev/hid/hidkbdmap.c: revision 1.11 (patch)
(applied to sys/dev/usb/ukbdmap.c)

for jp keymap map also scan code 49 to right bracket to handle ARCHISS model
PR kern/55608 by Shinichi Doyashiki

(martin)

Ticket #1605

(martin)

Pull up following revision(s) (requested by mlelstv in ticket #1605):

sys/dev/ic/mpt_netbsd.c: revision 1.37

max_devices is a 8bit value and zero is interpreted as 256. This value
can be reported by an mpt device emulated by VMware ESXi.

(martin)

Tickets #1603 and #1604

(martin)

Pull up following revision(s) (requested by kardel in ticket #1604):

sys/netinet/tcp_input.c: revision 1.420

PR/kern 55567
fix the data-only fast path. RCV.UP and SND.WL1 could be left behind
on long sequences of data only packets. pull them along to avoid relative
sequence wraps.
consistent with FreeBSD

addresses second failure mode of PR/kern 55567.
pullup to netbsd-8
pullup to netbsd-9

(martin)

Pull up following revision(s) (requested by kim in ticket #1603):

etc/rc.d/motd: revision 1.10
etc/rc.d/motd: revision 1.11
share/man/man5/rc.conf.5: revision 1.186
share/man/man5/rc.conf.5: revision 1.187
etc/defaults/rc.conf: revision 1.159

Add optional release info in /etc/motd

My personal preferencese for /etc/rc.conf:

    update_motd_release=YES
    motd_release_tag='Binaries: '

This provides an explanation to users about the second version in motd.

Document update_motd_release and motd_release_tag

New sentence, new line.

Make a ": " suffix a fixed part of the release info tag

This results in correct updates to /etc/motd even when the value of
motd_release_tag is changed (a likely event).

Add safe quoting to outputting the read kernel version.

Thanks to kre@ for the feedback.

(martin)

Ticket #1602

(martin)

Pull up following revision(s) (requested by kardel in ticket #1602):

sys/netinet/tcp_input.c: revision 1.419

Fix fast path for uni directional transfers

pure ACK case:
drag snd_wl2 along so only newer
ACKs can update the window size.

also avoids the state where snd_wl2
is eventually larger than th_ack and thus
blocking the window update mechanism and
the connection gets stuck for a loooong
time in the zero sized send window state.

see PR/kern 55567

ok thorpej@, also found in FreeBSD

(martin)

Tickets #1600 and #1601

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #1601):

sys/dev/pci/ixgbe/ixgbe_82598.c: revision 1.13
sys/dev/pci/ixgbe/ixgbe.c: revision 1.219
sys/dev/pci/ixgbe/ixgbe_phy.c: revision 1.20
sys/dev/pci/ixgbe/ixgbe_x550.c: revision 1.17
sys/dev/pci/ixgbe/ixgbe_82599.c: revision 1.22
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.44

Add recovery code for unsupported SFP+.

Before this commit:
  If an unsupported SFP module is inserted before booting, the driver attach
  failed and there was no way to recover form it without rebooting or
  detaching/reattaching driver (drvctl -d && drvctl -r pciN).

After this commit:
  We can automatically recover any time by replacing it with a supported
  module.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #1600):

sys/dev/pci/ixgbe/if_bypass.c: revision 1.6
sys/dev/pci/ixgbe/ixgbe_common.c: revision 1.28
sys/dev/pci/ixgbe/ixgbe.c: revision 1.246

Fix checking return value of atomic_cas_uint().

This change fixes a bug that extra delay() is called only once even if
atomic_cas_uint() isn't failed or delay() isn't called when atomic_cas_uint()
failed.

The reason of this bug was that I simply converted FreeBSD' atomic_cmpset_int()
to atomic_cas_uint(). The return value's semantics is different.

-

Minor change.
  - Print "X550EM X" instead of "X550EM" for Xeon D devices.
  - Fix typo in comment. Same as FreeBSD.

(martin)

Ticket #1599

(martin)

Pull up following revision(s) (requested by riastradh in ticket #1599):

sys/dev/usb/if_atu.c: revision 1.73
sys/dev/usb/if_axe.c: apply patch
sys/dev/usb/if_axen.c: apply patch

atu(4): Reject packets larger than MCLBYTES.

(martin)

Ticket #1598

(martin)

Pull up following revision(s) (requested by chs in ticket #1598):

sys/uvm/uvm_amap.c: revision 1.123 (via patch)

fix amap_extend() to handle amaps where we previously failed to allocate
the ppref memory.

(martin)

Ticket #1597

(martin)

Pull up following revision(s) (requested by nonaka in ticket #1597):

sys/dev/ipmi.c: revision 1.5
(applied to sys/arch/x86/x86/ipmi.c)

ipmi(4): Fixed a bug that incorrect condition is notified.

When the value obtained from the sensor is below the lower limit of
the critical threshold, it is notified that the value is below the lower
limit of the warning threshold.

(martin)