doc/INSTALL | 22 +++++++++++----------- doc/Integrity | 2 +- doc/download | 34 +++++++++++----------------------- go.mod | 2 +- go.sum | 4 ++-- internal/ns.go | 2 +- makedist | 35 ++++++++++++++++++++++++++++------- diff --git a/doc/INSTALL b/doc/INSTALL index fb1c53dbf42205d315ea19be16226d174cc3736acf8532dc368c04ab51f426b7..4fcb93ccec07c34140f6dd7aab2591b6b629a9011f218ed116846e052cc9aa39 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -17,10 +17,10 @@ => https://sourceforge.net/projects/sox/ SoX $ version=6.3.0 - $ [fetch|wget] http://www.vors.stargrave.org/download/vors-$version.tar.zst - $ [fetch|wget] http://www.vors.stargrave.org/download/vors-$version.tar.zst.sig + $ fetch http://www.vors.stargrave.org/download/vors-$version.tar.zst + $ fetch http://www.vors.stargrave.org/download/vors-$version.tar.zst.sig [verify signature] - $ [fetch|wget] https://downloads.xiph.org/releases/opus/opus-1.6.tar.gz + $ fetch https://downloads.xiph.org/releases/opus/opus-1.6.tar.gz $ [ "$(sha512 http://y.www.vors.stargrave.org/ +=> http://[322:3bd:cc26:9545:b00b:bda9:e054:1836]/ => https://yggdrasil-network.github.io/ Yggdrasil You can obtain development source code with git clone git://git.stargrave.org/vors.git You can also use -anongit@master.git.stargrave.org:stargrave.org/vors.git -anongit@slave.git.stargrave.org:stargrave.org/vors.git -anongit@master.git.cypherpunks.su:stargrave.org/vors.git -anongit@slave.git.cypherpunks.su:stargrave.org/vors.git -git://git.cypherpunks.su/vors.git -git://y.git.stargrave.org/vors.git -git://y.git.cypherpunks.su/vors.git URLs instead. + anongit@master.git.stargrave.org:stargrave.org/vors.git + anongit@slave.git.stargrave.org:stargrave.org/vors.git + git://y.git.stargrave.org/vors.git + git://[322:3bd:cc26:9545:b00b:5e3c:7a5d:bb97]/vors.git + git://[322:3bd:cc26:9545:b00b:4d3f:777f:b7f8]/vors.git diff --git a/doc/Integrity b/doc/Integrity index ca8df30c90c51853925228d3178b4090f8e0a89fa0709dfff857bec486166617..72adabdbd6f17fcdc0a26a4ce7ec1dee281c812420d84f1ae598942b4cfb41c4 100644 --- a/doc/Integrity +++ b/doc/Integrity @@ -1,6 +1,6 @@ You *have to* verify downloaded tarballs authenticity to be sure that you retrieved trusted and untampered software. OpenSSH .sig signature -[PUBKEY-SSH.pub] and its OpenPGP [PUBKEY-SSH.pub.asc] made with the key +[PUBKEY-SSH.pub] and its LibrePGP [PUBKEY-SSH.pub.asc] made with the key above. Its fingerprint: SHA256:qmlbyzvDRNXGJNxteapAWOmJRrBrZ7afLsEqr36M6kA. => https://www.openssh.com/ OpenSSH diff --git a/doc/download b/doc/download index 9897218b81f25923b79d49f9350c5f643943467f8e79280fb115542cd1e454ab..a9e8ebea45de6d42cc79ce98bca0f11c48a586b6bb79fbc4c2666d5bee93e57c 100644 --- a/doc/download +++ b/doc/download @@ -1,39 +1,27 @@ +Look in .meta4 files for various other download links! +=> https://datatracker.ietf.org/doc/html/rfc5854 Metalink4 + 6.3.0 | 2025-12-17 | 519 KiB - => download/vors-6.3.0.tar.zst.meta4 => download/vors-6.3.0.tar.zst - => download/vors-6.3.0.tar.zst.sig - + => download/vors-6.3.0.tar.zst.meta4 6.2.0 | 2025-12-05 | 7066 KiB - => download/vors-6.2.0.tar.zst.meta4 => download/vors-6.2.0.tar.zst - => download/vors-6.2.0.tar.zst.sig - + => download/vors-6.2.0.tar.zst.meta4 6.1.0 | 2025-11-12 | 7066 KiB - => download/vors-6.1.0.tar.zst.meta4 => download/vors-6.1.0.tar.zst - => download/vors-6.1.0.tar.zst.sig - + => download/vors-6.1.0.tar.zst.meta4 6.0.0 | 2025-09-25 | 7065 KiB - => download/vors-6.0.0.tar.zst.meta4 => download/vors-6.0.0.tar.zst - => download/vors-6.0.0.tar.zst.sig - + => download/vors-6.0.0.tar.zst.meta4 5.0.0 | 2025-08-02 | 7065 KiB + => download/vors-5.0.0.tar.zst => download/vors-5.0.0.tar.zst.meta4 - => download/vors-5.0.0.tar.zst - => download/vors-5.0.0.tar.zst.sig - 4.0.0 | 2025-05-30 | 7243 KiB - => download/vors-4.0.0.tar.zst.meta4 => download/vors-4.0.0.tar.zst - => download/vors-4.0.0.tar.zst.sig - + => download/vors-4.0.0.tar.zst.meta4 3.1.0 | 2024-05-15 | 7200 KiB - => download/vors-3.1.0.tar.zst.meta4 => download/vors-3.1.0.tar.zst - => download/vors-3.1.0.tar.zst.sig - + => download/vors-3.1.0.tar.zst.meta4 2.3.0 | 2024-04-16 | 7192 KiB - => download/vors-2.3.0.tar.zst.meta4 => download/vors-2.3.0.tar.zst - => download/vors-2.3.0.tar.zst.sig + => download/vors-2.3.0.tar.zst.meta4 diff --git a/go.mod b/go.mod index 89befde7a1f63d763c789ea499d6f6735fe70fa6bad1f5cf90b6789c07bbbdad..cc5056b33ceb45a835f8b4cb62b066a1e6f14089661ca605261a0ab08ad6eb47 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da github.com/dchest/siphash v1.2.3 github.com/dustin/go-humanize v1.0.1 github.com/jroimartin/gocui v0.5.0 - go.cypherpunks.su/netstring/v3 v3.0.0 + go.stargrave.org/netstring/v4 v4.0.0 go.stargrave.org/opus/v2 v2.1.0 golang.org/x/term v0.32.0 ) diff --git a/go.sum b/go.sum index 34e5b3f0e5440f95ee658efb8f86a29c635074995d782ee78237ea53d79c9f17..573fb5f38aa1a7e12ff24f43bd9bf458a41c6192bf3fd1612f0d0e46c5b09cbc 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY= github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo= -go.cypherpunks.su/netstring/v3 v3.0.0 h1:wwFjxTb/LZM8cQN/UiOPMO5wcuq4xCQWdLAYz74E6kY= -go.cypherpunks.su/netstring/v3 v3.0.0/go.mod h1:S9pYNVqT6kL2uXbdHz+yxc+A4sAFxBkjSzu+g6KD0QE= +go.stargrave.org/netstring/v4 v4.0.0 h1:Y/8R5P23uG5GncMqszM9biEg0NDl3CxQ8JAYCZhLqlA= +go.stargrave.org/netstring/v4 v4.0.0/go.mod h1:MdHiHyd+n9App72u4ruriypqcQE/Rj8MnVjIQY6m+hA= go.stargrave.org/opus/v2 v2.1.0 h1:WwyMf76wcIWEPIQlU2UI5V9YkqXRHQhq6wfZGslcMFc= go.stargrave.org/opus/v2 v2.1.0/go.mod h1:Y57qgcaXH7jBvKW89fscWOT/Wd3MYfhXUbYUcOMV0A8= golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= diff --git a/internal/ns.go b/internal/ns.go index b23a1de2e4c558b2365d800ac9bd0c1b6ae23b126900b9a53b70238c3688cabb..21cfa2c851f02fa5fe8e23636e6cc65eacf02f6c146ac23ff8e3569b916ae504 100644 --- a/internal/ns.go +++ b/internal/ns.go @@ -8,7 +8,7 @@ "log" "net" "sync" - "go.cypherpunks.su/netstring/v3" + "go.stargrave.org/netstring/v4" ) func ArgsEncode(datum ...[]byte) []byte { diff --git a/makedist b/makedist index 081eab04afc9d1f0489d4e776a867e252bf7b4ea7ae59bc5f7f0fe07fc9b047d..da7e14ca7b4fe4c6827c770e595c6fcf3d13589bdc60bd31cef61098481139a1 100755 --- a/makedist +++ b/makedist @@ -37,10 +37,32 @@ detpax vors-"$release" >vors-"$release".tar zstd -22 --ultra -v vors-"$release".tar tarball=vors-"$release".tar.zst ssh-keygen -Y sign -f ~/.ssh/sign/vors@stargrave.org -n file $tarball -meta4ra-create -fn "$tarball" -mtime "$tarball" \ - -sig-ssh "$tarball".sig \ - http://www.vors.stargrave.org/download/"$tarball" \ - http://y.www.vors.stargrave.org/download/"$tarball" <"$tarball" >"$tarball".meta4 +meta4ra-create -fn $tarball -mtime $tarball \ + -sig-ssh $tarball.sig \ + "1|ru|http://www.vors.stargrave.org/download/$tarball" \ + "2|ru|http://msk.www.vors.stargrave.org/download/$tarball" \ + "2|ru|http://spb.www.vors.stargrave.org/download/$tarball" \ + "3|ru|https://www.vors.stargrave.org/download/$tarball" \ + "4|ru|https://msk.www.vors.stargrave.org/download/$tarball" \ + "4|ru|https://spb.www.vors.stargrave.org/download/$tarball" \ + "5|ru|http://y.www.vors.stargrave.org/download/$tarball" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:bda9:e054:1836]/download/$tarball" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/vors.stargrave.org/download/$tarball" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/vors.stargrave.org/download/$tarball" \ + <$tarball >$tarball.meta4 +meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ + "1|ru|http://www.vors.stargrave.org/download/$tarball.sig" \ + "2|ru|http://msk.www.vors.stargrave.org/download/$tarball.sig" \ + "2|ru|http://spb.www.vors.stargrave.org/download/$tarball.sig" \ + "3|ru|https://www.vors.stargrave.org/download/$tarball.sig" \ + "4|ru|https://msk.www.vors.stargrave.org/download/$tarball.sig" \ + "4|ru|https://spb.www.vors.stargrave.org/download/$tarball.sig" \ + "5|ru|http://y.www.vors.stargrave.org/download/$tarball.sig" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:bda9:e054:1836]/download/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/vors.stargrave.org/download/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/vors.stargrave.org/download/$tarball.sig" \ + <$tarball.sig >$tarball.meta4_ +mv $tarball.meta4_ $tarball.meta4 size=$(( $(stat -f %z $tarball) / 1024 )) release_date=$(date "+%Y-%m-%d") @@ -48,9 +70,8 @@ cat < download/$tarball.meta4 => download/$tarball - => download/$tarball.sig + => download/$tarball.meta4 EOF -mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/vors.html/download +mv $tmp/$tarball $tmp/$tarball.sig $tarball.meta4 $cur/doc/vors.html/download