HardenedBSD/src 9579ad0contrib/tcpdump tcpdump.c print-icmp6.c, contrib/tcpdump/missing snprintf.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-508contrib/tcpdump/missing/snprintf.c
+311-47contrib/tcpdump/tcpdump.c
+84-103contrib/tcpdump/print-icmp6.c
+79-105contrib/tcpdump/print-egp.c
+110-56contrib/tcpdump/CMakeLists.txt
+54-84contrib/tcpdump/print-mobility.c
+638-90363 files not shown
+1,581-1,65869 files

HardenedBSD/src 3ca155dcontrib/tcpdump tcpdump.c print-icmp6.c, contrib/tcpdump/missing snprintf.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-508contrib/tcpdump/missing/snprintf.c
+311-47contrib/tcpdump/tcpdump.c
+84-103contrib/tcpdump/print-icmp6.c
+79-105contrib/tcpdump/print-egp.c
+110-56contrib/tcpdump/CMakeLists.txt
+54-84contrib/tcpdump/print-mobility.c
+638-90363 files not shown
+1,581-1,65869 files

HardenedBSD/src e608379contrib/tcpdump tcpdump.c print-icmp6.c, contrib/tcpdump/missing snprintf.c

tcpdump: Update to 4.99.6

Changes:        https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES
Obtained from:  https://www.tcpdump.org/release/tcpdump-4.99.6.tar.xz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55578
Differential Revision:  https://reviews.freebsd.org/D55871
DeltaFile
+0-508contrib/tcpdump/missing/snprintf.c
+311-47contrib/tcpdump/tcpdump.c
+84-103contrib/tcpdump/print-icmp6.c
+79-105contrib/tcpdump/print-egp.c
+110-56contrib/tcpdump/CMakeLists.txt
+54-84contrib/tcpdump/print-mobility.c
+638-90363 files not shown
+1,581-1,65869 files

HardenedBSD/src 8802fa8sys/dev/rge if_rgevar.h if_rge.c, sys/modules/zfs Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+22-21sys/modules/zfs/Makefile
+0-4sys/dev/rge/if_rgevar.h
+2-2usr.bin/backlight/backlight.8
+2-2sys/dev/rge/if_rge.c
+1-1usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+1-0sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+28-301 files not shown
+29-307 files

HardenedBSD/src c24fae9sys/dev/rge if_rgevar.h if_rge.c, sys/modules/zfs Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+22-21sys/modules/zfs/Makefile
+2-2usr.bin/backlight/backlight.8
+0-4sys/dev/rge/if_rgevar.h
+2-2sys/dev/rge/if_rge.c
+1-1usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+1-0usr.sbin/bluetooth/rtlbtfw/main.c
+28-301 files not shown
+29-307 files

HardenedBSD/src 5f659f2sys/modules/zfs Makefile

zfs: Fix build after merge of openzfs/zfs at f8e5af53e

The change causing it is the introduction of the test over __BMI2__ in
'module/zstd/lib/common/bitstream.h'.

This is a stop-gap commit whose content needs to be upstreamed (after
possibly having been improved).

Fixes:          8a62a2a5659d ("zfs: merge openzfs/zfs at f8e5af53e")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+22-21sys/modules/zfs/Makefile
+22-211 files

HardenedBSD/src 9976cffsys/dev/rge if_rge.c if_rgevar.h

rge: use C style comments instead of C++

FreeBSD style(9) mandates C style comments. The initial import from
OpenBSD left several C++ style // comments in if_rge.c and if_rgevar.h.
Replace them with proper /* */ comments.

Also fix a malformed comment that mixed // with a closing */.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55743
DeltaFile
+2-2sys/dev/rge/if_rge.c
+0-4sys/dev/rge/if_rgevar.h
+2-62 files

HardenedBSD/src 73f37a6share/mk bsd.own.mk

Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk"

This reverts commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf.

It might be that all that's needed to fix this is to add
".include <bsd.compiler.mk>" to some Makefiles. I'll look into it soon
but for now let's unbreak HEAD.

Approved by:            bnovkov (mentor)
Differential Revision:  https://reviews.freebsd.org/D55869
DeltaFile
+6-0share/mk/bsd.own.mk
+6-01 files

HardenedBSD/src 424d3causr.bin/backlight backlight.8

backlight.8: Fix typo in man

Increment and decrement where swapped.

Signed-off-by: Salman Sarray <salman at sarray.de>
Reviewed by: ziaee, Christos Longros <chris.longros at gmail.com>
Pull Request: https://github.com/freebsd/freebsd-src/pull/2072
DeltaFile
+2-2usr.bin/backlight/backlight.8
+2-21 files

HardenedBSD/src 2e93669sys/netgraph/bluetooth/drivers/ubt ng_ubt_rtl.c, usr.sbin/bluetooth/rtlbtfw rtlbtfw.conf main.c

rtlbtfw(8): Add support for Realtek 8852CE

Add the USB Vendor/Product ID (0x13d3:0x3612) for
the new Realtek 8852CE drive to make sure it works.

Signed-off-by: Ying Xu <fakeshadow1337 at gmail.com>
Reviewed by: pouria, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/2071
DeltaFile
+1-1usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+1-0sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+1-0usr.sbin/bluetooth/rtlbtfw/main.c
+3-13 files

HardenedBSD/src 0bebad8share/mk bsd.own.mk

bsd.own.mk: Deorbit compat include of bsd.compiler.mk

Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]")
mentions that bsd.own.mk included bsd.compiler.mk as a temporary
workaround and was destined to be removed in FreeBSD 12. Do that now.

PR:             203540
Reviewed by:    bnovkov, imp
Approved by:    bnovkov (mentor)
Differential Revision:  https://reviews.freebsd.org/D55867
DeltaFile
+0-6share/mk/bsd.own.mk
+0-61 files

HardenedBSD/src f119e68share/man/man5 resolver.5, sys/conf files

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+39-1share/man/man5/resolver.5
+3-0sys/conf/files
+42-12 files

HardenedBSD/src 7ce8c7fshare/man/man5 resolver.5, sys/conf files

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+39-1share/man/man5/resolver.5
+3-0sys/conf/files
+42-12 files

HardenedBSD/src 356415asys/conf files

Unbreak LINT after ZFS import

Fixes:          8a62a2a5659d ("zfs: merge openzfs/zfs at f8e5af53e")
DeltaFile
+3-0sys/conf/files
+3-01 files

HardenedBSD/src 462a1f6share/man/man5 resolver.5

resolver.5: document six previously undocumented options

Document the edns0, inet6, insecure1, insecure2, no-check-names,
and rotate options which are parsed by res_init(3) but were not
described in the resolver(5) man page.

MFC after:      1 week
Signed-off-by:  Christos Longros <chris.longros at gmail.com>
Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D55864
DeltaFile
+39-1share/man/man5/resolver.5
+39-11 files

HardenedBSD/src e6b77c1sys/amd64/amd64 trap.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+20-13sys/amd64/amd64/trap.c
+20-131 files

HardenedBSD/src 67e668dsys/amd64/amd64 trap.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+20-13sys/amd64/amd64/trap.c
+20-131 files

HardenedBSD/src 8365f87sys/amd64/amd64 trap.c

amd64: do reset %rip after page fault if pcb_onfault is set

for any kernel page fault, and not only for EFIRT case.

Reported and tested by: pho
Fixes:  914a53570750ce5a104a5870403d7669656fddc3
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+20-13sys/amd64/amd64/trap.c
+20-131 files

HardenedBSD/src e47bb18contrib/libpcap configure pcap-linux.c, lib/libpcap config.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+404-50contrib/libpcap/nametoaddr.c
+225-123contrib/libpcap/pcap-dlpi.c
+245-101contrib/libpcap/gencode.c
+209-54lib/libpcap/config.h
+2,010-79068 files not shown
+3,576-1,50874 files

HardenedBSD/src 35c92decontrib/libpcap configure pcap-linux.c, lib/libpcap config.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+404-50contrib/libpcap/nametoaddr.c
+225-123contrib/libpcap/pcap-dlpi.c
+245-101contrib/libpcap/gencode.c
+209-54lib/libpcap/config.h
+2,010-79068 files not shown
+3,576-1,50874 files

HardenedBSD/src a0b3ef1usr.sbin/ipfwpcap ipfwpcap.c

ipfwpcap: Fix build after libpcap 1.10.6 update

pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which
is not available to consumers of the internal header outside of the
libpcap build.  Switch to the public <pcap.h> header and replace the
direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3),
which is the correct public API for flushing a pcap dump file.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+2-7usr.sbin/ipfwpcap/ipfwpcap.c
+2-71 files

HardenedBSD/src 16cef5fcontrib/libpcap configure pcap-linux.c, lib/libpcap config.h

libpcap: Update to 1.10.6

Changes:        https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES
Reviewed by:    bms, emaste
Obtained from:  https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55545
Differential Revision:  https://reviews.freebsd.org/D55858
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+404-50contrib/libpcap/nametoaddr.c
+225-123contrib/libpcap/pcap-dlpi.c
+245-101contrib/libpcap/gencode.c
+209-54lib/libpcap/config.h
+2,010-79067 files not shown
+3,574-1,50173 files

HardenedBSD/src c41c44ashare/man/man4 re.4 rge.4

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+5-0share/man/man4/re.4
+1-0share/man/man4/rge.4
+6-02 files

HardenedBSD/src 9be08b1share/man/man4 re.4 rge.4

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+5-0share/man/man4/re.4
+1-0share/man/man4/rge.4
+6-02 files

HardenedBSD/src e6f4e4ashare/man/man4 re.4 rge.4

re(4), rge(4): improve Realtek driver man pages

Add D-Link DGE-530(T) and Killer E2600 to the re(4) HARDWARE list.
Both are supported by the driver but were missing from the man page.

Also add cross-references between re(4) and rge(4) in SEE ALSO,
as both are Realtek NIC drivers.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55745
DeltaFile
+5-0share/man/man4/re.4
+1-0share/man/man4/rge.4
+6-02 files

HardenedBSD/src 9ce9589sys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494521 files not shown
+38,446-15,269527 files

HardenedBSD/src 71b5c2bsys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494521 files not shown
+38,446-15,269527 files

HardenedBSD/src d20bc0elib/libsys sigreturn.2, usr.sbin/virtual_oss/virtual_oss virtual_oss.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+14-20usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+16-8lib/libsys/sigreturn.2
+30-282 files

HardenedBSD/src 251907crelease/tools ec2.conf

EC2: Fix comment re avoiding unicode

We're avoiding *unicode*, not avoiding *ascii*.

Reported by:    marck
Fixes:  277830b4d3ae ("EC2: Don't use unicode in boot loader")
MFC after:      3 days
DeltaFile
+2-1release/tools/ec2.conf
+2-11 files

HardenedBSD/src 922d735sys/fs/tarfs tarfs_io.c

tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset()

ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0

This change is needed to MFV zstd 1.5.7.

Approved by:    emaste (mentor)
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55835
DeltaFile
+2-2sys/fs/tarfs/tarfs_io.c
+2-21 files