I make the description for future references, but apply this patch to the tree as soon as possible to show information in webpage instead of asciidoc code in Phabricator.
The rule to include SA into the relnotes.adoc: the commit of the SA
- MUST BE INCLUDED into the curreent release branch (releng/14.4 in our case)
AND
- MUST NOT BE INCLUDED into the release tag (tag - not branch) of the previous release (refs/tags/release/14.3.0 in our case).
The same information in this text applyes to the EN.
The SA announcement text has branch and commits list in the section "VI Correction details", f.e:
Branch/path Hash Revision - ------------------------------------------------------------------------- stable/14/ 5cf27a49a2de stable/14-n271423
Our branch connected to stable/14, we have to check commit hash 5cf27a49a2de.
Code to check by command git merge-base --is-ancestor :
sh
#!/usr/bin/env sh
git merge-base --is-ancestor "$1" releng/14.4
in_new=$?
git merge-base --is-ancestor "$1" refs/tags/release/14.3.0
in_old=$?
if [ "$in_new" -eq 0 ] && [ "$in_old" -ne 0 ]; then
echo "INCLUDE SA in relnotes"
else
echo "DO NOT include SA"
fiThe tool to make this work and generate SA and EN list in relnotes format https://github.com/freebsd-doc-ru/freebsd-relnotes :
tools/relnotes/bin/relnotes_advisories.pl , if you are curious