[PR PATCH] mdocml: fix behavior when localized man pages are present.

[PR PATCH] mdocml: fix behavior when localized man pages are present.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 2369 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages mandoc
https://github.com/void-linux/void-packages/pull/28252

mdocml: fix behavior when localized man pages are present.
Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$LANG/man*" directories are also indexed, which can
lead, as shown in #28146, to `man w3m` displaying a localized man page
instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28252.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mandoc-28252.patch --]
[-- Type: text/x-diff, Size: 2152 bytes --]

From be343a1002d18250db6fcc0fcd80ad050f056c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:33:09 -0300
Subject: [PATCH] mdocml: fix behavior when localized man pages are present.

Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$LANG/man*" directories are also indexed, which can
lead, as shown in #28146, to `man w3m` displaying a localized man page
instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146
---
 srcpkgs/mdocml/INSTALL                     | 2 +-
 srcpkgs/mdocml/files/makewhatis.cron.daily | 3 +--
 srcpkgs/mdocml/template                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mdocml/INSTALL b/srcpkgs/mdocml/INSTALL
index 36be63101b7..7aa787b70f0 100644
--- a/srcpkgs/mdocml/INSTALL
+++ b/srcpkgs/mdocml/INSTALL
@@ -1,6 +1,6 @@
 case "$ACTION" in
 post)
 	echo "Regenerating man db..."
-	usr/bin/makewhatis -a -Tutf8
+	usr/bin/makewhatis -Tutf8
 	;;
 esac
diff --git a/srcpkgs/mdocml/files/makewhatis.cron.daily b/srcpkgs/mdocml/files/makewhatis.cron.daily
index ee334fa94f4..efe892e39fe 100755
--- a/srcpkgs/mdocml/files/makewhatis.cron.daily
+++ b/srcpkgs/mdocml/files/makewhatis.cron.daily
@@ -1,3 +1,2 @@
 #!/bin/sh
-makewhatis -a -Tutf8
-exit $?
+exec makewhatis -Tutf8
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index d5759e2aefe..366c1f9180f 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.5
-revision=6
+revision=7
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

Re: [PR PATCH] [Updated] mdocml: fix behavior when localized man pages are present.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 2374 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages mandoc
https://github.com/void-linux/void-packages/pull/28252

mdocml: fix behavior when localized man pages are present.
Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$LANG/man*" directories are also indexed, which can
lead, as shown in #28146, to `man w3m` displaying a localized man page
instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28252.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mandoc-28252.patch --]
[-- Type: text/x-diff, Size: 2157 bytes --]

From d7bc9b8bead7e9d131052fec9490648c2e232930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:33:09 -0300
Subject: [PATCH] mdocml: fix behavior when localized man pages are present.

Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$some_lang/man*" directories are also indexed, which
can lead, as shown in #28146, to `man w3m` displaying a localized man
page instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146
---
 srcpkgs/mdocml/INSTALL                     | 2 +-
 srcpkgs/mdocml/files/makewhatis.cron.daily | 3 +--
 srcpkgs/mdocml/template                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mdocml/INSTALL b/srcpkgs/mdocml/INSTALL
index 36be63101b7..7aa787b70f0 100644
--- a/srcpkgs/mdocml/INSTALL
+++ b/srcpkgs/mdocml/INSTALL
@@ -1,6 +1,6 @@
 case "$ACTION" in
 post)
 	echo "Regenerating man db..."
-	usr/bin/makewhatis -a -Tutf8
+	usr/bin/makewhatis -Tutf8
 	;;
 esac
diff --git a/srcpkgs/mdocml/files/makewhatis.cron.daily b/srcpkgs/mdocml/files/makewhatis.cron.daily
index ee334fa94f4..efe892e39fe 100755
--- a/srcpkgs/mdocml/files/makewhatis.cron.daily
+++ b/srcpkgs/mdocml/files/makewhatis.cron.daily
@@ -1,3 +1,2 @@
 #!/bin/sh
-makewhatis -a -Tutf8
-exit $?
+exec makewhatis -Tutf8
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index d5759e2aefe..366c1f9180f 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.5
-revision=6
+revision=7
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

Re: [PR PATCH] [Merged]: mdocml: fix behavior when localized man pages are present.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]

There's a merged pull request on the void-packages repository

mdocml: fix behavior when localized man pages are present.
https://github.com/void-linux/void-packages/pull/28252

Description:
Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$LANG/man*" directories are also indexed, which can
lead, as shown in #28146, to `man w3m` displaying a localized man page
instead of the default english one from /usr/share/man/man1/w3m.1.

Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.

Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.

Fixes #28146

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->