From nobody Sun Jan 19 21:21:39 2025 X-Original-To: dev-commits-ports-all@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 4YbmjN61Hmz5lk4R; Sun, 19 Jan 2025 21:25:44 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from smtp.osorio.me (mvd.osorio.me [37.187.111.94]) by mx1.freebsd.org (Postfix) with ESMTP id 4YbmjN270cz3DKp; Sun, 19 Jan 2025 21:25:44 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from [192.168.1.39] (lfbn-idf1-1-971-net.w86-238.abo.wanadoo.fr [86.238.50.0]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by smtp.osorio.me (Postfix) with ESMTPSA id 28FF7CB38E; Sun, 19 Jan 2025 21:25:52 +0000 (UTC) Message-ID: <5c5f5416-b2b4-4e36-9e2b-7931bae1057f@FreeBSD.org> Date: Sun, 19 Jan 2025 22:21:39 +0100 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 700c2258225c - main - net/rsync: unbreak tests To: Cy Schubert , Craig Leres Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202501182258.50IMwgoG061729@gitrepo.freebsd.org> <20250119193349.E4564150@slippy.cwsent.com> Content-Language: en-US From: Rodrigo Osorio In-Reply-To: <20250119193349.E4564150@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4YbmjN270cz3DKp X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:37.187.0.0/16, country:FR] On 19/01/25 20:33, Cy Schubert wrote: > In message , 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 >>> AuthorDate: 2025-01-18 22:45:16 +0000 >>> Commit: Rodrigo Osorio >>> 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 >> >> =================================================== >> ===== 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