Date: Wed, 15 Jan 2025 16:16:52 +0000 From: "Sergey A. Osokin" <osa@freebsd.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Rodrigo Osorio <rodrigo@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 0076d20a9671 - 2025Q1 - net/rsync: update to 3.4.0 Message-ID: <Z4ffdJ4cpX_ks6P4@FreeBSD.org> In-Reply-To: <20250115155051.5517D22F@slippy.cwsent.com> References: <202501150008.50F08gFm067796@gitrepo.freebsd.org> <20250115044157.4FB92114@slippy.cwsent.com> <20250115044542.02F9C2F@slippy.cwsent.com> <20250115052757.0111628C@slippy.cwsent.com> <20250115153146.221C01B6@slippy.cwsent.com> <20250115155051.5517D22F@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jan 15, 2025 at 07:50:51AM -0800, Cy Schubert wrote: > In message <20250115153146.221C01B6@slippy.cwsent.com>, Cy Schubert writes: > > In message <20250115052757.0111628C@slippy.cwsent.com>, Cy Schubert writes: > > > In message <20250115044542.02F9C2F@slippy.cwsent.com>, Cy Schubert writes: > > > > In message <20250115044157.4FB92114@slippy.cwsent.com>, Cy Schubert write > > s: > > > > > In message <202501150008.50F08gFm067796@gitrepo.freebsd.org>, Rodrigo > > > > > Osorio wr > > > > > ites: > > > > > > The branch 2025Q1 has been updated by rodrigo: > > > > > > > > > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=0076d20a96718a28f956cb3589f1036e48a75f04 > > > > > > > > > > > > commit 0076d20a96718a28f956cb3589f1036e48a75f04 > > > > > > Author: Rodrigo Osorio <rodrigo@FreeBSD.org> > > > > > > AuthorDate: 2025-01-14 23:21:25 +0000 > > > > > > Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> > > > > > > CommitDate: 2025-01-14 23:58:53 +0000 > > > > > > > > > > > > net/rsync: update to 3.4.0 [changes are skipped] > > > > > slippy# rsync -aHW --delete git-doc cwsys:`pwd` > > > > > ABORTING due to invalid path from sender: git-doc/website/shared > > > > > rsync error: requested action not supported (code 4) at flist.c(2693) > > > > > [generator=3.4.0] > > > > > slippy# > > > > > > > > > > Seems it can't handle symlinks anymore. > > > > > > > > Another error: > > > > > > > > slippy# rsync -aHW --delete git-src cwsys:`pwd` > > > > Internal hashtable error: illegal key supplied! > > > > rsync error: errors with program diagnostics (code 13) at hashtable.c(88) > > > > > > [generator=3.4.0] > > > > slippy# > > > > > > It's the -H (preserve hard links) flag that's causing the issue. Without > > > the -H flag rsync will behave live cp -r, creating a new file for each > > > symlink rather than linking them. Certainly an issue upstream will need to > > > resolve. > > > > I reported this upstream (https://github.com/RsyncProject/rsync/issues/702). > > They have a pull request. The bug is related to another. I expect this to > > be fixed shortly, probably resulting in a new point release. > > Here is a patch based on the pull request. It does fix the problem. > > >From 57184562019441b1c9246d1da04684e3ed9e8baf Mon Sep 17 00:00:00 2001 > From: Cy Schubert <cy@FreeBSD.org> > Date: Wed, 15 Jan 2025 07:46:31 -0800 > Subject: [PATCH] net/rsync: Fix FLAG_GOT_DIR_FLIST collission with > FLAG_HLINKED > > Obtained from: https://github.com/RsyncProject/rsync/pull/705 > Upstream issues: > https://github.com/RsyncProject/rsync/issues/702 > https://github.com/RsyncProject/rsync/issues/697 > --- > net/rsync/Makefile | 1 + > net/rsync/files/patch-rsync.h | 18 ++++++++++++++++++ > 2 files changed, 19 insertions(+) > create mode 100644 net/rsync/files/patch-rsync.h [patch skipped] I do believe that instead of adding a patch, it's better to update the port with the following changes (not tested): +PATCH_SITES= https://github.com/RsyncProject/rsync/commit/ +PATCHFILES= efb85fd8db9e8f74eb3ab91ebf44f6ed35e3da5b.patch:-p1 and update distinfo by `make makesum' command accordingly. -- Sergey A. Osokin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Z4ffdJ4cpX_ks6P4>