Edd, I've followed your steps, but it's still failing. And it's not just your
last diff, it's all of the diffs I've posted as well. Nothing applies
successfully here.
Do you have any local changes when you apply the diff? Because that's my
starting point: I start with a clean syncthing port directory straight out of
the repository.
My exact steps:
1. `cd` to "/usr/ports/net/syncthing". It has no local changes and is still
pointing at version 1.30.
2. Run `patch -CEp0 < ~/edd-patch.diff` (some hunks fail).
I'm sending the patch output as an attachment, if you have time to take a look.
On Monday, December 29th, 2025 at 18:32, Edd Barrett <[email protected]>
wrote:
>
>
>
>
> 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
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile
|===================================================================
|RCS file: /cvs/ports/net/syncthing/Makefile,v
|diff -u -p -r1.73 Makefile
|--- Makefile 22 Jul 2025 20:20:25 -0000 1.73
|+++ Makefile 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 22.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: distinfo
|===================================================================
|RCS file: /cvs/ports/net/syncthing/distinfo,v
|diff -u -p -r1.50 distinfo
|--- distinfo 4 Jul 2025 19:19:39 -0000 1.50
|+++ distinfo 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-build_go
|===================================================================
|RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
|diff -u -p -r1.24 patch-build_go
|--- patches/patch-build_go 4 Jun 2025 20:07:43 -0000 1.24
|+++ patches/patch-build_go 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file patches/patch-build_go using Plan A...
Hunk #1 failed at 3.
1 out of 1 hunks failed
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-cmd_syncthing_main_go
|===================================================================
|RCS file: /cvs/ports/net/syncthing/patches/patch-cmd_syncthing_main_go,v
|diff -u -p -r1.3 patch-cmd_syncthing_main_go
|--- patches/patch-cmd_syncthing_main_go 15 Jun 2025 16:42:21 -0000
1.3
|+++ patches/patch-cmd_syncthing_main_go 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file patches/patch-cmd_syncthing_main_go using Plan A...
Hunk #1 succeeded at 5 with fuzz 2.
Hunk #2 failed at 14.
1 out of 2 hunks failed
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-gui_default_syncthing_core_syncthingController_js
|===================================================================
|RCS file: patches/patch-gui_default_syncthing_core_syncthingController_js
|diff -N patches/patch-gui_default_syncthing_core_syncthingController_js
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ patches/patch-gui_default_syncthing_core_syncthingController_js 29 Dec
2025 08:28:59 -0000
--------------------------
(Creating file
patches/patch-gui_default_syncthing_core_syncthingController_js...)
Patching file patches/patch-gui_default_syncthing_core_syncthingController_js
using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-internal_db_interface_go
|===================================================================
|RCS file: patches/patch-internal_db_interface_go
|diff -N patches/patch-internal_db_interface_go
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ patches/patch-internal_db_interface_go 29 Dec 2025 07:28:55 -0000
--------------------------
(Creating file patches/patch-internal_db_interface_go...)
Patching file patches/patch-internal_db_interface_go using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-lib_build_build_go
|===================================================================
|RCS file: /cvs/ports/net/syncthing/patches/patch-lib_build_build_go,v
|diff -u -p -r1.4 patch-lib_build_build_go
|--- patches/patch-lib_build_build_go 28 Nov 2024 11:47:47 -0000 1.4
|+++ patches/patch-lib_build_build_go 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file patches/patch-lib_build_build_go using Plan A...
Hunk #1 failed at 3.
1 out of 1 hunks failed
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: pkg/README
|===================================================================
|RCS file: /cvs/ports/net/syncthing/pkg/README,v
|diff -u -p -r1.8 README
|--- pkg/README 16 Feb 2024 15:09:13 -0000 1.8
|+++ pkg/README 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file pkg/README using Plan A...
Hunk #1 succeeded at 21.
Hunk #2 succeeded at 31.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: pkg/syncthing.rc
|===================================================================
|RCS file: /cvs/ports/net/syncthing/pkg/syncthing.rc,v
|diff -u -p -r1.6 syncthing.rc
|--- pkg/syncthing.rc 11 Mar 2022 19:47:38 -0000 1.6
|+++ pkg/syncthing.rc 29 Dec 2025 07:28:55 -0000
--------------------------
Patching file pkg/syncthing.rc using Plan A...
Hunk #1 succeeded at 1.
done
