The branch master has been updated via d2b610bc453351c8b9dd50a7da2c2fcbe03c58d5 (commit) from 15c3d9188ef04d9d3d4b98088d641163390a5e03 (commit)
- Log ----------------------------------------------------------------- commit d2b610bc453351c8b9dd50a7da2c2fcbe03c58d5 Author: Richard Levitte <levi...@openssl.org> Date: Mon Jan 25 14:11:13 2021 +0100 Fix bin/mk-manpages3 to handle spurious & in the description We have some pages that emit < and > in the NAMES description in the HTML output. However, we're using sed to massage a template with that description, and & happens to be significant. Therefore, it needs being explicitly escaped. Partially fixes openssl/openssl#13949 Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/web/pull/214) ----------------------------------------------------------------------- Summary of changes: bin/mk-manpages3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mk-manpages3 b/bin/mk-manpages3 index dba2772..5c83583 100755 --- a/bin/mk-manpages3 +++ b/bin/mk-manpages3 @@ -18,7 +18,7 @@ srcdir=tmp/doc/html $HERE/strip-man-html < $srcdir/$F > $destdir/$G section=$(basename $Dn | sed -e 's|^man||') - description="$($HERE/all-html-man-names < $destdir/$G | sed 's|^.* - ||')" + description="$($HERE/all-html-man-names < $destdir/$G | sed -e 's|^.* - ||' -e 's|\&|\\\&|g')" names="$($HERE/all-html-man-names < $destdir/$G | sed -e 's| - .*||' -e 's|, *| |g' -e 's|/|-|g')" for name in $names; do G=$Dn/$name.html