HardenedBSD/src 463332csys/amd64/include md_var.h, sys/amd64/vmm vmm_host.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+3-3tools/tools/nanobsd/defaults.sh
+2-0sys/amd64/vmm/vmm_host.h
+1-0sys/amd64/include/md_var.h
+6-33 files

HardenedBSD/src 89127a0sys/amd64/include md_var.h, sys/amd64/vmm vmm_host.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3-3tools/tools/nanobsd/defaults.sh
+2-0sys/amd64/vmm/vmm_host.h
+1-0sys/amd64/include/md_var.h
+6-33 files

HardenedBSD/ports c40e944astro/calceph Makefile, mail/msmtp Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+152-0net/gorss/files/modules.txt
+47-49net/gorss/distinfo
+22-23net/gorss/Makefile.deps
+11-15mail/msmtp/Makefile
+21-0astro/calceph/Makefile
+16-0net-mgmt/nagios-plugins/files/patch-plugins-root_check_icmp.c
+269-879 files not shown
+311-9915 files

HardenedBSD/ports 635cd36net-mgmt/nagios-plugins Makefile, net-mgmt/nagios-plugins/files patch-plugins-root_check_icmp.c

net-mgmt/nagios-plugins: fix TTL on outgoing packets for IPv6
DeltaFile
+16-0net-mgmt/nagios-plugins/files/patch-plugins-root_check_icmp.c
+1-0net-mgmt/nagios-plugins/Makefile
+17-02 files

HardenedBSD/ports bd4b3cdnet/gorss distinfo Makefile.deps, net/gorss/files modules.txt

net/gorss: update the port to version 0.5

- Convert PLIST_FILES into a static `pkg-plist'
  which is 10 lines long after adding new themes
- Cache generated `files/modules.txt' for Golang
  1.23+ as explained in the commit 024490a280d1
DeltaFile
+152-0net/gorss/files/modules.txt
+47-49net/gorss/distinfo
+22-23net/gorss/Makefile.deps
+4-8net/gorss/Makefile
+10-0net/gorss/pkg-plist
+235-805 files

HardenedBSD/ports efed9adx11/wvkbd distinfo Makefile

x11/wvkbd: update to 0.19.2

Changes:        https://git.sr.ht/~proycon/wvkbd/log/v0.19.2
Reported by:    GitHub (watch releases)
DeltaFile
+3-3x11/wvkbd/distinfo
+1-1x11/wvkbd/Makefile
+4-42 files

HardenedBSD/ports 61d57c2mail/msmtp Makefile

mail/msmtp: remove ca_root_nss dep

msmtp 1.8.2[0] onwards selects the system trust store by
default when TLS is enabled, so ca_root_nss is no longer
necessary.

Other minor changes:
* PORTVERSION -> DISTVERSION
* enable test suite
* simplify Makefile style

[0] https://marlam.de/msmtp/news/msmtp-1-8-2/

Reviewed by:            novel
Approved by:            lwhsu (mentor)
Signed-off-by:          Siva Mahadevan <siva at FreeBSD.org>
Sponsored by:           The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54720
DeltaFile
+11-15mail/msmtp/Makefile
+11-151 files

HardenedBSD/src cd730betools/tools/nanobsd defaults.sh

nanobsd: Use mtree -C to produce the metalog

Prefer an mtree -C output, which is guaranteed to be mtree-compatible.
Add "gname", "uname", and "tags" to the default keyword set, while
removing "size" and "time", the latter being set on kernel file entries
and taking precedence over makefs -T (when paired with -F).

As a side effect, this produces a cleaner file with sorted keywords.

Note that passing "-u" to sort in order to pipe to mtree is no longer
necessary, but we'll do it out of habit.

Reviewed by:    imp
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54854
DeltaFile
+3-3tools/tools/nanobsd/defaults.sh
+3-31 files

HardenedBSD/ports 958febaastro Makefile, astro/calceph Makefile pkg-plist

astro/calceph: New port

CALCEPH Library is designed to access the binary planetary ephemeris
files, such INPOPxx and JPL DExxx ephemeris files, (called 'original
JPL binary' or 'INPOP 2.0 or 3.0 binary' ephemeris files in the next
sections) and the SPICE kernel files (called 'SPICE' ephemeris files
in the next sections).
DeltaFile
+21-0astro/calceph/Makefile
+14-0astro/calceph/pkg-plist
+5-0astro/calceph/pkg-descr
+3-0astro/calceph/distinfo
+1-0astro/Makefile
+44-05 files

HardenedBSD/src 202e310sys/amd64/include md_var.h, sys/amd64/vmm vmm_host.h

amd64: Fix sys/pcpu.h usage in vmm_host.h and md_var.h

Include sys/pcpu in vmm_host.h as its structs and functions are used
there, and add a forward declaration of struct pcpu to md_var.h as it
is used in some function prototypes.

Reviewed by:    corvink, markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D51550
DeltaFile
+2-0sys/amd64/vmm/vmm_host.h
+1-0sys/amd64/include/md_var.h
+3-02 files

HardenedBSD/src 52e58desys/netinet6 nd6.c in6_var.h, usr.bin/mkimg mkimg.1

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+85-89sys/netinet6/nd6.c
+51-20sys/netinet6/in6_var.h
+24-33sys/netinet6/nd6.h
+30-26sys/netinet6/nd6_rtr.c
+34-20usr.bin/mkimg/mkimg.1
+13-41sys/netinet6/mld6.c
+237-22919 files not shown
+332-34825 files

HardenedBSD/src 426507csys/netinet6 nd6.c in6_var.h, usr.bin/mkimg mkimg.1

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+85-89sys/netinet6/nd6.c
+51-20sys/netinet6/in6_var.h
+24-33sys/netinet6/nd6.h
+30-26sys/netinet6/nd6_rtr.c
+13-41sys/netinet6/mld6.c
+34-20usr.bin/mkimg/mkimg.1
+237-22919 files not shown
+332-34825 files

HardenedBSD/src 36848d7share/man/man7 tuning.7, sys/fs/nfsserver nfs_nfsdsubs.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+65-43sys/vm/vm_object.c
+59-37sys/vm/vm_map.c
+46-18sys/vm/swap_pager.c
+38-0sys/fs/nfsserver/nfs_nfsdsubs.c
+15-0share/man/man7/tuning.7
+8-4sys/vm/vm_object.h
+231-1026 files not shown
+248-11512 files

HardenedBSD/ports 404ec50cad/netgen pkg-plist Makefile, graphics/mesa-devel/files patch-amdgpu_log

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+57-1x11/xscreensaver/pkg-plist
+19-16x11/xscreensaver/Makefile
+27-4cad/netgen/pkg-plist
+21-0x11/xscreensaver/files/patch-hacks_glx_xshadertoy-compile.pl
+5-11cad/netgen/Makefile
+13-0graphics/mesa-devel/files/patch-amdgpu_log
+142-329 files not shown
+170-5515 files

HardenedBSD/src 6fd7e55sys/fs/nfsserver nfs_nfsdsubs.c nfs_nfsdport.c

nfsd: Fix handling of hidden/system during Open/Create

When an NFSv4.n client specifies settings for the archive,
hidden and/or system attributes during a Open/Create, the
Open/Create fails for ZFS.  This is caused by ZFS doing
a secpolicy_xvattr() call, which fails for non-root.
If this check is bypassed, ZFS panics.

This patch resolves the problem by disabling va_flags
for the VOP_CREATE() call in the NFSv4.n server and
then setting the flags with a subsequent VOP_SETATTR().

This problem only affects FreeBSD-15 and main, since the
archive, system and hidden attributes are not enabled
for FreeBSD-14.

I think a similar problem exists for the NFSv4.n
Open/Create/Exclusive_41, but that will be resolved
in a future commit.

    [8 lines not shown]
DeltaFile
+38-0sys/fs/nfsserver/nfs_nfsdsubs.c
+11-0sys/fs/nfsserver/nfs_nfsdport.c
+49-02 files

HardenedBSD/ports fd51f59security/netbird distinfo Makefile

security/netbird: Update 0.64.0 => 0.64.1

Changelogs:
https://github.com/netbirdio/netbird/releases/tag/v0.64.1

Commit log:
https://github.com/netbirdio/netbird/compare/v0.64.0...v0.64.1

PR:     292685
DeltaFile
+5-5security/netbird/distinfo
+1-1security/netbird/Makefile
+6-62 files

HardenedBSD/src 2a27aefsys/vm swap_pager.c

swap_pager_getpages(): some pages from ma[] might be bogus

(cherry picked from commit d198ad51ea73bbb162336923a387f52b0b1c1f1d)
DeltaFile
+29-8sys/vm/swap_pager.c
+29-81 files

HardenedBSD/src a4123acsys/dev/md md.c, sys/vm vm_object.c vm_map.c

vm_object: remove the charge member

(cherry picked from commit d160447129fe060b28bcd6ba429d17afdf494ff2)
DeltaFile
+27-19sys/vm/vm_object.c
+22-23sys/vm/vm_map.c
+2-6sys/vm/swap_pager.c
+2-3sys/vm/vm_fault.c
+1-3sys/vm/vm_object.h
+0-2sys/dev/md/md.c
+54-561 files not shown
+54-587 files

HardenedBSD/src b3e6c8eshare/man/man7 tuning.7

tuning.7: wording fixes

(cherry picked from commit 6f41575a94b310614f5ffcee215aee48ced4ad2d)
DeltaFile
+2-2share/man/man7/tuning.7
+2-21 files

HardenedBSD/src 10af3b3share/man/man7 tuning.7

tuning.7: add more explanation about swap (over-)accounting

(cherry picked from commit 457b940bfb6a228af1281f357b627ecf1e26fea5)
DeltaFile
+15-0share/man/man7/tuning.7
+15-01 files

HardenedBSD/src 95eec98sys/vm swap_pager.c

vm/swap_pager.c: silence compiler warning

(cherry picked from commit 325baf00735756d024b903bfcee50b4f09e90129)
DeltaFile
+1-1sys/vm/swap_pager.c
+1-11 files

HardenedBSD/src a6cc48esys/kern kern_sendfile.c

sendfile: remove calculation of unused bsize

(cherry picked from commit 3fe275c1ef45d452d1adc537b7ec1ca6444739ba)
DeltaFile
+3-6sys/kern/kern_sendfile.c
+3-61 files

HardenedBSD/src 7768be6share/man/man7 tuning.7

tuning.7: use the correct word for collapsing

(cherry picked from commit 8cd687a726a8b6cc29f573cba7d6c7ecb683a954)
DeltaFile
+1-1share/man/man7/tuning.7
+1-11 files

HardenedBSD/src 9dbc47dsys/vm vm_map.c

vm_map_entry_delete(): fix the calculation of swap release

(cherry picked from commit acb71820d68bd0dd98964240727e251bc62c92de)
DeltaFile
+1-1sys/vm/vm_map.c
+1-11 files

HardenedBSD/src 0ab96c9sys/vm swap_pager.c vm_map.c

rfork(2): fix swap accounting in vmspace_unshare()

(cherry picked from commit de770681234d001a1f4cdb8121179331dc3a2def)
DeltaFile
+8-2sys/vm/swap_pager.c
+7-0sys/vm/vm_map.c
+1-0sys/vm/vm.h
+16-23 files

HardenedBSD/src 1f6db7dsys/vm swap_pager.c

swap_release_by_cred*(): give some additional info on panics due to underflow

(cherry picked from commit 7361727d4584b5e303183c836497ae2754ce0e53)
DeltaFile
+4-2sys/vm/swap_pager.c
+4-21 files

HardenedBSD/src 102400esys/vm swap_pager.c

swap_pager_getpages(): assert that bp->b_pages[] is accessed in bounds

(cherry picked from commit b02ddb59e64620733a6cbc48fb1d0583a62fef78)
DeltaFile
+3-0sys/vm/swap_pager.c
+3-01 files

HardenedBSD/src 2499392sys/vm vm_map.c vm_object.c

vm_object_coalesce(): return swap reservation back if overcharged

(cherry picked from commit 7685aaea8850f5b6995a17740a016019e0956c70)
DeltaFile
+30-14sys/vm/vm_map.c
+31-10sys/vm/vm_object.c
+7-1sys/vm/vm_object.h
+68-253 files

HardenedBSD/src 99fab30sys/vm vm_object.c

vm_object_coalesce(): simplify common expression

(cherry picked from commit e7053d9a126a60b3c0b1348b6c5131b5f2025894)
DeltaFile
+7-6sys/vm/vm_object.c
+7-61 files

HardenedBSD/src 1e1727asys/vm vm_object.c

vm_object_coalesce(): do not account holes twice

(cherry picked from commit 353ba3bf08fdef69b77e3e565435e50784a51412)
DeltaFile
+7-4sys/vm/vm_object.c
+7-41 files