From 591310ce35f4e3dd34606b34eb4e8daa8fe8ada9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 1/4] Prevent splitting GitLab identifiers across lines GitLab issue and merge request numbers placed in release notes (in the form of "#1234" for issues and "!5678" for merge requests) should not be split across two lines. Extend the shell pipeline generating doc/arm/notes.txt with a sed invocation which prevents such splitting. (cherry picked from commit 2d00143ab161aba573649c445603bab72ad82e25) --- doc/arm/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in index d1cdc81db8..e1f5b4e330 100644 --- a/doc/arm/Makefile.in +++ b/doc/arm/Makefile.in @@ -61,10 +61,16 @@ notes.pdf: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml notevers ${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \ ${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf - +# Produce notes.txt from notes.html using w3m, with some post-processing: +# +# - remove trailing spaces from every line, +# - remove empty lines from the end of the document, +# - prevent GitLab issue/MR identifiers from being split across two lines. notes.txt: notes.html ${W3M} -dump -cols 75 -O ascii -T text/html < notes.html | \ sed 's/ *$$//' | \ - sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' > notes.txt + sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' | \ + sed '/ [!#]$$/{N;s| \([!#]\)\(\n\s*\)\([0-9][0-9]*\)|\2\1\3|;};' > notes.txt # use xmllint to process include Bv9ARM.html: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml From 73a109ef6eb6b3510cd628aeb5448bff5ded08ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 2/4] Fix whitespace in release notes (cherry picked from commit b2f3eaf188b754ddef0b91644784831fb99d9f67) --- doc/arm/notes-9.11.14.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/arm/notes-9.11.14.xml b/doc/arm/notes-9.11.14.xml index 25d5b1f8ef..70331fa5a8 100644 --- a/doc/arm/notes-9.11.14.xml +++ b/doc/arm/notes-9.11.14.xml @@ -21,8 +21,8 @@ - Fixed several possible race conditions discovered by Thread - Sanitizer. + Fixed several possible race conditions discovered by + ThreadSanitizer. From bd7fba05d10e7b33be937874fbe1e1a2879fcd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 3/4] Fix minor CHANGES issues (cherry picked from commit 56f388cae19662be1b224fc154365d327a06e76c) --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ace40d7a0f..cf8e3fe5d3 100644 --- a/CHANGES +++ b/CHANGES @@ -16,7 +16,7 @@ dropped because the recursive-clients quota was exceeded. [GL #1399] -5326. [bug] Add python dependancy on 'distutils.core' to configure. +5326. [bug] Add Python dependency on 'distutils.core' to configure. 'distutils.core' is required for installation. [GL #1397] From c473831b736f6dfec2fa4d657bf97fdc6072c7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 4/4] Fix grammar nit in README --- README | 8 ++++---- README.md | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 1901add3d7..019845696c 100644 --- a/README +++ b/README @@ -352,10 +352,10 @@ BUILD_CPPFLAGS CPPFLAGS for the target system during cross-compiling. BUILD_LDFLAGS LDFLAGS for the target system during cross-compiling. BUILD_LIBS LIBS for the target system during cross-compiling. -On platforms where neither C11 Atomic operations library nor custom ISC -atomic operations are available, updating the statistics counters is not -locked due to performance reasons and therefore the counters might be -inaccurate. Anybody building BIND 9 is strongly advised to use a modern +On platforms where neither the C11 Atomic operations library nor custom +ISC atomic operations are available, updating the statistics counters is +not locked due to performance reasons and therefore the counters might be +inaccurate. Anybody building BIND 9 is strongly advised to use a modern C11 compiler with C11 Atomic operations library support. macOS diff --git a/README.md b/README.md index c6904b17c3..ec82fcad22 100644 --- a/README.md +++ b/README.md @@ -361,11 +361,11 @@ affect compilation: |`BUILD_LDFLAGS`|`LDFLAGS` for the target system during cross-compiling.| |`BUILD_LIBS`|`LIBS` for the target system during cross-compiling.| -On platforms where neither C11 Atomic operations library nor custom ISC atomic -operations are available, updating the statistics counters is not locked due to -performance reasons and therefore the counters might be inaccurate. Anybody -building BIND 9 is strongly advised to use a modern C11 compiler with C11 Atomic -operations library support. +On platforms where neither the C11 Atomic operations library nor custom ISC +atomic operations are available, updating the statistics counters is not +locked due to performance reasons and therefore the counters might be +inaccurate. Anybody building BIND 9 is strongly advised to use a modern +C11 compiler with C11 Atomic operations library support. #### macOS