Update warning regex for groff 1.23.0

Closes: #1041847

5 files changed, 42 insertions, 3 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index a8871c62..967a094b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-0a730625ad4880fdd63fc21efb1b18966042c2f4
-0a730625ad4880fdd63fc21efb1b18966042c2f4
+03cb2017b3b4ec5013f0413821420e21a5ffb3b7
+03cb2017b3b4ec5013f0413821420e21a5ffb3b7
 0a730625ad4880fdd63fc21efb1b18966042c2f4
 0a730625ad4880fdd63fc21efb1b18966042c2f4
 man-db_2.11.2.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 4470546d..52f40a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+man-db (2.11.2-3) UNRELEASED; urgency=medium
+
+  * Cherry-pick from upstream:
+    - Update warning regex for groff 1.23.0 (closes: #1041847).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 24 Jul 2023 12:34:17 +0100
+
 man-db (2.11.2-2) unstable; urgency=medium
 
   * Add debconf translations:
diff --git a/debian/patches/groff-1.23.0-warnings.patch b/debian/patches/groff-1.23.0-warnings.patch
new file mode 100644
index 00000000..22f26974
--- /dev/null
+++ b/debian/patches/groff-1.23.0-warnings.patch
@@ -0,0 +1,31 @@
+From 03cb2017b3b4ec5013f0413821420e21a5ffb3b7 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Thu, 20 Jul 2023 00:18:59 +0100
+Subject: Update warning regex for groff 1.23.0
+
+Part of https://gitlab.com/man-db/man-db/-/issues/25.
+
+* man/check-man: groff 1.23.0 says "cannot break line" rather than
+"can't break line"; update regular expression.
+
+Origin: upstream, https://gitlab.com/man-db/man-db/-/commit/b12ffb9df7a6a8956b08206c36be70fac78508bd
+Last-Update: 2023-07-24
+
+Patch-Name: groff-1.23.0-warnings.patch
+---
+ man/check-man | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/check-man b/man/check-man
+index a58b7f9d..f8985a0d 100755
+--- a/man/check-man
++++ b/man/check-man
+@@ -31,7 +31,7 @@ errors="$(LC_ALL=C MANWIDTH=80 MAN_KEEP_FORMATTING=1 "$top_builddir/libtool" \
+ # Indeed, even for other languages we're going to get "cannot adjust line"
+ # if %manpath_config_file% expands to something long. Hmm. We'll just ignore
+ # this across the board for now.
+-errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|can't break line)")" || true
++errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|(can't|cannot) break line)")" || true
+ 
+ if [ "$code" != 0 ]; then
+ 	echo "man -E UTF-8 -l $1 failed with exit status $code and error output:"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..227f38b6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+groff-1.23.0-warnings.patch
diff --git a/man/check-man b/man/check-man
index a58b7f9d..f8985a0d 100755
--- a/man/check-man
+++ b/man/check-man
@@ -31,7 +31,7 @@ errors="$(LC_ALL=C MANWIDTH=80 MAN_KEEP_FORMATTING=1 "$top_builddir/libtool" \
 # Indeed, even for other languages we're going to get "cannot adjust line"
 # if %manpath_config_file% expands to something long. Hmm. We'll just ignore
 # this across the board for now.
-errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|can't break line)")" || true
+errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|(can't|cannot) break line)")" || true
 
 if [ "$code" != 0 ]; then
 	echo "man -E UTF-8 -l $1 failed with exit status $code and error output:"