From cb827169dc4144701ac37aef68c98cdbbc89d4ec Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Thu, 26 Nov 2020 20:09:37 -0800 Subject: [PATCH] switching hosting providers --- ahash/ahash.go | 2 +- ahash/ahash_test.go | 2 +- cmd/certchain/certchain.go | 2 +- cmd/certexpiry/main.go | 4 ++-- cmd/certverify/main.go | 4 ++-- cmd/clustersh/main.go | 2 +- cmd/cruntar/main.go | 2 +- cmd/csrpubdump/pubdump.go | 2 +- cmd/fragment/fragment.go | 2 +- cmd/jlp/jlp.go | 2 +- cmd/parts/main.go | 2 +- cmd/pembody/pembody.go | 2 +- cmd/pemit/main.go | 6 +++--- cmd/renfnv/renfnv.go | 4 ++-- cmd/rhash/main.go | 6 +++--- cmd/showimp/main.go | 4 ++-- cmd/ski/main.go | 4 ++-- cmd/sprox/main.go | 2 +- cmd/stealchain-server/main.go | 2 +- cmd/stealchain/thief.go | 2 +- cmd/subjhash/main.go | 4 ++-- cmd/tlskeypair/main.go | 2 +- dbg/dbg_test.go | 2 +- go.mod | 14 +++++++++++++- lib/lib_test.go | 2 +- logging/example/example.go | 2 +- logging/example_test.go | 2 +- mwc/mwc_test.go | 4 ++-- 28 files changed, 51 insertions(+), 39 deletions(-) diff --git a/ahash/ahash.go b/ahash/ahash.go index c4c9536..30562c4 100644 --- a/ahash/ahash.go +++ b/ahash/ahash.go @@ -16,7 +16,7 @@ import ( "io" "sort" - "github.com/kisom/goutils/assert" + "git.sr.ht/~kisom/goutils/assert" "golang.org/x/crypto/blake2b" "golang.org/x/crypto/blake2s" "golang.org/x/crypto/md4" diff --git a/ahash/ahash_test.go b/ahash/ahash_test.go index cfb977b..0c9cd26 100644 --- a/ahash/ahash_test.go +++ b/ahash/ahash_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/kisom/goutils/assert" + "git.sr.ht/~kisom/goutils/assert" ) func TestSecureHash(t *testing.T) { diff --git a/cmd/certchain/certchain.go b/cmd/certchain/certchain.go index ff5ea7c..0b079e8 100644 --- a/cmd/certchain/certchain.go +++ b/cmd/certchain/certchain.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) var hasPort = regexp.MustCompile(`:\d+$`) diff --git a/cmd/certexpiry/main.go b/cmd/certexpiry/main.go index ed46ae0..051ee2a 100644 --- a/cmd/certexpiry/main.go +++ b/cmd/certexpiry/main.go @@ -11,8 +11,8 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) var warnOnly bool diff --git a/cmd/certverify/main.go b/cmd/certverify/main.go index 9582c6c..40ec89c 100644 --- a/cmd/certverify/main.go +++ b/cmd/certverify/main.go @@ -10,8 +10,8 @@ import ( "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/revoke" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) func printRevocation(cert *x509.Certificate) { diff --git a/cmd/clustersh/main.go b/cmd/clustersh/main.go index a27eb74..d077eeb 100644 --- a/cmd/clustersh/main.go +++ b/cmd/clustersh/main.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/lib" "github.com/pkg/sftp" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/cmd/cruntar/main.go b/cmd/cruntar/main.go index 3fb9ffd..6124a5b 100644 --- a/cmd/cruntar/main.go +++ b/cmd/cruntar/main.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) var ( diff --git a/cmd/csrpubdump/pubdump.go b/cmd/csrpubdump/pubdump.go index 53612f6..dfc3710 100644 --- a/cmd/csrpubdump/pubdump.go +++ b/cmd/csrpubdump/pubdump.go @@ -10,7 +10,7 @@ import ( "io/ioutil" "log" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) func main() { diff --git a/cmd/fragment/fragment.go b/cmd/fragment/fragment.go index 773dd59..1fdf116 100644 --- a/cmd/fragment/fragment.go +++ b/cmd/fragment/fragment.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strconv" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) func init() { diff --git a/cmd/jlp/jlp.go b/cmd/jlp/jlp.go index e0bba6b..c81090b 100644 --- a/cmd/jlp/jlp.go +++ b/cmd/jlp/jlp.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/lib" ) func prettify(file string, validateOnly bool) error { diff --git a/cmd/parts/main.go b/cmd/parts/main.go index 8175196..aa310c7 100644 --- a/cmd/parts/main.go +++ b/cmd/parts/main.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) const dbVersion = "1" diff --git a/cmd/pembody/pembody.go b/cmd/pembody/pembody.go index 08802a2..510129d 100644 --- a/cmd/pembody/pembody.go +++ b/cmd/pembody/pembody.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "os" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/lib" ) func main() { diff --git a/cmd/pemit/main.go b/cmd/pemit/main.go index 267e712..671bd2f 100644 --- a/cmd/pemit/main.go +++ b/cmd/pemit/main.go @@ -8,9 +8,9 @@ import ( "io" "os" - "github.com/kisom/goutils/assert" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/assert" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) func usage(w io.Writer) { diff --git a/cmd/renfnv/renfnv.go b/cmd/renfnv/renfnv.go index 3ed8fad..9df6f73 100644 --- a/cmd/renfnv/renfnv.go +++ b/cmd/renfnv/renfnv.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "github.com/kisom/goutils/fileutil" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/fileutil" + "git.sr.ht/~kisom/goutils/lib" ) func hashName(path, encodedHash string) string { diff --git a/cmd/rhash/main.go b/cmd/rhash/main.go index 3900ada..0723df6 100644 --- a/cmd/rhash/main.go +++ b/cmd/rhash/main.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/kisom/goutils/ahash" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/ahash" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) func usage(w io.Writer) { diff --git a/cmd/showimp/main.go b/cmd/showimp/main.go index 708928c..9907563 100644 --- a/cmd/showimp/main.go +++ b/cmd/showimp/main.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/logging" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/logging" ) var ( diff --git a/cmd/ski/main.go b/cmd/ski/main.go index ee7644a..bf14b0b 100644 --- a/cmd/ski/main.go +++ b/cmd/ski/main.go @@ -17,8 +17,8 @@ import ( "os" "strings" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) func usage(w io.Writer) { diff --git a/cmd/sprox/main.go b/cmd/sprox/main.go index b600890..f681d60 100644 --- a/cmd/sprox/main.go +++ b/cmd/sprox/main.go @@ -6,7 +6,7 @@ import ( "log" "net" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) func proxy(conn net.Conn, inside string) error { diff --git a/cmd/stealchain-server/main.go b/cmd/stealchain-server/main.go index 063a369..92b96cc 100644 --- a/cmd/stealchain-server/main.go +++ b/cmd/stealchain-server/main.go @@ -12,7 +12,7 @@ import ( "net" "os" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) func main() { diff --git a/cmd/stealchain/thief.go b/cmd/stealchain/thief.go index 82e3a72..d712218 100644 --- a/cmd/stealchain/thief.go +++ b/cmd/stealchain/thief.go @@ -10,7 +10,7 @@ import ( "net" "os" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) func main() { diff --git a/cmd/subjhash/main.go b/cmd/subjhash/main.go index fb4bb96..751972f 100644 --- a/cmd/subjhash/main.go +++ b/cmd/subjhash/main.go @@ -9,8 +9,8 @@ import ( "io" "os" - "github.com/kisom/goutils/die" - "github.com/kisom/goutils/lib" + "git.sr.ht/~kisom/goutils/die" + "git.sr.ht/~kisom/goutils/lib" ) func init() { diff --git a/cmd/tlskeypair/main.go b/cmd/tlskeypair/main.go index 6e545dd..05ebd70 100644 --- a/cmd/tlskeypair/main.go +++ b/cmd/tlskeypair/main.go @@ -15,7 +15,7 @@ import ( "log" "os" - "github.com/kisom/goutils/die" + "git.sr.ht/~kisom/goutils/die" ) var validPEMs = map[string]bool{ diff --git a/dbg/dbg_test.go b/dbg/dbg_test.go index dc07833..6adc6b9 100644 --- a/dbg/dbg_test.go +++ b/dbg/dbg_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/kisom/goutils/testio" + "git.sr.ht/~kisom/goutils/testio" "github.com/stretchr/testify/require" ) diff --git a/go.mod b/go.mod index b198fd3..47b055c 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,15 @@ -module github.com/kisom/goutils +module git.sr.ht/~kisom/goutils go 1.13 + +require ( + github.com/cloudflare/cfssl v1.5.0 + github.com/kisom/goutils v1.1.0 + github.com/kr/text v0.2.0 + github.com/pkg/errors v0.9.1 + github.com/pkg/sftp v1.12.0 + github.com/stretchr/testify v1.6.1 + golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 + golang.org/x/sys v0.0.0-20201126233918-771906719818 + gopkg.in/yaml.v2 v2.4.0 +) diff --git a/lib/lib_test.go b/lib/lib_test.go index d522f10..7414508 100644 --- a/lib/lib_test.go +++ b/lib/lib_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/kisom/goutils/assert" + "git.sr.ht/~kisom/goutils/assert" ) // some CA certs I found on my computerbox. diff --git a/logging/example/example.go b/logging/example/example.go index d8dc02e..1339239 100644 --- a/logging/example/example.go +++ b/logging/example/example.go @@ -4,7 +4,7 @@ import ( "os" "time" - "github.com/kisom/goutils/logging" + "git.sr.ht/~kisom/goutils/logging" ) var log = logging.NewConsole() diff --git a/logging/example_test.go b/logging/example_test.go index 22949ae..2ad32a9 100644 --- a/logging/example_test.go +++ b/logging/example_test.go @@ -3,7 +3,7 @@ package logging_test import ( "time" - "github.com/kisom/goutils/logging" + "git.sr.ht/~kisom/goutils/logging" ) var log = logging.NewConsole() diff --git a/mwc/mwc_test.go b/mwc/mwc_test.go index 22c1526..06584ed 100644 --- a/mwc/mwc_test.go +++ b/mwc/mwc_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/kisom/goutils/assert" - "github.com/kisom/goutils/testio" + "git.sr.ht/~kisom/goutils/assert" + "git.sr.ht/~kisom/goutils/testio" ) func TestMWC(t *testing.T) {