From: Sergey Matveev Date: Sun, 22 Mar 2026 11:12:34 +0000 (+0300) Subject: Forgotten v2 raise X-Git-Tag: v2.1.0^0 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=7d301834bf2f1591c6194ac59b3759f4beac3bff;p=meta4ra.git Forgotten v2 raise --- diff --git a/bin/meta4ra-hashers-detect b/bin/meta4ra-hashers-detect index 66bcb1b..9b6b11e 100755 --- a/bin/meta4ra-hashers-detect +++ b/bin/meta4ra-hashers-detect @@ -94,7 +94,7 @@ unhexdump="hexdump -v -e '/1 \"%02x\"' ; echo" n=streebog-512 if [ -z "$desired" ] || [ $desired = "$n" ] ; then HSH=84d883ede9fa6ce855d82d8c278ecd9f5fc88bf0602831ae0c38b9b506ea3cb02f3fa076b8f5664adf1ff862c0157da4cc9a83e141b738ff9268a9ba3ed6f563 - check $n streebog512 || # go.cypherpunks.su/gogost + check $n streebog512 || # go.stargrave.org/gogost check $n "nettle-hash --algorithm=streebog512 --raw | $unxxd" || check $n "nettle-hash --algorithm=streebog512 --raw | $unhexdump" || check $n "libressl dgst -streebog512" || diff --git a/cmd/check.go b/cmd/check.go index 09bfe2f..ecd7a3b 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -27,7 +27,7 @@ import ( "strings" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runCheck() { diff --git a/cmd/create.go b/cmd/create.go index ef72428..959dd03 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -27,7 +27,7 @@ import ( "path" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runCreate() { diff --git a/cmd/dl.go b/cmd/dl.go index db000c5..6452783 100644 --- a/cmd/dl.go +++ b/cmd/dl.go @@ -25,7 +25,7 @@ import ( "os" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runDl() { diff --git a/cmd/hash.go b/cmd/hash.go index 7fc377c..1ae26db 100644 --- a/cmd/hash.go +++ b/cmd/hash.go @@ -24,7 +24,7 @@ import ( "os" "strings" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runHash() { diff --git a/cmd/list.go b/cmd/list.go index e1e0acc..0ca23f9 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -24,7 +24,7 @@ import ( "os" "strings" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runList() { diff --git a/go.mod b/go.mod index 44b5c66..a455459 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.stargrave.org/meta4ra +module go.stargrave.org/meta4ra/v2 go 1.24.0 @@ -6,7 +6,7 @@ require ( github.com/dchest/skein v0.0.0-20171112102903-d7f1022db390 github.com/dustin/go-humanize v1.0.1 github.com/zeebo/xxh3 v1.0.2 - go.cypherpunks.su/gogost/v6 v6.1.0 + go.stargrave.org/gogost/v7 v7.0.0 golang.org/x/crypto v0.33.0 lukechampine.com/blake3 v1.4.1 ) diff --git a/go.sum b/go.sum index 65e88ad..db744b6 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.cypherpunks.su/gogost/v6 v6.1.0 h1:RJHFxDZ2j/TIfHXGn4AG0fTDg19GEX/oVFAgMvLCIPM= -go.cypherpunks.su/gogost/v6 v6.1.0/go.mod h1:cj9i0r80PN7jrwMqBAWhaY8JetCeg4x5jjnZsVRkaPI= +go.stargrave.org/gogost/v7 v7.0.0 h1:yTkNKH9TBrb4nZyMXrAateyZYDvauwH1gCVBL+TwF38= +go.stargrave.org/gogost/v7 v7.0.0/go.mod h1:NlrCXlmZahvPeDbIcidlrQ4u7U5FrJJOAPZGKped/Zs= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= diff --git a/internal/common.go b/internal/common.go index 2276101..760c1d3 100644 --- a/internal/common.go +++ b/internal/common.go @@ -21,7 +21,7 @@ import ( ) const ( - Generator = "meta4ra/2.0.0" + Generator = "meta4ra/2.1.0" SigMediaTypePGP = "application/pgp-signature" SigMediaTypeSSH = "application/ssh-signature" BufLen = 1 << 20 diff --git a/internal/thirdparty.go b/internal/thirdparty.go index 4a50aa7..fac89d3 100644 --- a/internal/thirdparty.go +++ b/internal/thirdparty.go @@ -21,8 +21,8 @@ import ( "hash" "github.com/dchest/skein" - "go.cypherpunks.su/gogost/v6/gost34112012256" - "go.cypherpunks.su/gogost/v6/gost34112012512" + "go.stargrave.org/gogost/v7/gost34112012256" + "go.stargrave.org/gogost/v7/gost34112012512" "golang.org/x/crypto/blake2b" "lukechampine.com/blake3" ) diff --git a/makedist b/makedist index 30bc7ee..deeeb61 100755 --- a/makedist +++ b/makedist @@ -33,6 +33,8 @@ meta4ra-create -fn $tarball -mtime $tarball -sig-ssh $tarball.sig \ "4|ru|https://spb.www.meta4ra.stargrave.org/download/$tarball" \ "5|ru|http://y.www.meta4ra.stargrave.org/download/$tarball" \ "5|ru|http://[322:3bd:cc26:9545:b00b:66d6:6245:e58b]/download/$tarball" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/meta4ra.stargrave.org/download/$tarball" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/meta4ra.stargrave.org/download/$tarball" \ <$tarball >$tarball.meta4 meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ -id "OpenSSH signature" \ @@ -44,6 +46,8 @@ meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ "4|ru|https://spb.www.meta4ra.stargrave.org/download/$tarball.sig" \ "5|ru|http://y.www.meta4ra.stargrave.org/download/$tarball.sig" \ "5|ru|http://[322:3bd:cc26:9545:b00b:66d6:6245:e58b]/download/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/meta4ra.stargrave.org/download/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/meta4ra.stargrave.org/download/$tarball.sig" \ <$tarball.sig >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4