On Mon, Dec 29, 2025 at 09:03:29PM +0000, Douglas Silva wrote:
> After messing it up, I had to reset the syncthing port folder and start over,
> but the latest diff is not applying cleanly. Everything in
> "net/syncthing/patches/" is being rejected.

I can confirm that both my patch applies, and `make patch` succeeds with my
patch applied, so I think it's a local issue for you.

Check my patch applies with a dry run, i.e. `patch -CEsp0 < /path/to/my/diff`.

Then when you see there are no errors, actually apply it with
`patch -Esp0 < /path/to/my/diff`.

Then `make patch` should work.

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk