Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge FreeBSD 2024-05-24 #2212

Merged
merged 355 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
355 commits
Select commit Hold shift + click to select a range
d1af434
LinuxKPI: 802.11: rename chanctx_conf for consistency
May 13, 2024
0115ad6
autofs: Fix cross-threading on file to delete
bsdimp May 22, 2024
58e44aa
Fix typo
bsdimp May 22, 2024
63f18b3
mqueuefs: minor style pass
kostikbel May 22, 2024
b6f4a3f
mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped
kostikbel May 22, 2024
f0a4dd6
mqueuefs: mark newly allocated vnode as constructed, under the lock
kostikbel May 22, 2024
93ad59a
snd_hda: Add patch for Asus UX331UAL
lutzbichler May 22, 2024
1e84b85
geom: Remove sysctl.h
bsdimp May 22, 2024
e07f917
sound: Separate implementations for SNDCTL_AUDIOINFO[_EX] and SNDCTL_…
christosmarg May 23, 2024
5d980fa
sound: Handle unavailable devices in various OSS IOCTLs
christosmarg May 23, 2024
0e80798
mixer(8): Ignore mixer_open() failures for the -a option
christosmarg May 23, 2024
67c89b2
mixer(3): Implement mixer_get_path() function
christosmarg May 23, 2024
e3b94b3
mixer(8): Use mixer_get_path()
christosmarg May 23, 2024
1ab62c8
mixer.3: Fix mandoc -Tlint warnings
christosmarg May 23, 2024
425a7bc
sound: Fix minchn, maxchn and fmts in sndstat_get_caps()
christosmarg May 23, 2024
9fc5e3f
arm64: set ATTR_CONTIGUOUS on the DMAP's L2 blocks
alcriceedu May 13, 2024
d76ef58
freebsd-update: Correctly check if pkg(8) is present
gmshake May 23, 2024
56a8aca
Stop treating size 0 as unknown size in vnode_create_vobject().
May 19, 2024
61b07f8
MAC/do: allow to call setuid if real user id is 0
bapt May 23, 2024
fb9013f
pcm: centralize 32-bit ioctl compat
brooksdavis May 23, 2024
49086aa
Fix scn_queue races on very old pools
amotin May 23, 2024
6729e8a
libpmc: remove tautological assert
brooksdavis May 23, 2024
fcc5fa0
libcompiler_rt: gcc13 doesn't support _Float16 on arm
brooksdavis May 23, 2024
2ce32ab
Fix "version introduced" in two manual pages
tomhukins May 22, 2024
2c9f851
etherswitch.4: Remove non-existent manual pages
tomhukins May 23, 2024
083d149
etherswitch.4: List manual pages alphabetically
tomhukins May 23, 2024
be3631b
option_survey.sh: Bump size to 5GB
michaeldexter May 20, 2024
a5f0341
ci: Redirect output for builds.
bsdimp May 23, 2024
3d7c8f0
cp: avoid a resource leak
khorben May 16, 2024
0d37895
ctl: use socket buffer mutexes in struct socket directly
glebius May 23, 2024
acb7a4d
mqueue: Add sysctl for default_maxmsg & default_msgsize and fix descr…
ricardobranco777 May 12, 2024
04d3f8e
linprocfs: Add support for proc/sys/fs/mqueue/*
ricardobranco777 May 12, 2024
ddbfb54
mqueuefs: Relax restriction that path must begin with a slash
ricardobranco777 May 15, 2024
427db2c
linux: Fix linux_mq_notify_args & linux_timer_create_args
ricardobranco777 May 15, 2024
9c7b1bf
linux: Export linux_common_openflags()
ricardobranco777 May 17, 2024
86e43b5
linux: Export linux_convert_l_sigevent
ricardobranco777 May 17, 2024
289b2d6
mqueue: Export some functions to be used by Linuxulator
ricardobranco777 May 17, 2024
e30621d
mqueue: Introduce kern_kmq_timedreceive & kern_kmq_timedsend
ricardobranco777 May 18, 2024
97add68
linux: Support POSIX message queues
ricardobranco777 May 17, 2024
9a9677e
linux: Update linux manpage to mention mqueuefs
ricardobranco777 May 19, 2024
bedbaee
syscalls: Regen for Linux emulator additions
bsdimp May 23, 2024
2356b60
arp(8): allow -i with -s
llfw May 5, 2024
29efb3d
Import bmake-20240520
sgerraty May 23, 2024
9d3df31
Merge bmake-20240520
sgerraty May 23, 2024
fe136ae
tcp: improve inp locking in setsockopt
tuexen May 23, 2024
c6bcacc
Vendor import of llvm-project branch release/18.x llvmorg-18.1.6-0-g1…
DimitryAndric May 23, 2024
87bf0aa
Remove COMPAT_FREEBSD4/5/6/7/9 from MINIMAL and FIRECRACKER kernel co…
hhartzer May 10, 2024
1e8eb41
netinet/icmp6: add PREF64 definitions (RFC 8781)
llfw Apr 26, 2024
77f06c4
rtadvd(8): support PREF64 (RFC 8781)
llfw Apr 26, 2024
4b75afe
sys/netinet/icmp6.h: use C99 uintX_t constants for new PREF64 struct
llfw May 14, 2024
380ee9b
sys/netinet/icmp6.h: Fix build
cschuber May 23, 2024
674956e
sys/netinet/cc: Switch from deprecated random() to prng32()
hhartzer Apr 10, 2024
d33f5a0
fwget: update wireless IDs for rtw88/89, ath1xk, mt76 and add iwlwifi
Apr 23, 2024
45bce6f
LinuxKPI: 802.11: lock MO tx/wake_tx_queue() downcalls
Feb 18, 2024
d31ed58
Modernize DVD package set in preparation for 14.1
cperciva May 20, 2024
f81c090
Add rtw88 firmware to DVD package set
cperciva May 24, 2024
59aa649
cross: Move Solaris API64 defines to common
valpackett May 23, 2024
02d1521
tcp: improve blackhole support
tuexen May 24, 2024
b5e1784
arm64, riscv: removed unused struct pv_addr
mhorne May 24, 2024
1d3c236
arm64, riscv: remove unused declaration
mhorne May 24, 2024
32f40fc
geom: Add counts for enomem and pausing
bsdimp May 24, 2024
6d83b38
geom_io: Shift to pause_sbt to eliminate bogus min and update comment.
bsdimp May 24, 2024
99c14fb
cam: Drop periph lock when completing I/O with ENOMEM status
bsdimp May 24, 2024
d09ee08
nvme: Count number of alginment splits
bsdimp May 24, 2024
a216e31
vm_pageout_scan_inactive: take a lock break
rlibby May 24, 2024
3a07933
Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67
DimitryAndric May 24, 2024
61639bb
libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map
emaste May 24, 2024
f52481f
vt(4): add note about sc/UEFI incompatibility
emaste May 24, 2024
0cc8506
dhclient: remove unused primary_address
fichtner May 24, 2024
0e2ce86
ipfw: don't build the module if INET not in kernel
llfw May 24, 2024
bfd248f
sys/amd64/conf/LINT-NOINET{6,}: don't set WITHOUT_INET{6,}_SUPPORT
llfw May 24, 2024
ff92493
netlink: Fix C++ compile errors
cnbatch May 17, 2024
40d951b
x86/iommu: extract useful utilities into x86_iommu.c
kostikbel May 25, 2024
498891c
devctl: Disable the boottime optimization of suppressing NOMATCH
bsdimp May 18, 2024
cdaf81c
Remove TCP_SAD optional code now that the sack filter performs this f…
May 18, 2024
72ef093
rc.conf.5: remove obsolete advice about kld_list
asomers May 18, 2024
3637413
nfs client comment typo fix
kostikbel May 18, 2024
83cfc1c
geli: allocate a UMA pool earlier
oshogbo May 19, 2024
a4cdbf6
geli: fix indentation
oshogbo May 19, 2024
a38d583
vfs_getopt(9): fix typo
asomers May 19, 2024
e587345
arm64 pmap: eliminate a redundant variable
alcriceedu May 19, 2024
4d601d8
acpidump IVRS table format: change 'IOMMUId' into 'IOMMU DeviceId'
kostikbel May 19, 2024
f8bee4d
compat_freebsd4: Add const qualifier to the local variable s inside f…
gmshake May 20, 2024
dc89d97
linux(4): Add const qualifier to the value parameter of function hand…
gmshake May 20, 2024
978cfa7
kboot: Move console, acpi and smbios init
bsdimp May 19, 2024
204f421
loader: separate lang init from scripting init
bsdimp May 19, 2024
f4d9e17
kboot: Initialize hostfs_root sooner (and remove kboot.conf)
bsdimp May 19, 2024
c15ca2f
kboot: Use C99 initialiers for hostconsole.
bsdimp May 19, 2024
f260d7c
boot/i386: Use C99 initializer for textvidc
bsdimp May 19, 2024
8f7d94b
i386/spinconsole: Use C99 initializers
bsdimp May 19, 2024
7402dfb
i386/nullconsole: Use C99 initializers
bsdimp May 19, 2024
e9ed9ff
efi_console: Use c99 initializers
bsdimp May 19, 2024
d0acae2
uboot: Use c99 initializers for the console struct
bsdimp May 19, 2024
036af32
ofw: Use C99 initializers for the console struct
bsdimp May 19, 2024
e7897ba
userboot: Use C99 Initializers for each of the consoles here
bsdimp May 19, 2024
f1c83de
loader: c_init returns 0 or 1
bsdimp May 19, 2024
0e3628e
loader: stlye(9) nit: Space between return and the value
bsdimp May 19, 2024
bda7cb3
loader/ofw: Style(9) pass over return statements
bsdimp May 19, 2024
1cca615
textvidc: Reindent
bsdimp May 19, 2024
daff601
loader: fix stupid typos
bsdimp May 20, 2024
0ae229d
if_vxlan(4): Add checking for loops and nesting of tunnels
gmshake May 20, 2024
26e6fce
libdiff: Detect and recover from file truncation.
dag-erling May 20, 2024
3a106e3
libdiff: Add a test for the truncation issue.
dag-erling May 20, 2024
c1b7bd5
diff: Warn if the atomizer detected truncation.
dag-erling May 20, 2024
c4a9b18
adduser: create dataset only if home is directly within dataset
May 20, 2024
a6081b2
sound: Get rid of redundant assignments in chn_init()
christosmarg May 20, 2024
43fddf4
sound: Prevent uninitialized variable destruction in chn_init()
christosmarg May 20, 2024
5e77bd3
sound: Check user-supplied size passed to SNDSTIOC_ADD_USER_DEVS*
christosmarg May 20, 2024
87c8163
sound: Correctly check nvlist_unpack() error
christosmarg May 20, 2024
ddb9f5a
diff: Nits in tests.
dag-erling May 20, 2024
705c8b0
libcxxrt: Omit symbols not present in CHERI libcxxrt from Version.map…
bsdjhb Sep 3, 2024
8f5192e
Make WITHOUT_UNDEFINED_VERSION the default
brooksdavis May 2, 2024
2237b4d
man: the exists function needs to validate the first parameter
wosch May 20, 2024
d227104
bsdinstall: Fix wifi network selection size
rbgarga May 20, 2024
49bbcff
lock.9: LK_TIMELOCK is a lockmgr flag, not lockinit
rlibby May 20, 2024
c1c8b21
sound: Make SNDST_UNVLBUF_MAX a power of two
christosmarg May 20, 2024
7be5c3d
Add man page for the ice network driver.
May 21, 2024
d9eac49
uipc_shm: Fix double check for shmfd->shm_path
ricardobranco777 May 20, 2024
d3e92ec
fix (nuageinit): SSH keys are not handled in metadata but in userdata
ashmonger May 21, 2024
b84a001
ifconfig: Redo fix vlan/vlanproto reconfiguration
gmshake May 21, 2024
e54ffa0
cryptocheck: Don't test Chacha20-Poly1305 with an IV size of 8
bsdjhb May 21, 2024
2318c36
lockmgr: make lockmgr_disowned public and use it
rlibby May 21, 2024
55ae71e
buf: define and use BUF_DISOWNED
rlibby May 21, 2024
218157a
getblk: fail faster with GB_LOCK_NOWAIT
rlibby May 21, 2024
49fb5f8
glabel.8: Describe cases related to permissions / existing mounts
May 21, 2024
684fd9f
capsicum: allow rfork(2) in capability mode
trasz May 21, 2024
253f664
Regen
oshogbo May 21, 2024
a1d1ed9
LinuxKPI: 802.11: fix for_each_sta_active_link()
May 21, 2024
84c17ac
LinuxKPI: add kvmemdup()
May 13, 2024
1de54c8
access(2): Discourage use of these system calls.
dag-erling May 21, 2024
69e3822
ftpd: stop using -g flag for /bin/ls
allanjude May 21, 2024
d5563ab
iavf(4): Improve man page
ricera May 21, 2024
00845f3
LinuxKPI: add FIELD_PREP_CONST()
May 13, 2024
c5a3a92
autofs manuals: align lists, tag SPDX
concussious May 16, 2024
a9d2d98
unionfs.4: describe better, tag SPDX
concussious May 16, 2024
2105d7a
smb.4/smbfs.4: distinguishable descriptions, +SPDX
concussious May 16, 2024
b3ef1df
libnvmf: avoid resource leak
khorben May 16, 2024
a424dd2
kern/rman: update DPRINTF() macro, avoid semicolon swallowing match f…
ehem May 9, 2024
1fdd3ed
kern/rman: update debugging lines in subr_rman.c
ehem May 9, 2024
fac5569
kern/rman: remove rman_reserve_resource_bound(), partially revert 13f…
ehem May 9, 2024
e6219f2
kern/rman: update rman_make_alignment_flags()
ehem May 9, 2024
1d117be
kern/rman: mark rman get functions as taking constants
ehem May 10, 2024
2bc0ffc
linprocfs: Add support for proc/sysvipc/{msg,sem,shm}
ricardobranco777 May 12, 2024
3d23c88
linprocfs: use %z for size_t arguments
bsdimp May 22, 2024
19239bc
Allow DEBUG_SH=rc:all to debug all rc.d
sgerraty May 22, 2024
f92cd63
Simplify the code.
May 19, 2024
2adc1e2
Fix build.
May 22, 2024
d763d5f
capsicum: SIGTRAP is delivered also on ECAPMODE error.
Jan 22, 2024
c94e14c
time: siginfo_recvd needs to be marked volatile
kevans91 May 22, 2024
962259d
if_vlan: handle VID conflicts
kprovost May 21, 2024
8870de8
daemon: Add -C (--restart-count) option
jurajlutter Apr 25, 2024
cb4706d
stand/efi: Fix for binutils when targeting arm64
zxombie May 22, 2024
9be7904
stand/kboot: Fix the linker script OUTPUT_FORMAT
zxombie May 22, 2024
e6aec3f
csu: Find the main pointer through the GOT
zxombie May 22, 2024
b9677da
sys/sys: Fix __builtin_is_aligned fallback
zxombie May 22, 2024
efc642d
arm64: Use the UL macro in TCR_EL1 defines
zxombie May 22, 2024
b71e632
arm64: Add the pointer auth registers to armreg.h
zxombie May 22, 2024
fd882a2
arm64: Use the pointer auth register defines
zxombie May 22, 2024
3029951
arm64/rockchip: Fix the build with GCC
zxombie May 22, 2024
b229332
pci: Fix pci_host_generic_acpi with gcc
zxombie May 22, 2024
bdc91fd
dev/hwpmc: Fix the dmc620 MD4 macro
zxombie May 22, 2024
c2b6c58
sys: Build arm64 per-thread SSP with GCC
zxombie May 22, 2024
15bc373
arm64: Fixed IOMMU compilation errors
May 21, 2024
52d4963
mac_do: add a new MAC/do policy and mdo(1) utility
bapt May 9, 2024
2af6d72
RELNOTES: document MAC/do
bapt May 22, 2024
b0fea10
arm64: Return newline at the end of NOTES back
May 22, 2024
7e1d818
rc: add service jails framework
netchild May 22, 2024
20f0011
rc.d: add a service jails config to all base system services
netchild May 22, 2024
14fe6bb
mac_do(4): fix typo
bapt May 22, 2024
a603295
usr.bin/top: fix displaying load average for loads of at least 100
pkubaj May 21, 2024
cd1ce81
tpm_if.m: declare bus addresses as bus_size_t not bus_addr_t
rlibby May 22, 2024
8c1d0e5
riscv: Fix SSTC extension support
bukinr May 22, 2024
51a4fba
riscv: Implement atomic operations
bukinr May 22, 2024
8591fea
arm64: Allow userspace to be built with PAC and BTI
zxombie May 22, 2024
47cf762
src.conf.5: Regen
zxombie May 22, 2024
9a7e81e
blackhole.4: improve man page
tuexen May 22, 2024
4025932
Add function to OSD to get values without taking the lock.
Apr 4, 2024
3b44ebd
zzz: Fix output formatting when suspend state not supported
ssh911 May 22, 2024
5d5bf91
LinuxKPI: 802.11: change teardown order to avoid iwlwifi firmware cra…
May 22, 2024
ea5a1a5
LinuxKPI: 802.11: rename chanctx_conf for consistency
May 13, 2024
515cafb
autofs: Fix cross-threading on file to delete
bsdimp May 22, 2024
34e9248
Fix typo
bsdimp May 22, 2024
4a8894e
mqueuefs: minor style pass
kostikbel May 22, 2024
9c59d2e
mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped
kostikbel May 22, 2024
d54a5a0
mqueuefs: mark newly allocated vnode as constructed, under the lock
kostikbel May 22, 2024
9a809a8
snd_hda: Add patch for Asus UX331UAL
lutzbichler May 22, 2024
c326176
geom: Remove sysctl.h
bsdimp May 22, 2024
9a01816
sound: Separate implementations for SNDCTL_AUDIOINFO[_EX] and SNDCTL_…
christosmarg May 23, 2024
415f36c
sound: Handle unavailable devices in various OSS IOCTLs
christosmarg May 23, 2024
528806d
mixer(8): Ignore mixer_open() failures for the -a option
christosmarg May 23, 2024
7ceb55e
mixer(3): Implement mixer_get_path() function
christosmarg May 23, 2024
e349ce7
mixer(8): Use mixer_get_path()
christosmarg May 23, 2024
b015080
mixer.3: Fix mandoc -Tlint warnings
christosmarg May 23, 2024
caf4329
sound: Fix minchn, maxchn and fmts in sndstat_get_caps()
christosmarg May 23, 2024
0dadd62
arm64: set ATTR_CONTIGUOUS on the DMAP's L2 blocks
alcriceedu May 13, 2024
319d963
freebsd-update: Correctly check if pkg(8) is present
gmshake May 23, 2024
da55136
Stop treating size 0 as unknown size in vnode_create_vobject().
May 19, 2024
79167f5
MAC/do: allow to call setuid if real user id is 0
bapt May 23, 2024
f397d7a
pcm: centralize 32-bit ioctl compat
brooksdavis May 23, 2024
d683b17
Fix scn_queue races on very old pools
amotin May 23, 2024
d9f24e7
libpmc: remove tautological assert
brooksdavis May 23, 2024
9170e3b
libcompiler_rt: gcc13 doesn't support _Float16 on arm
brooksdavis May 23, 2024
29a08d9
Fix "version introduced" in two manual pages
tomhukins May 22, 2024
39550b1
etherswitch.4: Remove non-existent manual pages
tomhukins May 23, 2024
4f38351
etherswitch.4: List manual pages alphabetically
tomhukins May 23, 2024
c0c0c84
option_survey.sh: Bump size to 5GB
michaeldexter May 20, 2024
501c327
ci: Redirect output for builds.
bsdimp May 23, 2024
924b892
cp: avoid a resource leak
khorben May 16, 2024
b456058
ctl: use socket buffer mutexes in struct socket directly
glebius May 23, 2024
dbce960
mqueue: Add sysctl for default_maxmsg & default_msgsize and fix descr…
ricardobranco777 May 12, 2024
cead830
linprocfs: Add support for proc/sys/fs/mqueue/*
ricardobranco777 May 12, 2024
a4c379a
mqueuefs: Relax restriction that path must begin with a slash
ricardobranco777 May 15, 2024
9d1611a
linux: Fix linux_mq_notify_args & linux_timer_create_args
ricardobranco777 May 15, 2024
650128c
linux: Export linux_common_openflags()
ricardobranco777 May 17, 2024
1f1d6f9
linux: Export linux_convert_l_sigevent
ricardobranco777 May 17, 2024
d872b2d
mqueue: Export some functions to be used by Linuxulator
ricardobranco777 May 17, 2024
eb6c739
mqueue: Introduce kern_kmq_timedreceive & kern_kmq_timedsend
ricardobranco777 May 18, 2024
4f5f9d2
linux: Support POSIX message queues
ricardobranco777 May 17, 2024
d1facae
linux: Update linux manpage to mention mqueuefs
ricardobranco777 May 19, 2024
f57cd77
syscalls: Regen for Linux emulator additions
bsdimp May 23, 2024
f68962b
arp(8): allow -i with -s
llfw May 5, 2024
c3726d4
Merge bmake-20240520
sgerraty May 23, 2024
34c8dcc
tcp: improve inp locking in setsockopt
tuexen May 23, 2024
5f1cc1b
Remove COMPAT_FREEBSD4/5/6/7/9 from MINIMAL and FIRECRACKER kernel co…
hhartzer May 10, 2024
33d3f35
netinet/icmp6: add PREF64 definitions (RFC 8781)
llfw Apr 26, 2024
4e1af7f
rtadvd(8): support PREF64 (RFC 8781)
llfw Apr 26, 2024
88a2268
sys/netinet/icmp6.h: use C99 uintX_t constants for new PREF64 struct
llfw May 14, 2024
1b99fea
sys/netinet/icmp6.h: Fix build
cschuber May 23, 2024
2512344
sys/netinet/cc: Switch from deprecated random() to prng32()
hhartzer Apr 10, 2024
b34ec53
fwget: update wireless IDs for rtw88/89, ath1xk, mt76 and add iwlwifi
Apr 23, 2024
2ccd47d
LinuxKPI: 802.11: lock MO tx/wake_tx_queue() downcalls
Feb 18, 2024
aea55eb
Modernize DVD package set in preparation for 14.1
cperciva May 20, 2024
ccd8997
Add rtw88 firmware to DVD package set
cperciva May 24, 2024
b2442b8
cross: Move Solaris API64 defines to common
valpackett May 23, 2024
eedf15a
arm64, riscv: removed unused struct pv_addr
mhorne May 24, 2024
37a55e8
arm64, riscv: remove unused declaration
mhorne May 24, 2024
ff41826
geom: Add counts for enomem and pausing
bsdimp May 24, 2024
71c6ce4
geom_io: Shift to pause_sbt to eliminate bogus min and update comment.
bsdimp May 24, 2024
729af54
cam: Drop periph lock when completing I/O with ENOMEM status
bsdimp May 24, 2024
25e6981
nvme: Count number of alginment splits
bsdimp May 24, 2024
09b89f6
vm_pageout_scan_inactive: take a lock break
rlibby May 24, 2024
a3f4227
Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67
DimitryAndric May 24, 2024
42c2719
libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map
emaste May 24, 2024
685c1f6
vt(4): add note about sc/UEFI incompatibility
emaste May 24, 2024
a0ed6c8
dhclient: remove unused primary_address
fichtner May 24, 2024
28fcfae
ipfw: don't build the module if INET not in kernel
llfw May 24, 2024
a557796
sys/amd64/conf/LINT-NOINET{6,}: don't set WITHOUT_INET{6,}_SUPPORT
llfw May 24, 2024
0a3df92
netlink: Fix C++ compile errors
cnbatch May 17, 2024
1670a9f
x86/iommu: extract useful utilities into x86_iommu.c
kostikbel May 25, 2024
04ac01d
tcp: improve blackhole support
tuexen May 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions RELNOTES
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline.

Changes to this file should not be MFCed.

8aac90f18aef:
new MAC/do policy and mdo(1) utility which enables a user to
become another user without the requirement of setuid root.

7398d1ece5cf:
hw.snd.version is removed.

Expand Down
3 changes: 3 additions & 0 deletions bin/cp/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ copy_file(const FTSENT *entp, int dne)
if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 ||
fstat(from_fd, &sb) != 0) {
warn("%s", entp->fts_path);
if (from_fd >= 0)
(void)close(from_fd);
return (1);
}
/*
Expand All @@ -124,6 +126,7 @@ copy_file(const FTSENT *entp, int dne)
*/
if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) {
warnx("%s: File changed", entp->fts_path);
(void)close(from_fd);
return (1);
}
}
Expand Down
15 changes: 15 additions & 0 deletions contrib/bmake/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
2024-05-20 Simon J Gerraty <[email protected]>

* VERSION (_MAKE_VERSION):
Merge with NetBSD make, pick up
o dir.c: in FindFile restore last search of .CURDIR even for
includes, as a number of existing makefiles are broken otherwise.

2024-05-19 Simon J Gerraty <[email protected]>

* VERSION (_MAKE_VERSION): 20240519
Merge with NetBSD make, pick up
o dir.c: Add Dir_FindInclude, FindFile without looking in .CURDIR.
Also fix Dir_SetSYSPATH to use defSysIncPath if sysIncPath is empty.
o main.c: no need to set .DOTLAST in sysIncPath

2024-05-07 Simon J Gerraty <[email protected]>

* VERSION (_MAKE_VERSION): 20240508
Expand Down
2 changes: 1 addition & 1 deletion contrib/bmake/VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# keep this compatible with sh and make
_MAKE_VERSION=20240508
_MAKE_VERSION=20240520
51 changes: 43 additions & 8 deletions contrib/bmake/dir.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: dir.c,v 1.286 2023/12/29 18:53:24 rillig Exp $ */
/* $NetBSD: dir.c,v 1.290 2024/05/20 19:14:12 sjg Exp $ */

/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
Expand Down Expand Up @@ -132,7 +132,7 @@
#include "job.h"

/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
MAKE_RCSID("$NetBSD: dir.c,v 1.286 2023/12/29 18:53:24 rillig Exp $");
MAKE_RCSID("$NetBSD: dir.c,v 1.290 2024/05/20 19:14:12 sjg Exp $");

/*
* A search path is a list of CachedDir structures. A CachedDir has in it the
Expand Down Expand Up @@ -566,10 +566,12 @@
Dir_SetSYSPATH(void)
{
CachedDirListNode *ln;

SearchPath *path = Lst_IsEmpty(&sysIncPath->dirs)
? defSysIncPath : sysIncPath;

Check failure on line 571 in contrib/bmake/dir.c

View workflow job for this annotation

GitHub Actions / Style Checker

trailing whitespace
Var_ReadOnly(".SYSPATH", false);
Global_Delete(".SYSPATH");
for (ln = sysIncPath->dirs.first; ln != NULL; ln = ln->next) {
for (ln = path->dirs.first; ln != NULL; ln = ln->next) {
CachedDir *dir = ln->datum;
Global_Append(".SYSPATH", dir->name);
}
Expand Down Expand Up @@ -1142,15 +1144,16 @@
* Input:
* name the file to find
* path the directories to search, or NULL
* isinclude if true, do not search .CURDIR at all
*
* Results:
* The freshly allocated path to the file, or NULL.
*/
char *
Dir_FindFile(const char *name, SearchPath *path)
static char *
FindFile(const char *name, SearchPath *path, bool isinclude)
{
char *file; /* the current filename to check */
bool seenDotLast = false; /* true if we should search dot last */
bool seenDotLast = isinclude; /* true if we should search dot last */
struct cached_stat cst;
const char *trailing_dot = ".";
const char *base = str_basename(name);
Expand All @@ -1163,7 +1166,7 @@
return NULL;
}

if (path->dirs.first != NULL) {
if (!seenDotLast && path->dirs.first != NULL) {
CachedDir *dir = path->dirs.first->datum;
if (dir == dotLast) {
seenDotLast = true;
Expand Down Expand Up @@ -1244,6 +1247,38 @@
return NULL;
}

/*
* Find the file with the given name along the given search path.
*
* Input:
* name the file to find
* path the directories to search, or NULL
*
* Results:
* The freshly allocated path to the file, or NULL.
*/
char *
Dir_FindFile(const char *name, SearchPath *path)
{
return FindFile(name, path, false);

Check failure on line 1263 in contrib/bmake/dir.c

View workflow job for this annotation

GitHub Actions / Style Checker

parentheses required on return
}

/*
* Find the include file with the given name along the given search path.
*
* Input:
* name the file to find
* path the directories to search, or NULL
*
* Results:
* The freshly allocated path to the file, or NULL.
*/
char *
Dir_FindInclude(const char *name, SearchPath *path)
{
return FindFile(name, path, true);

Check failure on line 1279 in contrib/bmake/dir.c

View workflow job for this annotation

GitHub Actions / Style Checker

parentheses required on return
}


/*
* Search for 'needle' starting at the directory 'here' and then working our
Expand Down
3 changes: 2 additions & 1 deletion contrib/bmake/dir.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: dir.h,v 1.47 2023/01/24 00:24:02 sjg Exp $ */
/* $NetBSD: dir.h,v 1.48 2024/05/19 20:09:40 sjg Exp $ */

/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
Expand Down Expand Up @@ -86,6 +86,7 @@ void Dir_SetSYSPATH(void);
bool Dir_HasWildcards(const char *) MAKE_ATTR_USE;
void SearchPath_Expand(SearchPath *, const char *, StringList *);
char *Dir_FindFile(const char *, SearchPath *) MAKE_ATTR_USE;
char *Dir_FindInclude(const char *, SearchPath *) MAKE_ATTR_USE;
char *Dir_FindHereOrAbove(const char *, const char *) MAKE_ATTR_USE;
void Dir_UpdateMTime(GNode *, bool);
CachedDir *SearchPath_Add(SearchPath *, const char *);
Expand Down
6 changes: 3 additions & 3 deletions contrib/bmake/getopt.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $ */
/* $NetBSD: getopt.c,v 1.30 2024/01/19 18:41:38 christos Exp $ */

/*
* Copyright (c) 1987, 1993, 1994
Expand Down Expand Up @@ -58,8 +58,8 @@ int
getopt(int nargc, char * const nargv[], const char *ostr)
{
extern char *__progname;
static const char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */
static const char *place = EMSG; /* option letter processing */
const char *oli; /* option letter list index */

#ifndef BSD4_4
if (!__progname) {
Expand Down
6 changes: 2 additions & 4 deletions contrib/bmake/main.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.615 2024/05/07 18:26:22 sjg Exp $ */
/* $NetBSD: main.c,v 1.616 2024/05/19 17:55:54 sjg Exp $ */

/*
* Copyright (c) 1988, 1989, 1990, 1993
Expand Down Expand Up @@ -111,7 +111,7 @@
#include "trace.h"

/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: main.c,v 1.615 2024/05/07 18:26:22 sjg Exp $");
MAKE_RCSID("$NetBSD: main.c,v 1.616 2024/05/19 17:55:54 sjg Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
Expand Down Expand Up @@ -1174,8 +1174,6 @@ InitDefSysIncPath(char *syspath)
else
syspath = bmake_strdup(syspath);

/* do NOT search .CURDIR first for .include <makefile> */
SearchPath_Add(defSysIncPath, ".DOTLAST");
for (start = syspath; *start != '\0'; start = p) {
for (p = start; *p != '\0' && *p != ':'; p++)
continue;
Expand Down
6 changes: 3 additions & 3 deletions contrib/bmake/parse.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 rillig Exp $ */
/* $NetBSD: parse.c,v 1.723 2024/05/19 20:09:40 sjg Exp $ */

/*
* Copyright (c) 1988, 1989, 1990, 1993
Expand Down Expand Up @@ -121,7 +121,7 @@
#include "pathnames.h"

/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 rillig Exp $");
MAKE_RCSID("$NetBSD: parse.c,v 1.723 2024/05/19 20:09:40 sjg Exp $");

/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
Expand Down Expand Up @@ -1269,7 +1269,7 @@ IncludeFile(const char *file, bool isSystem, bool depinc, bool silent)
if (fullname == NULL) {
SearchPath *path = Lst_IsEmpty(&sysIncPath->dirs)
? defSysIncPath : sysIncPath;
fullname = Dir_FindFile(file, path);
fullname = Dir_FindInclude(file, path);
}

if (fullname == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion contrib/bmake/unit-tests/deptgt-phony.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Expanding "depsrc-phony-pr-15164-*-wildcard"...
Expanding "deptgt-phony-pr-15164-*-wildcard"...
Searching for .depend ...
failed.
Searching for .depend ...[dot last]...
Searching for .depend ...
. ...
failed.
Wildcard expanding "all"...
Expand Down
1 change: 1 addition & 0 deletions contrib/libdiff/include/diff_main.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ struct diff_data {

/* Flags set by file atomizer. */
#define DIFF_ATOMIZER_FOUND_BINARY_DATA 0x00000001
#define DIFF_ATOMIZER_FILE_TRUNCATED 0x00000002

/* Flags set by caller of diff_main(). */
#define DIFF_FLAG_IGNORE_WHITESPACE 0x00000001
Expand Down
35 changes: 30 additions & 5 deletions contrib/libdiff/lib/diff_atomize_text.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/

#include <errno.h>
#include <setjmp.h>
#include <signal.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
Expand Down Expand Up @@ -122,10 +124,18 @@ diff_data_atomize_text_lines_fd(struct diff_data *d)
return DIFF_RC_OK;
}

static sigjmp_buf diff_data_signal_env;
static void
diff_data_signal_handler(int sig)
{
siglongjmp(diff_data_signal_env, sig);
}

static int
diff_data_atomize_text_lines_mmap(struct diff_data *d)
{
const uint8_t *pos = d->data;
struct sigaction act, oact;
const uint8_t *volatile pos = d->data;
const uint8_t *end = pos + d->len;
bool ignore_whitespace = (d->diff_flags & DIFF_FLAG_IGNORE_WHITESPACE);
bool embedded_nul = false;
Expand All @@ -136,8 +146,22 @@ diff_data_atomize_text_lines_mmap(struct diff_data *d)

ARRAYLIST_INIT(d->atoms, 1 << pow2);

sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = diff_data_signal_handler;
sigaction(SIGBUS, &act, &oact);
if (sigsetjmp(diff_data_signal_env, 0) > 0) {
/*
* The file was truncated while we were reading it. Set
* the end pointer to the beginning of the line we were
* trying to read, adjust the file length, and set a flag.
*/
end = pos;
d->len = end - d->data;
d->atomizer_flags |= DIFF_ATOMIZER_FILE_TRUNCATED;
}
while (pos < end) {
const uint8_t *line_end = pos;
const uint8_t *line_start = pos, *line_end = pos;
unsigned int hash = 0;

while (line_end < end && *line_end != '\r' && *line_end != '\n') {
Expand All @@ -164,15 +188,16 @@ diff_data_atomize_text_lines_mmap(struct diff_data *d)

*atom = (struct diff_atom){
.root = d,
.pos = (off_t)(pos - d->data),
.at = pos,
.len = line_end - pos,
.pos = (off_t)(line_start - d->data),
.at = line_start,
.len = line_end - line_start,
.hash = hash,
};

/* Starting point for next line: */
pos = line_end;
}
sigaction(SIGBUS, &oact, NULL);

/* File are considered binary if they contain embedded '\0' bytes. */
if (embedded_nul)
Expand Down
14 changes: 14 additions & 0 deletions contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/RISCVISAInfo.h"
#include "llvm/Support/TimeProfiler.h"
#include "llvm/Support/xxhash.h"
#include "llvm/TargetParser/Triple.h"
Expand Down Expand Up @@ -1059,6 +1060,19 @@
llvm::LLVMContext &Ctx = TheModule.getContext();
getModule().addModuleFlag(llvm::Module::Error, "target-abi",
llvm::MDString::get(Ctx, ABIStr));

// Add the canonical ISA string as metadata so the backend can set the ELF
// attributes correctly. We use AppendUnique so LTO will keep all of the
// unique ISA strings that were linked together.
const std::vector<std::string> &Features =
getTarget().getTargetOpts().Features;
auto ParseResult = llvm::RISCVISAInfo::parseFeatures(
Arch == llvm::Triple::riscv64 ? 64 : 32, Features);
if (!errorToBool(ParseResult.takeError()))

Check failure on line 1071 in contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)
getModule().addModuleFlag(
llvm::Module::AppendUnique, "riscv-isa",
llvm::MDNode::get(
Ctx, llvm::MDString::get(Ctx, (*ParseResult)->toString())));
}

if (CodeGenOpts.SanitizeCfiCrossDso) {
Expand Down
3 changes: 2 additions & 1 deletion contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@
if (Component == "builtins") {
SmallString<128> Path(getDriver().SysRoot);
llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a");
return std::string(Path);
if (getVFS().exists(Path))

Check failure on line 374 in contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)
return std::string(Path);

Check failure on line 375 in contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp

View workflow job for this annotation

GitHub Actions / Style Checker

parentheses required on return
}
SmallString<128> P(getDriver().ResourceDir);
std::string CRTBasename =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2510,6 +2510,7 @@
assert(FormatTok->is(tok::l_paren) && "'(' expected.");
auto *LeftParen = FormatTok;
bool SeenEqual = false;
bool MightBeFoldExpr = false;
const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace);
nextToken();
do {
Expand All @@ -2521,7 +2522,7 @@
parseChildBlock();
break;
case tok::r_paren:
if (!MightBeStmtExpr && !Line->InMacroBody &&
if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody &&
Style.RemoveParentheses > FormatStyle::RPS_Leave) {
const auto *Prev = LeftParen->Previous;
const auto *Next = Tokens->peekNextToken();
Expand Down Expand Up @@ -2564,6 +2565,10 @@
parseBracedList();
}
break;
case tok::ellipsis:

Check failure on line 2568 in contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp

View workflow job for this annotation

GitHub Actions / Style Checker

spaces required around that ':' (ctx:VxE)
MightBeFoldExpr = true;
nextToken();
break;
case tok::equal:
SeenEqual = true;
if (Style.isCSharp() && FormatTok->is(TT_FatArrow))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@
: Cell);
// Go to the next non-comment and ensure there is a break in front
const auto *NextNonComment = C.Tok->getNextNonComment();
while (NextNonComment->is(tok::comma))
while (NextNonComment && NextNonComment->is(tok::comma))

Check failure on line 1469 in contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (8, 10)
NextNonComment = NextNonComment->getNextNonComment();
auto j = i;
while (Changes[j].Tok != NextNonComment && j < End)
Expand Down
Loading
Loading