diff --git a/go.mod b/go.mod index 32e5bcc..836809d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,8 @@ require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b github.com/carlmjohnson/requests v0.22.3 - github.com/cretz/bine v0.2.0 + // master + github.com/cretz/bine v0.2.1-0.20220825052916-cb1f9e88dfba github.com/dchest/captcha v1.0.0 github.com/dgraph-io/ristretto v0.1.1 github.com/disintegration/imaging v1.6.2 diff --git a/go.sum b/go.sum index 5ecb331..c2c4592 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/coreos/go-iptables v0.6.0 h1:is9qnZMPYjLd8LYqmm/qlE+wwEgJIkTYdhV3rfZo github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cretz/bine v0.2.0 h1:8GiDRGlTgz+o8H9DSnsl+5MeBK4HsExxgl6WgzOCuZo= -github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI= +github.com/cretz/bine v0.2.1-0.20220825052916-cb1f9e88dfba h1:80J3s+Gi3CDC6EoPlb9L6Pdddwi1ZqjlrZtbKl5vTtU= +github.com/cretz/bine v0.2.1-0.20220825052916-cb1f9e88dfba/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= diff --git a/tor.go b/tor.go index 6ce2da5..233b78a 100644 --- a/tor.go +++ b/tor.go @@ -49,7 +49,6 @@ func (a *goBlog) startOnionService(h http.Handler) error { defer listenCancel() // Create a v3 onion service to listen on any port but show as 80 onion, err := t.Listen(listenCtx, &tor.ListenConf{ - Version3: true, Key: torKey, RemotePorts: []int{80}, NonAnonymous: a.cfg.Server.TorSingleHop, diff --git a/updateDeps.sh b/updateDeps.sh index 5d44287..00aef8c 100755 --- a/updateDeps.sh +++ b/updateDeps.sh @@ -4,6 +4,12 @@ FLAGS="-tags=linux,libsqlite3,sqlite_fts5" SKIP=" golang.org/x/crypto " +EXTRA=" +github.com/cretz/bine@master +github.com/tkrajina/gpxgo@master +github.com/yuin/goldmark-emoji@master +willnorris.com/go/microformats@main +" checkSkip() { echo $SKIP | grep -F -q -w "$1" @@ -25,5 +31,15 @@ do echo "" echo "Update $update" GOFLAGS=$FLAGS go get $update@latest - GOFLAGS=$FLAGS go mod tidy -done \ No newline at end of file +done + +# 3. Update extra packages +for e in $EXTRA +do + echo "" + echo "Update $e" + GOFLAGS=$FLAGS go get $e +done + +# 4. Tidy +GOFLAGS=$FLAGS go mod tidy \ No newline at end of file