Date: Sun, 19 Jan 2025 22:21:39 +0100 From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: Cy Schubert <Cy.Schubert@cschubert.com>, Craig Leres <leres@freebsd.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 700c2258225c - main - net/rsync: unbreak tests Message-ID: <5c5f5416-b2b4-4e36-9e2b-7931bae1057f@FreeBSD.org> In-Reply-To: <20250119193349.E4564150@slippy.cwsent.com> References: <202501182258.50IMwgoG061729@gitrepo.freebsd.org> <f9ef5ed6-fc06-4c77-b3ff-6a118ae0095f@freebsd.org> <20250119193349.E4564150@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 19/01/25 20:33, Cy Schubert wrote: > In message <f9ef5ed6-fc06-4c77-b3ff-6a118ae0095f@freebsd.org>, Craig Leres > writ > es: >> On 1/18/25 14:58, Rodrigo Osorio wrote: >>> The branch main has been updated by rodrigo: >>> >>> URL: https://cgit.FreeBSD.org/ports/commit/?id=700c2258225cad2af7acea589f4e >> a93c25ba3be5 >>> commit 700c2258225cad2af7acea589f4ea93c25ba3be5 >>> Author: Rodrigo Osorio <rodrigo@FreeBSD.org> >>> AuthorDate: 2025-01-18 22:45:16 +0000 >>> Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> >>> CommitDate: 2025-01-18 22:50:22 +0000 >>> >>> net/rsync: unbreak tests >>> >>> Fix rsync tests broken by upstream changes since 3.4.0. >>> Issue reported to upstream. >> This breaks patching for me. It also breaks "make test". >> >> Removing the patch-t_stub.c solves this (include "make test" with 40 >> passed and 6 skipped). >> >> Craig >> >> =======================<phase: patch >============================ >> ===== env: NO_DEPENDS=yes USER=root UID=0 GID=0 >> ===> Patching for rsync-3.4.1_1 >> ===> Applying FreeBSD patches for rsync-3.4.1_1 from >> /usr/ports/net/rsync/files >> 1 out of 1 hunks failed--saving rejects to t_stub.c.rej >> ===> FAILED Applying FreeBSD patch-t_stub.c >> ===> FAILED to apply cleanly FreeBSD patch(es) patch-t_stub.c >> *** Error code 1 >> > No such problem here. > > Hi, Make test was broken by upstream 2 weeks ago before releasing 3.4.0, because the additional patches are not in sync with the latest improvements done in rsync. I apologize if my first fix causes build breakage for peoples using a custom configuration without fileflags option enabled. Regarding postmaster and synth users, I suspect those tools don't apply the patches in the same order poudriere does, and that's probably why their port upgrade fail. I just push a fix for those use cases, removing the patch-t_stub.c and fixing the fileflags patch in the pre-patch stage, and removing the broken "int module_dirlen" declaration. Let me know if you still finding issues with rsyn All the best -- rodrigo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5c5f5416-b2b4-4e36-9e2b-7931bae1057f>