initial import

dnscrypt-proxy/fix-textflag.h.patch

@@ -0,0 +1,172 @@
+diff --git a/vendor/golang.org/x/net/internal/socket/rawconn.go b/vendor/golang.org/x/net/internal/socket/rawconn.go
+index b07b8900..0c6bbc68 100644
+--- a/vendor/golang.org/x/net/internal/socket/rawconn.go
++++ b/vendor/golang.org/x/net/internal/socket/rawconn.go
+@@ -7,7 +7,6 @@
+ import (
+ 	"errors"
+ 	"net"
+-	"os"
+ 	"syscall"
+ )
+ 
+@@ -42,23 +41,22 @@ func NewConn(c net.Conn) (*Conn, error) {
+ 
+ func (o *Option) get(c *Conn, b []byte) (int, error) {
+ 	var operr error
+-	var n int
+ 	fn := func(s uintptr) {
+-		n, operr = getsockopt(s, o.Level, o.Name, b)
++		return
+ 	}
+ 	if err := c.c.Control(fn); err != nil {
+ 		return 0, err
+ 	}
+-	return n, os.NewSyscallError("getsockopt", operr)
++	return 0, operr
+ }
+ 
+ func (o *Option) set(c *Conn, b []byte) error {
+ 	var operr error
+ 	fn := func(s uintptr) {
+-		operr = setsockopt(s, o.Level, o.Name, b)
++		return
+ 	}
+ 	if err := c.c.Control(fn); err != nil {
+ 		return err
+ 	}
+-	return os.NewSyscallError("setsockopt", operr)
++	return operr
+ }
+diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go b/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
+index d01fc4c7..c7ec17f3 100644
+--- a/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
++++ b/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
+@@ -27,7 +27,6 @@ func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {
+ 	var operr error
+ 	var n int
+ 	fn := func(s uintptr) bool {
+-		n, operr = recvmmsg(s, hs, flags)
+ 		if operr == syscall.EAGAIN {
+ 			return false
+ 		}
+@@ -60,7 +59,6 @@ func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {
+ 	var operr error
+ 	var n int
+ 	fn := func(s uintptr) bool {
+-		n, operr = sendmmsg(s, hs, flags)
+ 		if operr == syscall.EAGAIN {
+ 			return false
+ 		}
+diff --git a/vendor/golang.org/x/net/internal/socket/rawconn_msg.go b/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
+index d5ae3f8e..3b64621c 100644
+--- a/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
++++ b/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
+@@ -23,7 +23,6 @@ func (c *Conn) recvMsg(m *Message, flags int) error {
+ 	var operr error
+ 	var n int
+ 	fn := func(s uintptr) bool {
+-		n, operr = recvmsg(s, &h, flags)
+ 		if operr == syscall.EAGAIN {
+ 			return false
+ 		}
+@@ -60,7 +59,6 @@ func (c *Conn) sendMsg(m *Message, flags int) error {
+ 	var operr error
+ 	var n int
+ 	fn := func(s uintptr) bool {
+-		n, operr = sendmsg(s, &h, flags)
+ 		if operr == syscall.EAGAIN {
+ 			return false
+ 		}
+diff --git a/vendor/golang.org/x/net/internal/socket/sys.go b/vendor/golang.org/x/net/internal/socket/sys.go
+index ee492ba8..7e8cf2b7 100644
+--- a/vendor/golang.org/x/net/internal/socket/sys.go
++++ b/vendor/golang.org/x/net/internal/socket/sys.go
+@@ -25,7 +25,7 @@ func init() {
+ 	} else {
+ 		NativeEndian = binary.BigEndian
+ 	}
+-	kernelAlign = probeProtocolStack()
++	return
+ }
+ 
+ func roundup(l int) int {
+diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_386.go b/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
+index 235b2cc0..36de2c38 100644
+--- a/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
++++ b/vendor/golang.org/x/net/internal/socket/sys_linux_386.go
+@@ -4,52 +4,7 @@
+ 
+ package socket
+ 
+-import (
+-	"syscall"
+-	"unsafe"
+-)
+-
+-func probeProtocolStack() int { return 4 }
+-
+ const (
+-	sysSETSOCKOPT = 0xe
+-	sysGETSOCKOPT = 0xf
+-	sysSENDMSG    = 0x10
+-	sysRECVMSG    = 0x11
+-	sysRECVMMSG   = 0x13
+-	sysSENDMMSG   = 0x14
++        sysRECVMMSG = 0x13
++        sysSENDMMSG = 0x10
+ )
+-
+-func socketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
+-func rawsocketcall(call, a0, a1, a2, a3, a4, a5 uintptr) (uintptr, syscall.Errno)
+-
+-func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
+-	l := uint32(len(b))
+-	_, errno := socketcall(sysGETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(unsafe.Pointer(&l)), 0)
+-	return int(l), errnoErr(errno)
+-}
+-
+-func setsockopt(s uintptr, level, name int, b []byte) error {
+-	_, errno := socketcall(sysSETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
+-	return errnoErr(errno)
+-}
+-
+-func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
+-	n, errno := socketcall(sysRECVMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+-	return int(n), errnoErr(errno)
+-}
+-
+-func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
+-	n, errno := socketcall(sysSENDMSG, s, uintptr(unsafe.Pointer(h)), uintptr(flags), 0, 0, 0)
+-	return int(n), errnoErr(errno)
+-}
+-
+-func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
+-	n, errno := socketcall(sysRECVMMSG, s, uintptr(unsafe.Pointer(&hs[0])), uintptr(len(hs)), uintptr(flags), 0, 0)
+-	return int(n), errnoErr(errno)
+-}
+-
+-func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
+-	n, errno := socketcall(sysSENDMMSG, s, uintptr(unsafe.Pointer(&hs[0])), uintptr(len(hs)), uintptr(flags), 0, 0)
+-	return int(n), errnoErr(errno)
+-}
+diff --git a/vendor/golang.org/x/net/internal/socket/sys_linux_386.s b/vendor/golang.org/x/net/internal/socket/sys_linux_386.s
+index 93e7d75e..5b68771a 100644
+--- a/vendor/golang.org/x/net/internal/socket/sys_linux_386.s
++++ b/vendor/golang.org/x/net/internal/socket/sys_linux_386.s
+@@ -2,10 +2,10 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+-#include "textflag.h"
++//#include "textflag.h"
+ 
+-TEXT	·socketcall(SB),NOSPLIT,$0-36
+-	JMP	syscall·socketcall(SB)
++//TEXT	·socketcall(SB),NOSPLIT,$0-36
++//	JMP	syscall·socketcall(SB)
+ 
+-TEXT	·rawsocketcall(SB),NOSPLIT,$0-36
+-	JMP	syscall·rawsocketcall(SB)
++//TEXT	·rawsocketcall(SB),NOSPLIT,$0-36
++//	JMP	syscall·rawsocketcall(SB)