X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=5aa690fe1c207499b0580639dc7823fe5a1cc598;hb=9c077144213d28d7cdfa2d4383b0a3677458a2ea;hp=c427ee9af4e9e8d31a887c6ee6424b824a4bf0f2;hpb=ca148b380d86e5f1c64abcf803faceba02a834ac;p=gogost.git

diff --git a/makedist.sh b/makedist.sh
index c427ee9..5aa690f 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -7,21 +7,33 @@ release=$1
 
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
-git checkout $release
-git submodule update --init
-
-mkdir -p src/cypherpunks.ru/gogost/vendor
-cat > $tmp/includes <<EOF
-golang.org/x/crypto/AUTHORS
-golang.org/x/crypto/CONTRIBUTORS
-golang.org/x/crypto/LICENSE
-golang.org/x/crypto/PATENTS
-golang.org/x/crypto/README
-golang.org/x/crypto/pbkdf2
-EOF
-tar cfCI - src $tmp/includes | tar xfC - src/cypherpunks.ru/gogost/vendor
+git checkout v$release
+
+mod_name=$(sed -n 's/^module //p' go.mod)
+crypto_mod_path=$(sed -n 's#^require \(golang.org/x/crypto\) \(.*\)$#\1@\2#p' go.mod)
+mkdir -p src/$mod_name
+mv \
+    gost28147 \
+    gost3410 \
+    gost34112012256 \
+    gost34112012512 \
+    gost341194 \
+    gost3412128 \
+    gost341264 \
+    gost3413 \
+    mgm \
+    cmd internal gogost.go go.mod go.sum src/$mod_name
+
+mkdir -p src/golang.org/x/crypto
+( cd $GOPATH/pkg/mod/$crypto_mod_path ; \
+    tar cf - AUTHORS CONTRIBUTORS LICENSE PATENTS README.md pbkdf2 hkdf ) |
+    tar xfC - src/golang.org/x/crypto
+
 find . -name .git -type d | xargs rm -fr
-rm -fr www* makedist* TODO src/golang.org $tmp/includes
+rm -f www* news.texi style.css makedist* TODO
+
+find . -type d -exec chmod 700 {} \;
+find . -type f -exec chmod 600 {} \;
 
 cd ..
 tar cvf gogost-"$release".tar --uid=0 --gid=0 --numeric-owner gogost-"$release"
@@ -29,7 +41,7 @@ xz -9 gogost-"$release".tar
 gpg --detach-sign --sign --local-user 82343436696FC85A gogost-"$release".tar.xz
 
 tarball=gogost-"$release".tar.xz
-size=$(( $(wc -c < $tarball) / 1024 ))
+size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 hashsb=$($HOME/work/gogost/streebog256 < $tarball)
 release_date=$(date "+%Y-%m-%d")