Fix nncp-bundle workability

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 61db7628a9b46e264c1dd3e3236788e4cd7835c9..cbf7f3ebac674faec6783a1decee1d6af5d6dec8 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.5.0
+@subsection Релиз 8.5.0
+@itemize
+
+@item
+Исправлена работоспособность @command{nncp-bundle}.
+
+@end itemize
+
 @node Релиз 8.4.0
 @subsection Релиз 8.4.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index fbb1d463bace4ba89fd22b1867f3949395b4cd4e..3114c1a2382835eb339fd1acac9a49bd1238a21a 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_5_0
+@section Release 8.5.0
+@itemize
+
+@item
+Fixed @command{nncp-bundle} workability.
+
+@end itemize
+
 @node Release 8_4_0
 @section Release 8.4.0
 @itemize

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 42a9417be18d53f94c2e24d8605ef264763d3ede..d5603a99b1ab8cc2082cc219f46a3fb065321c14 100644 (file)
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -316,6 +316,8 @@ func main() {
                        case nncp.MagicNNCPEv4.B:
                                err = nncp.MagicNNCPEv4.TooOld()
                        case nncp.MagicNNCPEv5.B:
+                               err = nncp.MagicNNCPEv5.TooOld()
+                       case nncp.MagicNNCPEv6.B:
                        default:
                                err = errors.New("Bad packet magic number")
                        }

diff --git a/src/nncp.go b/src/nncp.go
index b9457d378b686e13dfbf7a47fbc95fcf0da711e5..b2303c0d7aa55424a481421ab6e1367ac6e55496 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.4.0"
+       Version string = "8.5.0"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )