Merge branch 'develop'

diff --git a/doc/download.texi b/doc/download.texi
index 42be869166b4b5009f7a945b52a22b80395e1207..bb67b1cc36f73d18bde3303fdf2e0b681b872207 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -30,6 +30,13 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 link sig} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 8_0_1, 8.0.1} @tab 2021-11-09 @tab 1206 KiB
+@tab
+    @url{download/nncp-8.0.1.tar.xz.meta4, meta4}
+    @url{download/nncp-8.0.1.tar.xz, link}
+    @url{download/nncp-8.0.1.tar.xz.sig, sig}
+@tab @code{0F849065 19EDB1BF E3262B35 077CD6F6 F365A897 2BA7D369 4864F3CE 4CA4C5A0}
+
 @item @ref{Release 8_0_0, 8.0.0} @tab 2021-11-08 @tab 1203 KiB
 @tab
     @url{download/nncp-8.0.0.tar.xz.meta4, meta4}

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index e3cd38c2ef9eb9cf7006f06c49b0d6b4fc05b5d3..5bf929b1e89afc1ea0271953c0ca925be51db4b2 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.0.2
+@subsection Релиз 8.0.2
+@itemize
+
+@item
+Исправлена возможность отправки мультивещательных пакетов.
+
+@end itemize
+
 @node Релиз 8.0.1
 @subsection Релиз 8.0.1
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index f0e71f9380879a3f3a8acd358fafaea671ebb3cf..2b04c63a1ab479f547c37d542ab01321b4f25517 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_0_2
+@section Release 8.0.2
+@itemize
+
+@item
+Fixed sending ability to areas.
+
+@end itemize
+
 @node Release 8_0_1
 @section Release 8.0.1
 @itemize

diff --git a/makedist.sh b/makedist.sh
index 03fdbb9b4baf9560e7e60b65ded0a4deba837523..0c90ba8fd034cb37ae417c20c82b1d0e92e32e0a 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -26,7 +26,7 @@ rm -r \
     golang.org/x/sys/plan9 \
     golang.org/x/sys/windows
 find github.com/klauspost/compress golang.org/x/sys -name "*_test.go" -delete
-find . -type d -exec rmdir {} + || :
+find . -type d -exec rmdir {} + 2>/dev/null || :
 cd ../..
 rm -r ports
 find . \( \
@@ -195,6 +195,9 @@ http://www.nncpgo.org/Mirrors.html
 Please send questions regarding the use of NNCP, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
+echo mutt -s \"[EN] NNCP $release release announcement\" \
+    nncp-devel@lists.cypherpunks.ru \
+    -a $cur/doc/download/"$tarball".meta4
 
 cat <<EOF
 Subject: [RU] Состоялся релиз NNCP $release
@@ -248,3 +251,6 @@ http://www.nncpgo.org/Mirrors.html
 и патчи отправляйте в nncp-devel почтовую рассылку:
 http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
+echo mutt -s \"[RU] Состоялся релиз NNCP $release\" \
+    nncp-devel@lists.cypherpunks.ru \
+    -a $cur/doc/download/"$tarball".meta4

diff --git a/src/nncp.go b/src/nncp.go
index b56be2958d2cd811e06ddbf9ac59d62bedee0cc7..d6a6d857ad08f40a7f74d667d2ab03fcaac15639 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-       Version string = "8.0.1"
+       Version string = "8.0.2"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )

diff --git a/src/tx.go b/src/tx.go
index b8d47aa6148ae87ad542b20236c67a106130f404..fd4e0fbdec5182a7f689731de9a3591e15eb80ae 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -205,6 +205,7 @@ func (ctx *Ctx) Tx(
                r := <-results
                payloadSize = r.size
                pktEncMsg = r.pktEncRaw
+               wrappers--
        }
        for i := 0; i <= wrappers; i++ {
                r := <-results