From 698e22245fded540fe7dc3171beafc3a2f82f438 Mon Sep 17 00:00:00 2001 From: Josh Deprez Date: Fri, 18 Oct 2024 13:20:34 +1100 Subject: [PATCH] switch to vanity import path --- README.md | 2 +- atalk/atp/atp.go | 2 +- atalk/zip/getzonelist.go | 4 ++-- atalk/zip/zip_test.go | 2 +- go.mod | 10 ++++------ go.sum | 10 +++++++++- main.go | 6 +++--- router/aarp.go | 2 +- router/aep.go | 2 +- router/nbp.go | 4 ++-- router/nbp_aurp.go | 2 +- router/peer_aurp.go | 2 +- router/port.go | 2 +- router/rtmp.go | 8 ++++---- router/zip.go | 6 +++--- 15 files changed, 35 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 38451b4..df81c41 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ TODO: explain the configuration file 2. Run these commands (for Debian-variety Linuxen, e.g. Ubuntu, Raspbian, Mint...): ```shell sudo apt install git build-essential libpcap-dev - go install gitea.drjosh.dev/josh/jrouter@latest + go install drjosh.dev/jrouter@latest sudo setcap 'CAP_NET_BIND_SERVICE=ep CAP_NET_RAW=ep' ~/go/bin/jrouter ``` 3. Configure `jrouter.yaml` diff --git a/atalk/atp/atp.go b/atalk/atp/atp.go index 4ecf8ed..fecf2ee 100644 --- a/atalk/atp/atp.go +++ b/atalk/atp/atp.go @@ -21,7 +21,7 @@ import ( "encoding/binary" "fmt" - "gitea.drjosh.dev/josh/jrouter/atalk" + "drjosh.dev/jrouter/atalk" ) const ( diff --git a/atalk/zip/getzonelist.go b/atalk/zip/getzonelist.go index 04bf541..b7864f2 100644 --- a/atalk/zip/getzonelist.go +++ b/atalk/zip/getzonelist.go @@ -21,8 +21,8 @@ import ( "encoding/binary" "fmt" - "gitea.drjosh.dev/josh/jrouter/atalk" - "gitea.drjosh.dev/josh/jrouter/atalk/atp" + "drjosh.dev/jrouter/atalk" + "drjosh.dev/jrouter/atalk/atp" ) type GetZonesPacket struct { diff --git a/atalk/zip/zip_test.go b/atalk/zip/zip_test.go index 8dd4b8c..01d8381 100644 --- a/atalk/zip/zip_test.go +++ b/atalk/zip/zip_test.go @@ -19,7 +19,7 @@ package zip import ( "testing" - "gitea.drjosh.dev/josh/jrouter/atalk/atp" + "drjosh.dev/jrouter/atalk/atp" ) func FuzzUnmarshalPacket(f *testing.F) { diff --git a/go.mod b/go.mod index eb8b94f..8d04e84 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,12 @@ -module gitea.drjosh.dev/josh/jrouter +module drjosh.dev/jrouter go 1.22.0 require ( github.com/google/go-cmp v0.6.0 + github.com/google/gopacket v1.1.19 + github.com/sfiera/multitalk v0.2.0 gopkg.in/yaml.v3 v3.0.1 ) -require ( - github.com/google/gopacket v1.1.19 // indirect - github.com/sfiera/multitalk v0.2.0 // indirect - golang.org/x/sys v0.5.0 // indirect -) +require golang.org/x/sys v0.5.0 // indirect diff --git a/go.sum b/go.sum index d100d52..e8b7234 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,32 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sfiera/multitalk v0.2.0 h1:FLLw7L6yNUTOdjMk2EgKnOwMKeu++t5zinv5qpTC2JM= github.com/sfiera/multitalk v0.2.0/go.mod h1:jGkgjgiyfuRMNKwfSjo/xR6b9nd10XF4smQAtApXFHc= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index e5ecdc8..162a014 100644 --- a/main.go +++ b/main.go @@ -35,9 +35,9 @@ import ( "sync" "time" - "gitea.drjosh.dev/josh/jrouter/aurp" - "gitea.drjosh.dev/josh/jrouter/router" - "gitea.drjosh.dev/josh/jrouter/status" + "drjosh.dev/jrouter/aurp" + "drjosh.dev/jrouter/router" + "drjosh.dev/jrouter/status" "github.com/google/gopacket/pcap" "github.com/sfiera/multitalk/pkg/ddp" diff --git a/router/aarp.go b/router/aarp.go index 815471e..0a77015 100644 --- a/router/aarp.go +++ b/router/aarp.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "gitea.drjosh.dev/josh/jrouter/status" + "drjosh.dev/jrouter/status" "github.com/google/gopacket/pcap" "github.com/sfiera/multitalk/pkg/aarp" "github.com/sfiera/multitalk/pkg/ddp" diff --git a/router/aep.go b/router/aep.go index 8a3d99b..3736bb7 100644 --- a/router/aep.go +++ b/router/aep.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "gitea.drjosh.dev/josh/jrouter/atalk/aep" + "drjosh.dev/jrouter/atalk/aep" "github.com/sfiera/multitalk/pkg/ddp" ) diff --git a/router/nbp.go b/router/nbp.go index 03514a6..37820fb 100644 --- a/router/nbp.go +++ b/router/nbp.go @@ -21,8 +21,8 @@ import ( "fmt" "log" - "gitea.drjosh.dev/josh/jrouter/atalk" - "gitea.drjosh.dev/josh/jrouter/atalk/nbp" + "drjosh.dev/jrouter/atalk" + "drjosh.dev/jrouter/atalk/nbp" "github.com/sfiera/multitalk/pkg/ddp" ) diff --git a/router/nbp_aurp.go b/router/nbp_aurp.go index 31b46af..fc2c09e 100644 --- a/router/nbp_aurp.go +++ b/router/nbp_aurp.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "gitea.drjosh.dev/josh/jrouter/atalk/nbp" + "drjosh.dev/jrouter/atalk/nbp" "github.com/sfiera/multitalk/pkg/ddp" ) diff --git a/router/peer_aurp.go b/router/peer_aurp.go index ac4a914..aad9987 100644 --- a/router/peer_aurp.go +++ b/router/peer_aurp.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "gitea.drjosh.dev/josh/jrouter/aurp" + "drjosh.dev/jrouter/aurp" "github.com/sfiera/multitalk/pkg/ddp" ) diff --git a/router/port.go b/router/port.go index 6147baa..761ada0 100644 --- a/router/port.go +++ b/router/port.go @@ -23,7 +23,7 @@ import ( "io" "log" - "gitea.drjosh.dev/josh/jrouter/atalk" + "drjosh.dev/jrouter/atalk" "github.com/google/gopacket/pcap" "github.com/sfiera/multitalk/pkg/ddp" "github.com/sfiera/multitalk/pkg/ethernet" diff --git a/router/rtmp.go b/router/rtmp.go index b714e03..8b21c7a 100644 --- a/router/rtmp.go +++ b/router/rtmp.go @@ -22,10 +22,10 @@ import ( "log" "time" - "gitea.drjosh.dev/josh/jrouter/atalk" - "gitea.drjosh.dev/josh/jrouter/atalk/rtmp" - "gitea.drjosh.dev/josh/jrouter/atalk/zip" - "gitea.drjosh.dev/josh/jrouter/status" + "drjosh.dev/jrouter/atalk" + "drjosh.dev/jrouter/atalk/rtmp" + "drjosh.dev/jrouter/atalk/zip" + "drjosh.dev/jrouter/status" "github.com/sfiera/multitalk/pkg/ddp" ) diff --git a/router/zip.go b/router/zip.go index 9b668e2..53f8d01 100644 --- a/router/zip.go +++ b/router/zip.go @@ -21,9 +21,9 @@ import ( "fmt" "log" - "gitea.drjosh.dev/josh/jrouter/atalk" - "gitea.drjosh.dev/josh/jrouter/atalk/atp" - "gitea.drjosh.dev/josh/jrouter/atalk/zip" + "drjosh.dev/jrouter/atalk" + "drjosh.dev/jrouter/atalk/atp" + "drjosh.dev/jrouter/atalk/zip" "github.com/sfiera/multitalk/pkg/ddp" "github.com/sfiera/multitalk/pkg/ethernet" )