From nobody Wed Jan 15 16:16:52 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YYB2s03Pyz5kKBY; Wed, 15 Jan 2025 16:16:53 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYB2r4HY3z3vJ9; Wed, 15 Jan 2025 16:16:52 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736957812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KFfz70CPwGRhT74lHl71y7gf3cHG6gL2nqtfekhm0Q0=; b=LOtqOdeVwe5/JsxZr2/DRUqLRsCqz/cId5qocd0W6thcxrP5eXJwo62SDcB3b6aDnL8Dbo A19NvXCMlW1KGZ1Dwj9z5f0D0eWIr4V9Rmju8qxdsbN+1IKWcAXWsHoRnp2nlRK+KcwcJ5 IWN6pePZf/w4wjtrCPN4fqY3/hIA4nalxlAVaFdKqT5TNL33I/S1gO8keanrf6nvFDPhtS xdR1Pj+JnDLO9UZI0OiM5yf8eq6y6G7k0f4zhnxUcP1wK0zEJe8fTgJn4eElKmI/97utdW jQc4E27MMR4Znuw322YUE1YbCF97qTj6e1dNvjgxY5e5j8yoxxGM7vkYqDtIcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736957812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KFfz70CPwGRhT74lHl71y7gf3cHG6gL2nqtfekhm0Q0=; b=Hq42+BGwwH8LRhqCCtepn5NFfpJoirgD4/feYCVyleWvB5HPdqxHiPaK1vcJq993g2wIyY tXDPn0DozBNnNoOlzabvZ1lDZ+o5UqD15id6Y5pj/X+EDdzzrq7GrQYZo4D3OBZCSspgf8 Kd/5u57D6+w7c3YO9l5dqRAUG0ho6TLzknn3z/Gho7ro5t2E1HKwJ7Ye7XugOMCLoA6piA mZyN6ZcLsF+mvzTjQno22cOYQb3zQn7wZ0wxTcws5VBfL9TJ/kdaQ+WVvFfmh4M2dcjr7C mLXOlxXXxu5NzGykFkGfdzs2IEsyayJzWjsKfeQuHkFLBPtf3djNB5wyARzHvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736957812; a=rsa-sha256; cv=none; b=oy+1+ipFSW+TzUo73eqIDMmw1n6RwU3e5wclJah3HPwESbjokM/7ENtD2JnW5jT/vANBY2 l2gybAlRQjUWD90QgY1c01VsL5E4phrBiV+2AXvqPTDmtqIt4lBAA6pnCkSekDJtFreZhI qr3O6ektnfLFNn1B4L0GEFCx6yk5AxGCmLHgPjNmNIOxZkb6KqoP+2XQVGo4jfCthT0onX LAl6CNbToRDlL08QB9OJWWcLIzWaq971Cow+qkqtQKLLHTXUZ3q2k3ma91on2F6GqtF+1r kt1qEHfT8Yg0wgbIkGHZqH7WOa4i8u+dPGK7/Jozaf3N0SeBABDRGzlzdPeswg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 975) id 7575013D5D; Wed, 15 Jan 2025 16:16:52 +0000 (UTC) Date: Wed, 15 Jan 2025 16:16:52 +0000 From: "Sergey A. Osokin" To: Cy Schubert Cc: Rodrigo Osorio , 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: 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> List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250115155051.5517D22F@slippy.cwsent.com> 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 > > > > > > AuthorDate: 2025-01-14 23:21:25 +0000 > > > > > > Commit: Rodrigo Osorio > > > > > > 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 > 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