Igor Zornik writes: > Greetings! > > After 1+ year we finally have a tagged version of DNSCrypt proxy that > includes the module with the fixed fnctl implementation which means we > can remove all patches that were made solely to address this issue. > Still builds and installs fine on the latest AMD64 snapshot. Running the > program now also works and tests complete successfully. Diff below.
Thanks for the diff; it reads good but is mangled. I see two spaces in Makefile lines causing it to get rejected; the file removals aren't applying cleanly. Can you regenerate the patch and make sure it applies cleanly? examples of rejections: $ patch -u < /home/namtsui/diffs/dnscrypt.diff ... |Index: Makefile |=================================================================== |RCS file: /cvs/ports/net/dnscrypt-proxy/Makefile,v |retrieving revision 1.68 |diff -u -p -u -r1.68 Makefile |--- Makefile 11 Jul 2024 16:09:29 -0000 1.68 |+++ Makefile 14 Jan 2025 17:44:07 -0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 1. Hunk #2 failed at 13. 2 out of 2 hunks failed--saving rejects to Makefile.rej 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/dnscrypt-proxy/distinfo,v |retrieving revision 1.37 |diff -u -p -u -r1.37 distinfo |--- distinfo 12 Aug 2023 08:55:43 -0000 1.37 |+++ distinfo 14 Jan 2025 17:44:07 -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-vendor_golang_org_x_sys_unix_fcntl_go |=================================================================== |RCS file: patches/patch-vendor_golang_org_x_sys_unix_fcntl_go |diff -N patches/patch-vendor_golang_org_x_sys_unix_fcntl_go |--- patches/patch-vendor_golang_org_x_sys_unix_fcntl_go 24 Jan 2024 12:47:01 -0000 1.1 |+++ /dev/null 1 Jan 1970 00:00:00 -0000 -------------------------- Patching file patches/patch-vendor_golang_org_x_sys_unix_fcntl_go using Plan A... Empty context always matches. Reversed (or previously applied) patch detected! Assume -R? [y] n Apply anyway? [n] Hunk #1 ignored at 0. 1 out of 1 hunks ignored--saving rejects to patches/patch-vendor_golang_org_x_sys_unix_fcntl_go.rej ... |Index: pkg/DESCR |=================================================================== |RCS file: /cvs/ports/net/dnscrypt-proxy/pkg/DESCR,v |retrieving revision 1.2 |diff -u -p -u -r1.2 DESCR |--- pkg/DESCR 30 Apr 2019 08:51:13 -0000 1.2 |+++ pkg/DESCR 14 Jan 2025 17:44:07 -0000 -------------------------- Patching file pkg/DESCR using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to pkg/DESCR.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: pkg/dnscrypt_proxy.rc |=================================================================== |RCS file: /cvs/ports/net/dnscrypt-proxy/pkg/dnscrypt_proxy.rc,v |retrieving revision 1.6 |diff -u -p -u -r1.6 dnscrypt_proxy.rc |--- pkg/dnscrypt_proxy.rc 11 Mar 2022 19:45:54 -0000 1.6 |+++ pkg/dnscrypt_proxy.rc 14 Jan 2025 17:44:07 -0000 -------------------------- Patching file pkg/dnscrypt_proxy.rc using Plan A... Hunk #1 succeeded at 10 with fuzz 2. Hmm... Ignoring the trailing garbage. done
