use updated import paths for proto, nacl

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"

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"

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"

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"

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"

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"

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

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"

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"
 

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"

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"

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"