Update gosha3

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 69e58278eb6d95f424f7710cd731358f28addd0f71ac6a458b5770509b9a85f8..a0ff2eceaed4cfd575a6eeff00a6bdd2b93ee967890732a3ec553a9d7ea78d05 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -79,7 +79,7 @@
 /golang.org-x-tools-0.18.0-modcache
 /gomodcache/
 /goredo-2.8.0.tar.zst
-/gosha3-v1.0.0-modcache
+/gosha3-v1.1.0-modcache
 /gpgme-1.23.2.tar.bz2
 /graphviz-11.0.0.tar.xz
 /grep-3.11.tar.xz

diff --git a/build/distfiles/gosha3-v1.0.0-modcache.do b/build/distfiles/gosha3-v1.0.0-modcache.do
deleted file mode 100644 (file)
index 4005c03..0000000
--- a/build/distfiles/gosha3-v1.0.0-modcache.do
+++ /dev/null
@@ -1,20 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-
-redo-ifchange "$BASS_ROOT"/build/lib/zip-hash/zip-hash
-vdir="$GOMODCACHE"/cache/download/go.stargrave.org/gosha3/@v
-mkdir -p $vdir
-. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
-$JUSTDL tmp http://proxy.go.stargrave.org/go.stargrave.org/gosha3/@v/v1.0.0.zip
-$FSYNC tmp
-[ "$("$BASS_ROOT"/build/lib/zip-hash/zip-hash tmp)" = "h1:aJJZpPd0pze3vUEdeI7rrhtYfbsBwxGCBAj1KH8u4hA=" ]
-mv tmp $vdir/v1.0.0.zip
-go mod init dummy
-GOPROXY=direct go get go.stargrave.org/gosha3/cmd/goshake128@v1.0.0
-while read mod hsh ; do
-    [ "$("$BASS_ROOT"/build/lib/zip-hash/zip-hash "$GOMODCACHE"/cache/download/$mod.zip)" = "$hsh" ]
-done <<EOF
-golang.org/x/crypto/@v/v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/sys/@v/v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-EOF
-touch "$DISTFILES"/$3

diff --git a/build/distfiles/gosha3-v1.1.0-modcache.do b/build/distfiles/gosha3-v1.1.0-modcache.do
new file mode 100644 (file)
index 0000000..723ac5e
--- /dev/null
+++ b/build/distfiles/gosha3-v1.1.0-modcache.do
@@ -0,0 +1,19 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+
+redo-ifchange "$BASS_ROOT"/build/lib/zip-hash/zip-hash
+vdir="$GOMODCACHE"/cache/download/go.stargrave.org/gosha3/@v
+mkdir -p $vdir
+cd $vdir
+url=http://proxy.go.stargrave.org/go.stargrave.org/gosha3/@v
+$JUSTDL tmp $url/v1.1.0.zip
+$FSYNC tmp
+[ "$("$BASS_ROOT"/build/lib/zip-hash/zip-hash tmp)" = "h1:9FDmAEU07dVhWV5GYoaetbspzU5u+2amPXClwvHVZ6Q=" ]
+mv tmp v1.1.0.zip
+for ext in info mod ziphash ; do
+    fn=v1.1.0.$ext
+    $JUSTDL tmp $url/$fn
+    $FSYNC tmp
+    mv tmp $fn
+done
+touch "$DISTFILES"/$3

diff --git a/build/skel/security/gosha3-v1.0.0.do b/build/skel/security/gosha3-v1.1.0.do
similarity index 82%
rename from build/skel/security/gosha3-v1.0.0.do
rename to build/skel/security/gosha3-v1.1.0.do
index 2276075fa1351518d137fdfc1991c769598dfced9c984e195db3c1c8fa5a78f0..c8c7471ffeb42fd2d9da1ee4d8fe5513820f4cd86668ce9f19f22a054af9fc69 100644 (file)
--- a/build/skel/security/gosha3-v1.0.0.do
+++ b/build/skel/security/gosha3-v1.1.0.do
@@ -10,10 +10,12 @@ hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . ./rc
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
+unzip "$GOMODCACHE"/cache/download/go.stargrave.org/gosha3/@v/v1.1.0.zip
 mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/bin
 export GOBIN="$SKELBINS"/$ARCH/$NAME-$hsh/bin
-go install go.stargrave.org/gosha3/cmd/goshake128@v1.0.0
-go install go.stargrave.org/gosha3/cmd/goshake256@v1.0.0
+cd go.stargrave.org/gosha3@v1.1.0
+chmod +x build
+./build
 
 cd "$SKELBINS"/$ARCH
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh