Merge pull request #1060 from weaveworks/issues/1059-remove-google-code-refs

Remove all the imports from "code.google.com"

prog/weaveproxy/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"code.google.com/p/getopt"
+	"github.com/pborman/getopt"
 	. "github.com/weaveworks/weave/common"
 	"github.com/weaveworks/weave/proxy"
 )

router/crypto.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"sync"
 
-	"code.google.com/p/go-bit/bit"
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.crypto/nacl/secretbox"
+	"github.com/andybalholm/go-bit"
+	"golang.org/x/crypto/nacl/box"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 func GenerateKeyPair() (publicKey, privateKey *[32]byte, err error) {

router/ethernet_decoder.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"net"
 
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 	. "github.com/weaveworks/weave/common"
 )
 

router/forwarder.go

@@ -4,8 +4,8 @@ import (
 	"syscall"
 	"time"
 
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 type ForwardedFrame struct {

router/pcap.go

@@ -3,7 +3,7 @@ package router
 import (
 	"fmt"
 
-	"code.google.com/p/gopacket/pcap"
+	"github.com/google/gopacket/pcap"
 )
 
 type PcapIO struct {

router/udp_sender.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"syscall"
 
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 	. "github.com/weaveworks/weave/common"
 )