freebsd/freebsd-ports up to 7861d77 [1] was merged.
Additional changes due to conflicts:
A separate net/rsync31 was added that can be patched and compiled for CheriABI and the upstream version of net/rsync was restored. This change will allow us to avoid any future merge conflicts while we must stick to rsync 3.1.x for CheriABI.
Merged through August 26, 2022
freebsd/freebsd-ports up to 7861d77 [1] was merged.
Additional changes due to conflicts:
[1] https://github.com/freebsd/freebsd-ports/commit/7861d772201100fb7824fd98cfda05a068cd30b0