Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 91 insertions, 59 deletions

diff --git a/share/mk/check/_.mk b/share/mk/check/_.mk
index 6326d1f..0a20317 100644
--- a/share/mk/check/_.mk
+++ b/share/mk/check/_.mk
@@ -1,18 +1,13 @@
-########################################################################
-# Copyright 2023, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
+# Copyright 2023-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
 ifndef MAKEFILE_CHECK_INCLUDED
 MAKEFILE_CHECK_INCLUDED := 1
 
 
-check := check-catman
-
-
 .PHONY: check
-check: $(check);
+check: check-catman;
 
 
 endif  # include guard
diff --git a/share/mk/check/catman.mk b/share/mk/check/catman.mk
deleted file mode 100644
index 8a0d3b6..0000000
--- a/share/mk/check/catman.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-########################################################################
-# Copyright 2021-2023, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
-
-
-ifndef MAKEFILE_CHECK_CATMAN_INCLUDED
-MAKEFILE_CHECK_CATMAN_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/catman.mk
-include $(MAKEFILEDIR)/check/_.mk
-include $(MAKEFILEDIR)/src.mk
-
-
-DEFAULT_COLFLAGS := \
-	-b \
-	-p \
-	-x
-EXTRA_COLFLAGS   :=
-COLFLAGS         := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS)
-COL              := col
-
-
-_CHECK_catman_grep := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.grep,$(NONSO_MAN) $(NONSO_MDOC))
-_CHECK_catman := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.check-catman.touch,$(NONSO_MAN) $(NONSO_MDOC))
-
-
-$(_CHECK_catman_grep): %.grep: % | $$(@D)/
-	$(info	COL	$@)
-	$(COL) $(COLFLAGS) <$< >$@
-
-$(_CHECK_catman): %.check-catman.touch: %.cat.grep | $$(@D)/
-	$(info	GREP	$@)
-	! $(GREP) -n '.\{$(MANWIDTH)\}.' $< /dev/null >&2
-	touch $@
-
-
-.PHONY: check-catman-col
-check-catman-col: $(_CHECK_catman_grep);
-
-.PHONY: check-catman-grep
-check-catman-grep: $(_CHECK_catman);
-
-.PHONY: check-catman
-check-catman: check-catman-grep;
-
-
-endif  # include guard
diff --git a/share/mk/check/catman/_.mk b/share/mk/check/catman/_.mk
new file mode 100644
index 0000000..b9bf5a1
--- /dev/null
+++ b/share/mk/check/catman/_.mk
@@ -0,0 +1,13 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CHECK_CATMAN_INCLUDED
+MAKEFILE_CHECK_CATMAN_INCLUDED := 1
+
+
+.PHONY: check-catman
+check-catman: check-catman-grep;
+
+
+endif  # include guard
diff --git a/share/mk/check/catman/col.mk b/share/mk/check/catman/col.mk
new file mode 100644
index 0000000..59104fa
--- /dev/null
+++ b/share/mk/check/catman/col.mk
@@ -0,0 +1,25 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CHECK_CATMAN_COL_INCLUDED
+MAKEFILE_CHECK_CATMAN_COL_INCLUDED := 1
+
+
+include $(MAKEFILEDIR)/build/catman/grotty.mk
+include $(MAKEFILEDIR)/configure/build-depends/bsdextrautils.mk
+
+
+_CHECK_catman_grep := $(patsubst %.cat,%.cat.grep,$(_CATMAN))
+
+
+$(_CHECK_catman_grep): %.grep: % $(MK) | $$(@D)/
+	$(info	$(INFO_)COL		$@)
+	$(COL) $(COLFLAGS) <$< >$@
+
+
+.PHONY: check-catman-col
+check-catman-col: $(_CHECK_catman_grep);
+
+
+endif  # include guard
diff --git a/share/mk/check/catman/grep.mk b/share/mk/check/catman/grep.mk
new file mode 100644
index 0000000..fbf99bc
--- /dev/null
+++ b/share/mk/check/catman/grep.mk
@@ -0,0 +1,50 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CHECK_CATMAN_GREP_INCLUDED
+MAKEFILE_CHECK_CATMAN_GREP_INCLUDED := 1
+
+
+include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep.mk
+include $(MAKEFILEDIR)/configure/build-depends/man.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
+
+
+_XFAIL_CHECK_catman := \
+	$(_MANDIR)/man1/memusage.1.check-catman.touch \
+	$(_MANDIR)/man3/mallopt.3.check-catman.touch \
+	$(_MANDIR)/man4/smartpqi.4.check-catman.touch \
+	$(_MANDIR)/man4/veth.4.check-catman.touch \
+	$(_MANDIR)/man5/proc_buddyinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_fdinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_maps.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_mountinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_net.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_timer_stats.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_version.5.check-catman.touch \
+	$(_MANDIR)/man5/slabinfo.5.check-catman.touch \
+	$(_MANDIR)/man7/keyrings.7.check-catman.touch \
+	$(_MANDIR)/man7/string_copying.7.check-catman.touch \
+	$(_MANDIR)/man7/uri.7.check-catman.touch
+
+
+_CHECK_catman := $(patsubst %.cat.grep,%.check-catman.touch,$(_CHECK_catman_grep))
+ifeq ($(SKIP_XFAIL),yes)
+_CHECK_catman := $(filter-out $(_XFAIL_CHECK_catman), $(_CHECK_catman))
+endif
+
+
+$(_CHECK_catman): %.check-catman.touch: %.cat.grep $(MK) | $$(@D)/
+	$(info	$(INFO_)GREP		$@)
+	! $(GREP) -n '.\{$(MANWIDTH)\}.' $< /dev/null >&2
+	$(TOUCH) $@
+
+
+.PHONY: check-catman-grep
+check-catman-grep: $(_CHECK_catman);
+
+
+endif  # include guard