Github messages for voidlinux
 help / color / mirror / Atom feed
From: meator <meator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] man-pages: fix links to moved manpages
Date: Mon, 21 Feb 2022 08:37:51 +0100	[thread overview]
Message-ID: <20220221073751.8Fiw4lVPSdWBNBDN9uOg2SZJl2Zy2ewHQw-ZotGDbFM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35492@inbox.vuxu.org>

[-- 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}

  parent reply	other threads:[~2022-02-21  7:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-09 17:31 [PR PATCH] " meator
2022-02-20 21:48 ` [PR REVIEW] " paper42
2022-02-21  7:37 ` meator [this message]
2022-02-21  7:40 ` meator
2022-02-21 15:04 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220221073751.8Fiw4lVPSdWBNBDN9uOg2SZJl2Zy2ewHQw-ZotGDbFM@z \
    --to=meator@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).