Merge branch 'develop'

diff --git a/VERSION b/VERSION
index eb49d7c7fdcbb1b4745de39837864aa7f78570ac..aec258df73d39d2122706793921981f4a0f672f8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7
+0.8

diff --git a/doc/about.ru.texi b/doc/about.ru.texi
index 2478ea077ee778100eb8564714eb34091f2d6aa0..e9a2dce67c7c09cf6de59c0b443736beded1cc39 100644 (file)
--- a/doc/about.ru.texi
+++ b/doc/about.ru.texi
@@ -27,7 +27,7 @@ NNCP (Node to Node copy) это набор утилит упрощающий б
 воздушным зазором} (air-gap). Но также существует и online TCP демон с
 полнодуплексной возобновляемой передачей данных.
 
-Узнайте о возможных @ref{Сценарии использования, сценариях использования}!
+Узнайте о возможных @ref{Сценарии, сценариях использования}!
 
 NNCP это @url{https://www.gnu.org/philosophy/pragmatic.ru.html,
 копилефт} @url{https://www.gnu.org/philosophy/free-sw.ru.html, свободное

diff --git a/doc/download.texi b/doc/download.texi
index 0c683d564251b2e6eb72ac63e03d55b86b74068c..213d429645714e481fbd34614220944b4bba6a0d 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -24,6 +24,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 0.7, 0.7} @tab 783 KiB
+@tab @url{download/nncp-0.7.tar.xz, link} @url{download/nncp-0.7.tar.xz.sig, sign}
+@tab @code{D3407323 F89296DD 743FA764 51964B43 794E61BE 0E1D2DD4 ABD02042 B94FFC4F}
+
 @item @ref{Release 0.6, 0.6} @tab 746 KiB
 @tab @url{download/nncp-0.6.tar.xz, link} @url{download/nncp-0.6.tar.xz.sig, sign}
 @tab @code{DCFEE3F9 F669AC28 563C50DB 67BB8B43 0CFF4AB6 EC770ACE B5378D0B B40C0656}

diff --git a/doc/install.texi b/doc/install.texi
index eb8584682a04ac7b638ac8cf1c6b0e46ff395d33..a3c1cc2ead95f77f0b4b3cd4d7fa9917527c50b8 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,6 +1,13 @@
 @node Installation
 @unnumbered Installation
 
+Possibly NNCP package already exists for your distribution:
+
+@itemize
+@item @url{https://github.com/voidlinux/void-packages/blob/master/srcpkgs/nncp/template, Void Linux}
+@item @url{https://git.cypherpunks.ru/cgit.cgi/nncp.git/tree/ports/nncp, FreeBSD currently uncommitted port}
+@end itemize
+
 NNCP should run on any POSIX-compatible operating system.
 
 NNCP is written on @url{https://golang.org/, Go} programming language

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 2f6bc2e9d262b774ca03d05a7740e1b20520a753..cae730d0108cec0eeda0284ab49b5f3a27e34c91 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 0.8
+@subsection Релиз 0.8
+@itemize
+@item
+Небольшое исправление ошибки в команде @command{nncp-file}, где опция
+@option{-minsize} для передачи без разбиения на части была в байтах, а
+не KiB-ах.
+@end itemize
+
 @node Релиз 0.7
 @subsection Релиз 0.7
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 7bd287ce0ec758d7007e3edeb687f27d1903d873..0358a6c1cf865e0b4877d790d52a1b996cf91f89 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,14 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 0.8
+@section Release 0.8
+@itemize
+@item
+Little bugfix in @command{nncp-file} command, where @option{-minsize}
+option for unchunked transfer was not in KiBs, but in bytes.
+@end itemize
+
 @node Release 0.7
 @section Release 0.7
 @itemize

diff --git a/doc/russian.texi b/doc/russian.texi
index a377ea398d37507e685a3c6d3c6147d3c985e722..6c726683f145fe148ce5471dff247808f76eccda 100644 (file)
--- a/doc/russian.texi
+++ b/doc/russian.texi
@@ -4,7 +4,7 @@
 @menu
 * Подробнее об утилитах NNCP: Об утилитах.
 * Сравнение с существующими решениями: Сравнение.
-* Сценарии использования::
+* Сценарии использования: Сценарии.
 * Новости::
 @end menu
 

diff --git a/doc/usecases.ru.texi b/doc/usecases.ru.texi
index 19885c7bda991f28beee869b6d2c055149630f5b..e890e3e1ce3d95f5138947bd3e1dc182e1e9c4dd 100644 (file)
--- a/doc/usecases.ru.texi
+++ b/doc/usecases.ru.texi
@@ -1,4 +1,4 @@
-@node Сценарии использования
+@node Сценарии
 @section Сценарии использования
 
 @menu

diff --git a/doc/usecases.texi b/doc/usecases.texi
index 5f8fdcbb410e2b5d63b9942175fc3941a8075cda..7aa807fc062a285cbd880c7f1eee3c3e107722f2 100644 (file)
--- a/doc/usecases.texi
+++ b/doc/usecases.texi
@@ -1,6 +1,8 @@
 @node Use cases
 @unnumbered Use cases
 
+See also this page @ref{Сценарии, on russian}.
+
 @menu
 * Occasional connection to mail server: UsecaseMail.
 * Lightweight fast POP3/IMAP4 replacement: UsecasePOP.

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 3738689a2fe30c54fb2f90758a944504f5520ae7..e4086f77acb708d40f317cdd40a9dd4e983c7a5d 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=      nncp
-PORTVERSION=   0.7
+PORTVERSION=   0.8
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/ \
                http://sourceforge.net/projects/nncp/files/

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
index f3406fd455aa53cd6cb8ff9300d2b8d125ad0a0f..d922882fec7a3a301e9c793cddfc378ee122de61 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
@@ -95,7 +95,13 @@ func main() {
        }
 
        if *chunkSize == 0 {
-               err = ctx.TxFile(node, nice, flag.Arg(0), splitted[1], int64(*minSize))
+               err = ctx.TxFile(
+                       node,
+                       nice,
+                       flag.Arg(0),
+                       splitted[1],
+                       int64(*minSize)*1024,
+               )
        } else {
                err = ctx.TxFileChunked(
                        node,

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
index a5e96e69aed5e05fdf5137ae955579cf023b5d6f..8318191009af9b45f265307a52d61ba34850c657 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
@@ -90,7 +90,13 @@ func main() {
                log.Fatalln("Invalid NODE specified:", err)
        }
 
-       if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1), int64(*minSize)*1024); err != nil {
+       if err = ctx.TxFreq(
+               node,
+               nice,
+               splitted[1],
+               flag.Arg(1),
+               int64(*minSize)*1024,
+       ); err != nil {
                log.Fatalln(err)
        }
 }

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go
index d14c3d66c077cb205d76f4f956a117e97005cd68..f5f4de791d1e8023d75f8b34a6eaeaed018896e4 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go
@@ -91,7 +91,13 @@ func main() {
                log.Fatalln("Can not read mail body from stdin:", err)
        }
 
-       if err = ctx.TxMail(node, nice, strings.Join(flag.Args()[1:], " "), body, int64(*minSize)*1024); err != nil {
+       if err = ctx.TxMail(
+               node,
+               nice,
+               strings.Join(flag.Args()[1:], " "),
+               body,
+               int64(*minSize)*1024,
+       ); err != nil {
                log.Fatalln(err)
        }
 }

diff --git a/src/github.com/flynn/noise b/src/github.com/flynn/noise
index 690279792740403a8121e99d37c8f28f2e6edeb3..c90ff622305fbe90de9cdc3a23a85b966e09c929 160000 (submodule)
--- a/src/github.com/flynn/noise
+++ b/src/github.com/flynn/noise
@@ -1 +1 @@
-Subproject commit 690279792740403a8121e99d37c8f28f2e6edeb3
+Subproject commit c90ff622305fbe90de9cdc3a23a85b966e09c929

diff --git a/src/golang.org/x/crypto b/src/golang.org/x/crypto
index c7af5bf2638a1164f2eb5467c39c6cffbd13a02e..0fe963104e9d1877082f8fb38f816fcd97eb1d10 160000 (submodule)
--- a/src/golang.org/x/crypto
+++ b/src/golang.org/x/crypto
@@ -1 +1 @@
-Subproject commit c7af5bf2638a1164f2eb5467c39c6cffbd13a02e
+Subproject commit 0fe963104e9d1877082f8fb38f816fcd97eb1d10

diff --git a/src/golang.org/x/net b/src/golang.org/x/net
index da118f7b8e5954f39d0d2130ab35d4bf0e3cb344..34057069f4ab13dc4433c68d368737ebeafcccdc 160000 (submodule)
--- a/src/golang.org/x/net
+++ b/src/golang.org/x/net
@@ -1 +1 @@
-Subproject commit da118f7b8e5954f39d0d2130ab35d4bf0e3cb344
+Subproject commit 34057069f4ab13dc4433c68d368737ebeafcccdc

diff --git a/src/golang.org/x/sys b/src/golang.org/x/sys
index 9ccfe848b9db8435a24c424abbc07a921adf1df5..98b5b1e7e80eb60271c8dc4eba6521ec2c3e811e 160000 (submodule)
--- a/src/golang.org/x/sys
+++ b/src/golang.org/x/sys
@@ -1 +1 @@
-Subproject commit 9ccfe848b9db8435a24c424abbc07a921adf1df5
+Subproject commit 98b5b1e7e80eb60271c8dc4eba6521ec2c3e811e

diff --git a/src/gopkg.in/yaml.v2 b/src/gopkg.in/yaml.v2
index a5b47d31c556af34a302ce5d659e6fea44d90de0..cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b 160000 (submodule)
--- a/src/gopkg.in/yaml.v2
+++ b/src/gopkg.in/yaml.v2
@@ -1 +1 @@
-Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0
+Subproject commit cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b