Skip to content
This repository has been archived by the owner on Sep 14, 2019. It is now read-only.

Commit

Permalink
[minor] fix location of dependencies previously on code.google.com
Browse files Browse the repository at this point in the history
  • Loading branch information
jvehent committed Aug 23, 2015
1 parent 7288776 commit f308713
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 19 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GOOPTS :=
GO := GOPATH=$(shell pwd):$(shell go env GOROOT)/bin GOOS=$(OS) GOARCH=$(ARCH) go
GOGETTER := GOPATH=$(shell pwd) GOOS=$(OS) GOARCH=$(ARCH) go get -u
GOTEST := GOPATH=$(shell pwd) GOOS=$(OS) GOARCH=$(ARCH) go test
GOLDFLAGS := -ldflags "-X main.version $(BUILDREV)"
GOLDFLAGS := -ldflags "-X main.version=$(BUILDREV)"
GOCFLAGS :=
MKDIR := mkdir
INSTALL := install
Expand Down Expand Up @@ -97,11 +97,11 @@ mig-agent-search:
$(GO) build $(GOOPTS) -o $(BINDIR)/mig-agent-search $(GOLDFLAGS) mig/client/agent-search

go_get_common_deps:
$(GOGETTER) code.google.com/p/go.crypto/openpgp
$(GOGETTER) code.google.com/p/gcfg
$(GOGETTER) golang.org/x/crypto/openpgp
$(GOGETTER) gopkg.in/gcfg.v1

go_get_agent_deps: go_get_common_deps go_get_ping_deps go_get_memory_deps
$(GOGETTER) code.google.com/p/go.crypto/sha3
$(GOGETTER) golang.org/x/crypto/sha3
$(GOGETTER) github.com/streadway/amqp
$(GOGETTER) github.com/kardianos/osext
$(GOGETTER) github.com/jvehent/service-go
Expand Down
2 changes: 1 addition & 1 deletion src/mig/agent/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"mig"
"time"

"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
)

type config struct {
Expand Down
2 changes: 1 addition & 1 deletion src/mig/api/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package main

import (
"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
"fmt"
geo "github.com/oschwald/geoip2-golang"
"io"
Expand Down
4 changes: 2 additions & 2 deletions src/mig/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ package client
import (
"bufio"
"bytes"
"code.google.com/p/gcfg"
"code.google.com/p/go.crypto/openpgp"
"gopkg.in/gcfg.v1"
"crypto/tls"
"encoding/hex"
"encoding/json"
"fmt"
"github.com/jvehent/cljs"
"golang.org/x/crypto/openpgp"
"io"
"io/ioutil"
"mig"
Expand Down
2 changes: 1 addition & 1 deletion src/mig/modules/file/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ package file

import (
"bufio"
"code.google.com/p/go.crypto/sha3"
"crypto/md5"
"crypto/sha1"
"crypto/sha256"
"crypto/sha512"
"encoding/json"
"fmt"
"golang.org/x/crypto/sha3"
"hash"
"io"
"mig/modules"
Expand Down
4 changes: 2 additions & 2 deletions src/mig/pgp/pgp.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ package pgp

import (
"bytes"
"code.google.com/p/go.crypto/openpgp"
"code.google.com/p/go.crypto/openpgp/armor"
"encoding/hex"
"fmt"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor"
"io"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion src/mig/pgp/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"bytes"
"camlistore.org/pkg/misc/gpgagent"
"camlistore.org/pkg/misc/pinentry"
"code.google.com/p/go.crypto/openpgp"
"encoding/hex"
"fmt"
"golang.org/x/crypto/openpgp"
"io"
"os"
"strings"
Expand Down
5 changes: 2 additions & 3 deletions src/mig/pgp/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ package pgp
import (
"bytes"
"fmt"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor"
"io"
"strings"

"code.google.com/p/go.crypto/openpgp"
"code.google.com/p/go.crypto/openpgp/armor"
)

// Verify() checks the validity of a signature for some data,
Expand Down
2 changes: 1 addition & 1 deletion src/mig/scheduler/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package main

import (
"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
"crypto/rand"
"crypto/tls"
"crypto/x509"
Expand Down
2 changes: 1 addition & 1 deletion src/mig/workers/agent_intel/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package main

import (
"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
"encoding/json"
"flag"
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion src/mig/workers/agent_verif/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package main

import (
"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
"flag"
"fmt"
"mig/event"
Expand Down
2 changes: 1 addition & 1 deletion src/mig/workers/compliance_item/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package main

import (
"code.google.com/p/gcfg"
"gopkg.in/gcfg.v1"
"encoding/json"
"flag"
"fmt"
Expand Down

0 comments on commit f308713

Please sign in to comment.