Date: Sun, 19 Jan 2025 21:00:14 +0100 From: Rainer Hurling <rhurlin@gwdg.de> To: Cy Schubert <Cy.Schubert@cschubert.com>, Craig Leres <leres@freebsd.org> Cc: Rodrigo Osorio <rodrigo@FreeBSD.org>, <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: <503262c8-58c9-45f9-addf-f791c1193d4b@gwdg.de> 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
Am 19.01.25 um 20:33 schrieb Cy Schubert: > 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 >> This happens for me with non-default OPTION 'RENAMED' enabled, instead of 'FLAGS'. > > No such problem here. > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?503262c8-58c9-45f9-addf-f791c1193d4b>