pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

go112: Fix some socket operations on NetBSD/arm.



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sun Mar 3 21:01:32 2019 +0100
Changeset:	b1794229cdb2857c269c82bef4d5cb1f8463f719

Modified Files:
	go112/distinfo
Added Files:
	go112/patches/patch-src_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go
	go112/patches/patch-src_syscall_sockcmsg__unix.go

Log Message:
go112: Fix some socket operations on NetBSD/arm.

This is a recent bugfix that fixed the remaining test failures.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1794229cdb2857c269c82bef4d5cb1f8463f719

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 go112/distinfo                                           |  2 ++
 ...rc_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go | 16 ++++++++++++++++
 go112/patches/patch-src_syscall_sockcmsg__unix.go        | 16 ++++++++++++++++
 3 files changed, 34 insertions(+)

diffs:
diff --git a/go112/distinfo b/go112/distinfo
index 1ec146a327..a12124a90c 100644
--- a/go112/distinfo
+++ b/go112/distinfo
@@ -7,6 +7,8 @@ Size (go1.12.src.tar.gz) = 21962486 bytes
 SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
 SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
 SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 990a54e3baf239916e4c7f0c1d54240e2898601a
+SHA1 (patch-src_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go) = 893b70c73cf9d1a33483c3c1d886a88122e5619c
 SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d
 SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577
+SHA1 (patch-src_syscall_sockcmsg__unix.go) = c0da2679cf8152e9ecce983b5c6d790bec3af390
 SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b
diff --git a/go112/patches/patch-src_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go b/go112/patches/patch-src_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go
new file mode 100644
index 0000000000..d0dc9fd389
--- /dev/null
+++ b/go112/patches/patch-src_cmd_vendor_golang.org_x_sys_unix_sockcmsg__unix.go
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix alignment of socket control messages on NetBSD/arm.
+https://golang.org/issue/24771
+
+--- src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go.orig	2019-02-25 23:05:57.000000000 +0000
++++ src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+@@ -25,7 +25,7 @@ func cmsgAlignOf(salen int) int {
+ 		if SizeofPtr == 8 {
+ 			salign = 4
+ 		}
+-	case "openbsd":
++	case "netbsd", "openbsd":
+ 		// OpenBSD armv7 requires 64-bit alignment.
+ 		if runtime.GOARCH == "arm" {
+ 			salign = 8
diff --git a/go112/patches/patch-src_syscall_sockcmsg__unix.go b/go112/patches/patch-src_syscall_sockcmsg__unix.go
new file mode 100644
index 0000000000..b921ae3ff1
--- /dev/null
+++ b/go112/patches/patch-src_syscall_sockcmsg__unix.go
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix alignment of socket control messages on NetBSD/arm.
+https://golang.org/issue/24771
+
+--- src/syscall/sockcmsg_unix.go.orig	2019-02-25 23:05:57.000000000 +0000
++++ src/syscall/sockcmsg_unix.go
+@@ -25,7 +25,7 @@ func cmsgAlignOf(salen int) int {
+ 		if sizeofPtr == 8 {
+ 			salign = 4
+ 		}
+-	case "openbsd":
++	case "netbsd", "openbsd":
+ 		// OpenBSD armv7 requires 64-bit alignment.
+ 		if runtime.GOARCH == "arm" {
+ 			salign = 8


Home | Main Index | Thread Index | Old Index