On 2024/01/23 20:14, Nam Nguyen wrote:
> Theo Buehler writes:
>
> > On Wed, Jan 17, 2024 at 01:11:54PM +0100, Florian Obser wrote:
> >> On 2024-01-03 17:14 +01, Florian Obser <flor...@openbsd.org> wrote:
> >> > Hi there,
> >> >
> >> > dnscrypt-proxy fails thusly on -current:
> >> >
> >> > Jan 3 17:07:29 x395 dnscrypt-proxy[54029]: dnscrypt-proxy 2.1.5
> >> > Jan 3 17:07:29 x395 dnscrypt-proxy[54029]: Network connectivity detected
> >> > Jan 3 17:07:29 x395 dnscrypt-proxy[54029]: Dropping privileges
> >> > Jan 3 17:07:29 x395 dnscrypt-proxy[54029]: Unable to set the close on
> >> > exec flag: [function not implemented]
> >
> > The port uses golang.org/x/sys v0.11.0 whose fnctl() implementation does
> >
> > valptr, _, errno := Syscall(fcntl64Syscall, uintptr(fd), uintptr(cmd),
> > uintptr(arg))
> >
> > It would need to use at least v0.15.0 to include jrick's
> >
> > https://go-review.googlesource.com/c/sys/+/538995
> >
> > which is what DNSCrypt/dnscrypt-proxy's master branch seems to be using.
> >
> > So someone would need to update the port to use said branch, or build
> > from source.
>
> Thanks for the report and cluestick. I'll try to update to use that
> until upstream cuts a new release. Sorry for the timeout.
This might do the trick. Bonus do-build fix to respect MAKE_JOBS rather
than using all cores.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/dnscrypt-proxy/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 12 Aug 2023 08:55:43 -0000 1.65
+++ Makefile 24 Jan 2024 09:05:18 -0000
@@ -3,6 +3,7 @@ COMMENT = flexible DNS proxy with suppor
GH_ACCOUNT = jedisct1
GH_PROJECT = dnscrypt-proxy
GH_TAGNAME = 2.1.5
+REVISION = 0
CATEGORIES = net
@@ -25,7 +26,7 @@ pre-configure:
${MODGO_SUBDIR}/dnscrypt-proxy/example-dnscrypt-proxy.toml
do-build:
- cd ${WRKSRC}/dnscrypt-proxy && ${MODGO_CMD} build
+ cd ${WRKSRC}/dnscrypt-proxy && ${MODGO_CMD} build ${MODGO_FLAGS}
do-test:
cd ${WRKSRC}/dnscrypt-proxy && ${MODGO_CMD} test
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_fcntl_go 24 Jan 2024 09:05:18
-0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_syscall_openbsd_go 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,26 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_go 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_386_s 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_go
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_amd64_s 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_go
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm64_s 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_go 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_arm_s 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_go
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_mips64_s
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_go
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_ppc64_s 24 Jan
2024 09:05:18 -0000
@@ -0,0 +1,18 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_go
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,38 @@
+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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-vendor_golang_org_x_sys_unix_zsyscall_openbsd_riscv64_s
24 Jan 2024 09:05:18 -0000
@@ -0,0 +1,17 @@
+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
