Set VERSION and include redo.sh

diff --git a/VERSION b/VERSION
index 80895903a15c8a6a7df7ca72da9a3ed78fe07eca..f77856a6f1af5be6984fa25aaa2e17616e1030ab 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.3.0
+4.3.1

diff --git a/install.texi b/install.texi
index cd6c450fdd096e16ec7bee603b43b27b0285fc76..5769e8798d50a9f2b8a25570cdfa9f76fc70b93f 100644 (file)
--- a/install.texi
+++ b/install.texi
@@ -1,7 +1,7 @@
 @node Download
 @unnumbered Download
 
-@set VERSION 4.3.0
+@set VERSION 4.3.1
 
 Preferable way is to download tarball with the signature from
 website and, for example, run tests with benchmarks:
@@ -12,20 +12,14 @@ $ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.xz.si
 $ gpg --verify gogost-@value{VERSION}.tar.xz.sig gogost-@value{VERSION}.tar.xz
 $ xz --decompress --stdout gogost-@value{VERSION}.tar.xz | tar xf -
 $ cd gogost-@value{VERSION}
-$ redo bench
-$ redo all
+$ redo bench all
 $ echo hello world | ./streebog256
 f72018189a5cfb803dbe1f2149cf554c40093d8e7f81c21e08ac5bcd09d9934d
 @end example
 
 It uses @url{http://cr.yp.to/redo.html, redo} build system for that
 examples. You can use either dozen of various implementations, or at
-least minimalistic POSIX shell @code{apenwarr/do}:
-
-@example
-$ [fetch|wget] https://github.com/apenwarr/redo/raw/master/minimal/do
-$ mv do redo ; chmod +x redo
-@end example
+least minimalistic POSIX shell @command{contrib/do} included in tarball.
 
 @include download.texi
 

diff --git a/makedist.sh b/makedist.sh
index d7f992e1b9a80c74824d77864313c454faa5b9b7..84801211f8849d1d7bc438777bc2d135d805246c 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -29,6 +29,9 @@ mv \
 rm module-name.do clean.do
 echo $mod_name > module-name
 find . -name "*.do" -exec perl -i -npe "s/^go/GOPATH=\`pwd\` go/" {} \;
+perl -i -npe "s/UNKNOWN/v$release/" src/$mod_name/gogost.go
+mkdir contrib
+cp ~/work/redo/minimal/do contrib/do
 
 mkdir -p src/golang.org/x/crypto
 ( cd $GOPATH/pkg/mod/$crypto_mod_path ; \
@@ -74,6 +77,7 @@ rm -f *.texi www.do style.css makedist.sh TODO .gitignore
 
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
+chmod 755 contrib/do
 
 cd ..
 tar cvf gogost-"$release".tar --uid=0 --gid=0 --numeric-owner gogost-"$release"