From 64d316af5baa7b3b4c1ba3a4a2f326fb34bcb969 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Sun, 21 Apr 2019 13:37:53 +0200 Subject: [PATCH] fix: fixed compilation issue related to mdlayher/raw dependency (ref #468) --- Gopkg.lock | 6 ++--- Gopkg.toml | 6 +++++ vendor/github.com/mdlayher/raw/go.mod | 9 ------- vendor/github.com/mdlayher/raw/go.sum | 9 ------- vendor/github.com/mdlayher/raw/timeout_bsd.go | 26 ------------------- 5 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 vendor/github.com/mdlayher/raw/go.mod delete mode 100644 vendor/github.com/mdlayher/raw/go.sum delete mode 100644 vendor/github.com/mdlayher/raw/timeout_bsd.go diff --git a/Gopkg.lock b/Gopkg.lock index 4f67ed77..554963b0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -237,12 +237,11 @@ revision = "2a67805d7d0b0bad6c1103058981afdea583b459" [[projects]] - branch = "master" - digest = "1:34bd596081cc218eb9f14ddcc712015bed5b9b84917c6279640397f534565e72" + digest = "1:34fe44dd2bbe5723068e0a7a266847965a88297d383fe611e0358e556d82de09" name = "github.com/mdlayher/raw" packages = ["."] pruneopts = "UT" - revision = "b0647ab7d8b35d5b8b734462042628e5af82f7f4" + revision = "480b93709cce56651807d3fdeb260a5a7c4e2d5f" [[projects]] branch = "master" @@ -354,6 +353,7 @@ "github.com/malfunkt/iprange", "github.com/mdlayher/dhcp6", "github.com/mdlayher/dhcp6/dhcp6opts", + "github.com/mdlayher/raw", "github.com/robertkrimen/otto", "github.com/tarm/serial", ] diff --git a/Gopkg.toml b/Gopkg.toml index 58e877e5..c2af8893 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,3 +1,5 @@ +required = ["github.com/mdlayher/raw"] + [[constraint]] name = "github.com/evilsocket/islazy" version = "1.9.1" @@ -58,6 +60,10 @@ name = "github.com/malfunkt/iprange" version = "0.9.0" +[[constraint]] + revision = "480b93709cce56651807d3fdeb260a5a7c4e2d5f" + name = "github.com/mdlayher/raw" + [[constraint]] branch = "master" name = "github.com/mdlayher/dhcp6" diff --git a/vendor/github.com/mdlayher/raw/go.mod b/vendor/github.com/mdlayher/raw/go.mod deleted file mode 100644 index eef7529c..00000000 --- a/vendor/github.com/mdlayher/raw/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/mdlayher/raw - -go 1.12 - -require ( - github.com/google/go-cmp v0.2.0 - golang.org/x/net v0.0.0-20190313220215-9f648a60d977 - golang.org/x/sys v0.0.0-20190312061237-fead79001313 -) diff --git a/vendor/github.com/mdlayher/raw/go.sum b/vendor/github.com/mdlayher/raw/go.sum deleted file mode 100644 index 6d4d022d..00000000 --- a/vendor/github.com/mdlayher/raw/go.sum +++ /dev/null @@ -1,9 +0,0 @@ -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I= -golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjWsBSzdaQiKzUyf3DTTc= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/vendor/github.com/mdlayher/raw/timeout_bsd.go b/vendor/github.com/mdlayher/raw/timeout_bsd.go deleted file mode 100644 index 1957c1a9..00000000 --- a/vendor/github.com/mdlayher/raw/timeout_bsd.go +++ /dev/null @@ -1,26 +0,0 @@ -// +build darwin dragonfly freebsd netbsd openbsd - -package raw - -import ( - "time" -) - -const ( - // Maximum read timeout per syscall. - // It is required because read/recvfrom won't be interrupted on closing of the file descriptor. - readTimeout = 200 * time.Millisecond -) - -// Copyright (c) 2012 The Go Authors. All rights reserved. -// Source code in this file is based on src/net/interface_linux.go, -// from the Go standard library. The Go license can be found here: -// https://golang.org/LICENSE. - -// Taken from: -// https://github.com/golang/go/blob/master/src/net/net.go#L417-L421. -type timeoutError struct{} - -func (e *timeoutError) Error() string { return "i/o timeout" } -func (e *timeoutError) Timeout() bool { return true } -func (e *timeoutError) Temporary() bool { return true }