From 083163daf921c26e8fd9d48235f4dcb024ef8619 Mon Sep 17 00:00:00 2001 From: Tim Cooper Date: Fri, 25 Mar 2016 22:04:43 -0300 Subject: [PATCH] use updated import paths for proto, nacl --- cmd/grumble/client.go | 2 +- cmd/grumble/freeze.go | 2 +- cmd/grumble/freeze_unix.go | 2 +- cmd/grumble/freeze_windows.go | 2 +- cmd/grumble/message.go | 2 +- cmd/grumble/server.go | 2 +- pkg/cryptstate/mode_secretbox.go | 2 +- pkg/freezer/freezer_test.go | 2 +- pkg/freezer/types.pb.go | 2 +- pkg/freezer/walker.go | 2 +- pkg/freezer/writer.go | 2 +- pkg/mumbleproto/Mumble.pb.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/grumble/client.go b/cmd/grumble/client.go index 7ddc122..3b72fbb 100644 --- a/cmd/grumble/client.go +++ b/cmd/grumble/client.go @@ -7,10 +7,10 @@ package main import ( "bufio" "bytes" - "code.google.com/p/goprotobuf/proto" "crypto/tls" "encoding/binary" "errors" + "github.com/golang/protobuf/proto" "io" "log" "mumble.info/grumble/pkg/acl" diff --git a/cmd/grumble/freeze.go b/cmd/grumble/freeze.go index 4ab0203..edd7f7f 100644 --- a/cmd/grumble/freeze.go +++ b/cmd/grumble/freeze.go @@ -5,8 +5,8 @@ package main import ( - "code.google.com/p/goprotobuf/proto" "errors" + "github.com/golang/protobuf/proto" "io" "io/ioutil" "log" diff --git a/cmd/grumble/freeze_unix.go b/cmd/grumble/freeze_unix.go index d093b43..9eea130 100644 --- a/cmd/grumble/freeze_unix.go +++ b/cmd/grumble/freeze_unix.go @@ -7,7 +7,7 @@ package main import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "io/ioutil" "os" "path/filepath" diff --git a/cmd/grumble/freeze_windows.go b/cmd/grumble/freeze_windows.go index c785591..7027347 100644 --- a/cmd/grumble/freeze_windows.go +++ b/cmd/grumble/freeze_windows.go @@ -5,7 +5,7 @@ package main import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "mumble.info/grumble/pkg/replacefile" "io/ioutil" "path/filepath" diff --git a/cmd/grumble/message.go b/cmd/grumble/message.go index 84f2dfd..5842d40 100644 --- a/cmd/grumble/message.go +++ b/cmd/grumble/message.go @@ -5,10 +5,10 @@ package main import ( - "code.google.com/p/goprotobuf/proto" "crypto/aes" "crypto/tls" "fmt" + "github.com/golang/protobuf/proto" "mumble.info/grumble/pkg/acl" "mumble.info/grumble/pkg/ban" "mumble.info/grumble/pkg/freezer" diff --git a/cmd/grumble/server.go b/cmd/grumble/server.go index 83690c6..9e2c4f7 100644 --- a/cmd/grumble/server.go +++ b/cmd/grumble/server.go @@ -7,7 +7,6 @@ package main import ( "bufio" "bytes" - "code.google.com/p/goprotobuf/proto" "crypto/rand" "crypto/sha1" "crypto/tls" @@ -15,6 +14,7 @@ import ( "encoding/hex" "errors" "fmt" + "github.com/golang/protobuf/proto" "hash" "log" "mumble.info/grumble/pkg/acl" diff --git a/pkg/cryptstate/mode_secretbox.go b/pkg/cryptstate/mode_secretbox.go index 12656ec..6cdf1c1 100644 --- a/pkg/cryptstate/mode_secretbox.go +++ b/pkg/cryptstate/mode_secretbox.go @@ -6,7 +6,7 @@ package cryptstate import ( "unsafe" - "code.google.com/p/go.crypto/nacl/secretbox" + "golang.org/x/crypto/nacl/secretbox" ) // secretBoxMode implements the XSalsa20-Poly1305 CryptoMode diff --git a/pkg/freezer/freezer_test.go b/pkg/freezer/freezer_test.go index c156ddc..4e0d8a7 100644 --- a/pkg/freezer/freezer_test.go +++ b/pkg/freezer/freezer_test.go @@ -6,8 +6,8 @@ package freezer import ( "bytes" - "code.google.com/p/goprotobuf/proto" "encoding/binary" + "github.com/golang/protobuf/proto" "hash/crc32" "io" "math" diff --git a/pkg/freezer/types.pb.go b/pkg/freezer/types.pb.go index 92451c9..58bd40a 100644 --- a/pkg/freezer/types.pb.go +++ b/pkg/freezer/types.pb.go @@ -4,7 +4,7 @@ package freezer -import proto "code.google.com/p/goprotobuf/proto" +import proto "github.com/golang/protobuf/proto" import json "encoding/json" import math "math" diff --git a/pkg/freezer/walker.go b/pkg/freezer/walker.go index a7d15cd..20d6267 100644 --- a/pkg/freezer/walker.go +++ b/pkg/freezer/walker.go @@ -5,8 +5,8 @@ package freezer import ( - "code.google.com/p/goprotobuf/proto" "encoding/binary" + "github.com/golang/protobuf/proto" "hash" "hash/crc32" "io" diff --git a/pkg/freezer/writer.go b/pkg/freezer/writer.go index 0438db8..b51c26a 100644 --- a/pkg/freezer/writer.go +++ b/pkg/freezer/writer.go @@ -17,8 +17,8 @@ package freezer import ( "bytes" - "code.google.com/p/goprotobuf/proto" "encoding/binary" + "github.com/golang/protobuf/proto" "hash" "hash/crc32" "io" diff --git a/pkg/mumbleproto/Mumble.pb.go b/pkg/mumbleproto/Mumble.pb.go index 82ea32f..0f49eff 100644 --- a/pkg/mumbleproto/Mumble.pb.go +++ b/pkg/mumbleproto/Mumble.pb.go @@ -4,7 +4,7 @@ package mumbleproto -import proto "code.google.com/p/goprotobuf/proto" +import proto "github.com/golang/protobuf/proto" import json "encoding/json" import math "math"