From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 10 Nov 2021 09:45:22 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: v8.0.2^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=c8efe853c5381ea453532e577ff6b3a2c0a947dc;hp=e101af62bf1b32dd49043431b19117f8d7977f65

Merge branch 'develop'
---

diff --git a/doc/download.texi b/doc/download.texi
index 42be869..bb67b1c 100644
--- 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 e3cd38c..5bf929b 100644
--- 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 f0e71f9..2b04c63 100644
--- 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 03fdbb9..0c90ba8 100755
--- 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 b56be29..d6a6d85 100644
--- 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 b8d47aa..fd4e0fb 100644
--- 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