Bug 263787 - net/rsync: fix man page mangling
Summary: net/rsync: fix man page mangling
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Rodrigo Osorio
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-05-05 08:19 UTC by Rodrigo Osorio
Modified: 2022-05-08 11:13 UTC (History)
2 users (show)

See Also:


Attachments
Fix post-patch issue (560 bytes, patch)
2022-05-05 08:19 UTC, Rodrigo Osorio
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Rodrigo Osorio freebsd_committer freebsd_triage 2022-05-05 08:19:36 UTC
Created attachment 233738 [details]
Fix post-patch issue

Received by private e-mail from jamie@catflap.org

Hi, I notice that in the man pages for rsync(1) and rsyncd.conf(5),
files such as /etc/passwd and /etc/services are renamed to
/usr/local/etc/rsync/passwd and /usr/local/etc/rsync/services

In addition, the example path for "letsencrypt" is modified to
/usr/local/etc/rsync/

This patch fixes things.

Cheers, Jamie
Comment 1 Jamie Landeg-Jones 2022-05-05 10:08:22 UTC
(In reply to Rodrigo Osorio from comment #0)

Thank-you for creating this!

In case anyone is wondering, the reason I added the .md files to the patch is that if the right dependencies are installed (python, textproc/py-cmarkgfm, etc.) then the rsync install script rebuilds the html and man pages using the script md-convert in the source directory.

Another issue, python has been added to the dependency list for rsync. Python is not required for rsync -- it is currently required to build dependency zstd (but that's another issue that can be changed) - but zstd itself therefore has the python dependency.

If Zstd is already installed, or has been installed another way, rsync builds and runs without needing python installed.

Cheers, Jamie
Comment 2 Christos Chatzaras 2022-05-07 10:14:50 UTC
Hello Rodrigo,

I just notice the "issue" with python38 dependency too.

When I upgrade ports I always do `pkg autoremove` at the end which removes unused ports.

Is it planned python38 runtime dependency removed?
Comment 3 Rodrigo Osorio freebsd_committer freebsd_triage 2022-05-07 12:55:46 UTC
Hi Christos,

Yes, I will proceed to a fix the previous commit this weekend.

Cheers,
-- rodrigo
Comment 4 commit-hook freebsd_committer freebsd_triage 2022-05-08 11:11:21 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=846e6c502da76de2a1c624aeb219898107fbffb5

commit 846e6c502da76de2a1c624aeb219898107fbffb5
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2022-05-08 09:21:44 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2022-05-08 11:00:37 +0000

    net/rsync: Fix unexpected changes caused by previous rsync commit

     * Remove python dependency introduced in last commit,
       we keep USES=python to fix the rrsync shebang but
       add PYTHON_NO_DEPENDS=yes since Python itself is
       not wanted. Add a pkg-message to notify users.
     * Fix patching issues on manpages and sample files
       which abusively transformes all etc paths into
       /usr/local/etc.
     * Install missing rrsync manpage

     Also add forgotten items in last commit
      * version 3.2.4 fixes CVE-2018-25032 in bundled zlib
      * remove upstreamed patch to fix time limit options (patch-io.c)

    PR:             263787
    PR:             263794
    Reported by:    <jamie@catflap.org>
    Reported by:    <freebsd@oldach.net>
    Security:       CVE-2018-25032 in the bundled zlib

 net/rsync/Makefile          | 8 ++++++--
 net/rsync/pkg-message (new) | 8 ++++++++
 net/rsync/pkg-plist         | 1 +
 3 files changed, 15 insertions(+), 2 deletions(-)
Comment 5 Rodrigo Osorio freebsd_committer freebsd_triage 2022-05-08 11:13:25 UTC
Fix for REINPLACE_CMD on manpages and sample files committed
and python dependency removed. Thanks for your help.

Cheers,
-- rodrigo