Re: [UPDATE] net/dnscrypt-proxy 2.1.5 -> 2.1.7

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 17 Jan 2025 08:52:16 -0000
@@ -1,9 +1,6 @@
COMMENT = flexible DNS proxy with support for encrypted DNS protocols

-GH_ACCOUNT = jedisct1
-GH_PROJECT = dnscrypt-proxy
-GH_TAGNAME = 2.1.5
-REVISION = 2
+DIST_TUPLE = github DNSCrypt dnscrypt-proxy 2.1.7 .

CATEGORIES = net

@@ -16,7 +13,6 @@ PERMIT_PACKAGE = Yes
WANTLIB = c pthread

MODULES = lang/go
-MODGO_TYPE = bin

INSTDIR = ${PREFIX}/share/examples/dnscrypt-proxy

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 17 Jan 2025 08:52:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (dnscrypt-proxy-2.1.5.tar.gz) = BExNuaPHvc+Ib/j4PEsTfS/TemVHepK/6Gv2lYfqc1U=
-SIZE (dnscrypt-proxy-2.1.5.tar.gz) = 4065395
+SHA256 (DNSCrypt-dnscrypt-proxy-2.1.7.tar.gz) = Y5TNLXPe3Kkxeu7kmLbCUguEHOoELYPzmMM1WhPFD3w=
+SIZE (DNSCrypt-dnscrypt-proxy-2.1.7.tar.gz) = 4195998
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
@@ -1,17 +0,0 @@
-similar to
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/fcntl.go
---- vendor/golang.org/x/sys/unix/fcntl.go.orig
-+++ vendor/golang.org/x/sys/unix/fcntl.go
-@@ -2,8 +2,8 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
-
--//go:build dragonfly || freebsd || linux || netbsd || openbsd
--// +build dragonfly freebsd linux netbsd openbsd
-+//go:build dragonfly || freebsd || linux || netbsd
-+// +build dragonfly freebsd linux netbsd
-
- package unix
-
Index: patches/patch-vendor_golang_org_x_sys_unix_syscall_openbsd_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_syscall_openbsd_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_syscall_openbsd_go
--- patches/patch-vendor_golang_org_x_sys_unix_syscall_openbsd_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/syscall_openbsd.go
---- vendor/golang.org/x/sys/unix/syscall_openbsd.go.orig
-+++ vendor/golang.org/x/sys/unix/syscall_openbsd.go
-@@ -171,6 +171,20 @@ func Getresgid() (rgid, egid, sgid int) {
-
- //sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
-
-+//sys fcntl(fd int, cmd int, arg int) (n int, err error)
-+//sys fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) = SYS_FCNTL
-+
-+// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
-+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
-+ return fcntl(int(fd), cmd, arg)
-+}
-+
-+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-+ _, err := fcntlPtr(int(fd), cmd, unsafe.Pointer(lk))
-+ return err
-+}
-+
- //sys ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
-
- func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $4
- DATA ·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $4
-+DATA ·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $4
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
-@@ -585,6 +585,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
- DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
-+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
- DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
-+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $4
- DATA ·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $4
-+DATA ·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $4
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
- DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
-+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
-@@ -213,6 +213,12 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
- DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ CALL libc_fcntl(SB)
-+ RET
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
-+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- CALL libc_ppoll(SB)
- RET
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_go
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_go
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_go
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_go 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
-@@ -583,6 +583,32 @@ var libc_sysctl_trampoline_addr uintptr
-
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-+func fcntl(fd int, cmd int, arg int) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+var libc_fcntl_trampoline_addr uintptr
-+
-+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
-+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
-+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd), uintptr(cmd), uintptr(arg))
-+ n = int(r0)
-+ if e1 != 0 {
-+ err = errnoErr(e1)
-+ }
-+ return
-+}
-+
-+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-+
- func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
- r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
- n = int(r0)
Index: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_s
===================================================================
RCS file: patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_s
diff -N patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_s
--- patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_s 24 Jan 2024 12:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/golang/sys/commit/ec230dae7fd9abe06a61e3e05310d935e7e32b12.patch
-
-Index: vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
---- vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s.orig
-+++ vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
-@@ -178,6 +178,11 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
- GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
- DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
-+ JMP libc_fcntl(SB)
-+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
-+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
-+
- TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
- JMP libc_ppoll(SB)
- GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
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 17 Jan 2025 08:52:16 -0000
@@ -1,23 +1,29 @@
-dnscrypt-proxy is a flexible DNS proxy with support for modern encrypted DNS
-protocols, such as DNSCrypt v2 and DNS-over-HTTPS, and features:
+dnscrypt-proxy is a flexible DNS proxy with support for modern
+encrypted DNS protocols, such as DNSCrypt v2 and DNS-over-HTTPS,
+and features:
+
+- DNS traffic encryption and authentication. Supports DNS-over-HTTPS
+ (DoH) using TLS 1.3 and QUIC, DNSCrypt, Anonymized DNS and ODoH
+- Client IP addresses can be hidden using Tor, SOCKS proxies or
+ Anonymized DNS relays
+- DNS query monitoring, with separate log files for regular and
+ suspicious queries
+- Filtering: block ads, malware, and other unwanted content.
+ Compatible with all DNS services
+- Time-based filtering, with a flexible weekly schedule
+- Transparent redirection of specific domains to specific resolvers
+- DNS caching, to reduce latency and improve privacy
+- Local IPv6 blocking to reduce latency on IPv4-only networks
+- Load balancing: pick a set of resolvers, dnscrypt-proxy will
+ automatically measure and keep track of their speed, and balance
+ the traffic across the fastest available ones.
+- Cloaking: like a HOSTS file on steroids, that can return preconfigured
+ addresses for specific names, or resolve and return the IP address
+ of other names. This can be used for local development as well
+ as to enforce safe search results on Google, Yahoo, DuckDuckGo
+ and Bing
+- Automatic background updates of resolvers lists
+- Can force outgoing connections to use TCP
+- Compatible with DNSSEC
+- Includes a local DoH server in order to support ECH (ESNI)

-- DNS traffic encryption and authentication. Supports DNS-over-HTTPS (DoH) and
- DNSCrypt.
-- DNS query monitoring with separate log files for regular and suspicious
- queries.
-- Filtering: block ads, malware and other unwanted content. Compatible with all
- DNS services.
-- Time-based filtering with a flexible weekly schedule.
-- Transparent redirection of specific domains to specific resolvers.
-- DNS caching to reduce latency and improve privacy.
-- Local IPv6 blocking to reduce latency on IPv4-only networks.
-- Load balancing: pick a set of resolvers, and dnscrypt-proxy will automatically
- measure their speeds in order to balance traffic among the fastest available.
-- Cloaking: like a HOSTS file on steroids that can return preconfigured
- addresses for specific names or resolve and return the IP addresses of
- other names. This can be used for local development, as well as to
- enforce safe search results on Google, Yahoo and Bing.
-- Automatic background updates of resolvers lists.
-- Can force outgoing connections to use TCP.
-- Supports SOCKS proxies.
-- Compatible with DNSSEC.
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 17 Jan 2025 08:52:16 -0000
@@ -10,4 +10,8 @@ pexp="${daemon}${daemon_flags:+ ${daemon
rc_bg=YES
rc_reload=NO

+rc_configtest() {
+ ${daemon} ${daemon_flags} -check
+}
+
rc_cmd $1
Hello,

Sorry about that. Probably my e-mail client replacing tabs with spaces
for some reason. This time I'm sending it as an attachment just to be
on the safe side. It is as generated by the cvs diff. Deleted files were
first removed with "rm" and then with "cvs remove". I hope that
that is the right approach and the diff is now in correct format.

On 1/17/25 00:42, Nam Nguyen wrote:
> 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
>