[PR PATCH] man-pages: fix links to moved manpages

[PR PATCH] man-pages: fix links to moved manpages

[meator]

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

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

https://github.com/meator/void-packages man-pages
https://github.com/void-linux/void-packages/pull/35492

man-pages: fix links to moved manpages
The template file renames `rand.3` and `err.3` to `glibc-rand.3` and `glibc-err.3` to resolve conflict with openssl manpages, but it doesn't fix manpages linking to the old version. These manpages (`warnx(3)`, `srand(3)` ...) then won't know where the manpages are. This PR redirects them to the renamed version.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

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

From 9d1b08bbdfb477c3a536717ebf9be396f5096231 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Wed, 9 Feb 2022 18:19:42 +0100
Subject: [PATCH] man-pages: fix links to moved manpages

The template file renames rand.3 and err.3 to glibc-rand.3 and
glibc-err.3 to resolve conflict with openssl manpages, but it
doesn't fix manpages linking to the old version. These manpages then
won't know where the manpages are. This commit redirects them to the
renamed version.
---
 srcpkgs/man-pages/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 8386f6492f94..127c95e2dc51 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,7 +1,7 @@
 # Template file for 'man-pages'
 pkgname=man-pages
 version=5.13
-revision=1
+revision=2
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -37,6 +37,8 @@ do_install() {
 	# openssl-devel
 	mv man3/rand.3 man3/glibc-rand.3
 	mv man3/err.3 man3/glibc-err.3
+	# Fix references to these manpages
+	sed -i -e "s|.so man3/rand.3|.so man3/glibc-rand.3|" -e "s|.so man3/err.3|.so man3/glibc-err.3|" man3/*
 	# Rename some glibc specific manpages
 	mv man1/{iconv.1,glibc-iconv.1}
 	mv man1/{ldd.1,glibc-ldd.1}

Re: [PR REVIEW] man-pages: fix links to moved manpages

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35492#discussion_r810689371

Comment:
Please wrap this at 80 columns.

Re: [PR PATCH] [Updated] man-pages: fix links to moved manpages

[meator]

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

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

https://github.com/meator/void-packages man-pages
https://github.com/void-linux/void-packages/pull/35492

man-pages: fix links to moved manpages
The template file renames `rand.3` and `err.3` to `glibc-rand.3` and `glibc-err.3` to resolve conflict with openssl manpages, but it doesn't fix manpages linking to the old version. These manpages (`warnx(3)`, `srand(3)` ...) then won't know where the manpages are. This PR redirects them to the renamed version.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

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

From bf96ac3051e9a0731c9aace4122a02f2780e652a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Wed, 9 Feb 2022 18:19:42 +0100
Subject: [PATCH] man-pages: fix links to moved manpages

The template file renames rand.3 and err.3 to glibc-rand.3 and
glibc-err.3 to resolve conflict with openssl manpages, but it
doesn't fix manpages linking to the old version. These manpages then
won't know where the manpages are. This commit redirects them to the
renamed version.
---
 srcpkgs/man-pages/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 8386f6492f94..0422ff053de2 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,7 +1,7 @@
 # Template file for 'man-pages'
 pkgname=man-pages
 version=5.13
-revision=1
+revision=2
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -37,6 +37,9 @@ do_install() {
 	# openssl-devel
 	mv man3/rand.3 man3/glibc-rand.3
 	mv man3/err.3 man3/glibc-err.3
+	# Fix references to these manpages
+	sed -i -e "s|.so man3/rand.3|.so man3/glibc-rand.3|" \
+	 -e "s|.so man3/err.3|.so man3/glibc-err.3|" man3/*
 	# Rename some glibc specific manpages
 	mv man1/{iconv.1,glibc-iconv.1}
 	mv man1/{ldd.1,glibc-ldd.1}

Re: [PR REVIEW] man-pages: fix links to moved manpages

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/35492#discussion_r810846314

Comment:
Done.

Re: [PR PATCH] [Merged]: man-pages: fix links to moved manpages

[paper42]

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

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

man-pages: fix links to moved manpages
https://github.com/void-linux/void-packages/pull/35492

Description:
The template file renames `rand.3` and `err.3` to `glibc-rand.3` and `glibc-err.3` to resolve conflict with openssl manpages, but it doesn't fix manpages linking to the old version. These manpages (`warnx(3)`, `srand(3)` ...) then won't know where the manpages are. This PR redirects them to the renamed version.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**