VERSION | 2 +- doc/building.texi | 12 ++++++------ doc/cmds.texi | 3 ++- doc/download.texi | 5 ++++- doc/integration.texi | 17 +++++++++++++++++ doc/integrity.texi | 2 +- doc/news.ru.texi | 9 +++++++++ doc/news.texi | 9 +++++++++ ports/nncp/Makefile | 2 +- src/cmd/nncp-file/main.go | 3 +++ diff --git a/VERSION b/VERSION index 1ae196976b7a2ef843d0d2f10e955748756b96f3d2c136472230332a6e3e82ac..05e2d1d765d5f1e08f762bed62ec68e741252932278b059d74dd571e480ce227 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.0 +5.1.1 diff --git a/doc/building.texi b/doc/building.texi index 041c7bef055d6dc1ee865771b28c8483669334494abcd0cb0db153365731e1c9..ab4c0aa94c52dcbe151d5ddb1873d9e293981776f4d88464611570058a056b34 100644 --- a/doc/building.texi +++ b/doc/building.texi @@ -11,16 +11,16 @@ @verb{|apt install golang|} @end table @verbatim -$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.0.tar.xz -$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.0.tar.xz.sig -$ gpg --verify nncp-5.1.0.tar.xz.sig nncp-5.1.0.tar.xz -$ xz --decompress --stdout nncp-5.1.0.tar.xz | tar xf - -$ make -C nncp-5.1.0 all +$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.1.tar.xz +$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.1.tar.xz.sig +$ gpg --verify nncp-5.1.1.tar.xz.sig nncp-5.1.1.tar.xz +$ xz --decompress --stdout nncp-5.1.1.tar.xz | tar xf - +$ make -C nncp-5.1.1 all @end verbatim There is @command{install} make-target respecting @env{DESTDIR}. It will install binaries and info-documentation: @verbatim -# make -C nncp-5.1.0 install PREFIX=/usr/local +# make -C nncp-5.1.1 install PREFIX=/usr/local @end verbatim diff --git a/doc/cmds.texi b/doc/cmds.texi index 909337877ce967861d6a165e36d86e83b537edc7c249acf1b802be6d2dee052e..8a5a1b73f4f2051d0fea3eca1426e28e6e05a6d6760063cccd1c1a80b3fb2d33 100644 --- a/doc/cmds.texi +++ b/doc/cmds.texi @@ -332,7 +332,8 @@ @ref{Chunked, on chunks}. @option{INT} is the desired chunk size in KiBs. This mode is more CPU hungry. Pay attention that chunk is saved in spool directory immediately and it is not deleted if any error occurs. @option{-minsize} option is applied per each chunk. Do not forget about -@ref{ChunkedZFS, possible} ZFS deduplication issues. +@ref{ChunkedZFS, possible} ZFS deduplication issues. Zero +@option{-chunked} disables chunked transmission. If @ref{CfgNotify, notification} is enabled on the remote side for file transmissions, then it will sent simple letter after successful diff --git a/doc/download.texi b/doc/download.texi index 56a825d8c6502521e415f3423d1734506f9b1437b70ff62add85b7f354baf859..8ecb0b7b831a5adabc917b8acbd1c0b8af76444aef092880d5e1e71798041356 100644 --- a/doc/download.texi +++ b/doc/download.texi @@ -23,7 +23,10 @@ @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum -An entry for documentation: +@item @ref{Release 5.1.0, 5.1.0} @tab 2019-11-24 @tab 1103 KiB +@tab @url{download/nncp-5.1.0.tar.xz, link} @url{download/nncp-5.1.0.tar.xz.sig, sign} +@tab @code{6F5B74EC 952EAFEC 2A787463 CE1E808E CC990F03 D46F28E9 A89BAB55 5A2C2214} + @item @ref{Release 5.0.0, 5.0.0} @tab 2019-11-15 @tab 1099 KiB @tab @url{download/nncp-5.0.0.tar.xz, link} @url{download/nncp-5.0.0.tar.xz.sig, sign} @tab @code{3696D7EE B0783E91 87E5EEF4 EFC35235 10452353 7C51FA4C 9BD3CBEE A22678B3} diff --git a/doc/integration.texi b/doc/integration.texi index 4bdc9ced7c8a73529881c9a39889bbcbae3e75b112b88369bf076e45fade6eca..836d1d58efe07b8d981326e9114d2a5b26626a95da1fb761a1368062453f67c6 100644 --- a/doc/integration.texi +++ b/doc/integration.texi @@ -5,6 +5,7 @@ Here is some examples of how you can solve popular tasks with NNCP, making them store-and-forward friendly. @menu +* Index files for freqing: FreqIndex. * Postfix:: * Web feeds: Feeds. * Web pages: WARCs. @@ -13,6 +14,22 @@ * Downloading service: DownloadService. * Git:: * Multimedia streaming: Multimedia. @end menu + +@node FreqIndex +@section Index files for freqing + +In many cases you do not know exact files list on remote machine you +want to freq from. Because files can be updated there. It is useful to +run cron-ed job on it to create files listing you can freq and search +for files in it: + +@verbatim +0 4 * * * cd /storage ; tmp=`mktemp` ; \ + tree -f -h -N --du --timefmt \%Y-\%m-\%d | + zstdmt -19 > $tmp && chmod 644 $tmp && mv $tmp TREE.txt.zst ; \ + tree -J -f --timefmt \%Y-\%m-\%d | + zstdmt -19 > $tmp && chmod 644 $tmp && mv $tmp TREE.json.zst +@end verbatim @node Postfix @section Integration with Postfix diff --git a/doc/integrity.texi b/doc/integrity.texi index b4f9cdf0b814ae6e48588818b4894e8623a6e0f5a7afad7f8e0a1ac60994602c..ccba0ac33bcc7bed198fcc1574e91629b4f60a77f75376efb523c51692d358e4 100644 --- a/doc/integrity.texi +++ b/doc/integrity.texi @@ -31,5 +31,5 @@ @end itemize Then you could verify tarballs signature: @verbatim -$ gpg --verify nncp-5.1.0.tar.xz.sig nncp-5.1.0.tar.xz +$ gpg --verify nncp-5.1.1.tar.xz.sig nncp-5.1.1.tar.xz @end verbatim diff --git a/doc/news.ru.texi b/doc/news.ru.texi index 4ff4c1c967b8a365e1f997854dcfaef15f003506a5c79c1d1355ce16e4b1d76a..70f067b3c9b849fbf4f88aee66f579cbbaf811f538604aa228314798321a0dbe 100644 --- a/doc/news.ru.texi +++ b/doc/news.ru.texi @@ -1,6 +1,15 @@ @node Новости @section Новости +@node Релиз 5.1.1 +@subsection Релиз 5.1.1 +@itemize + +@item +Исправлена работоспособность @command{nncp-file} с @option{-chunked 0} опцией. + +@end itemize + @node Релиз 5.1.0 @subsection Релиз 5.1.0 @itemize diff --git a/doc/news.texi b/doc/news.texi index 8937fd819ac5226d729e5a4453127d07da303087b75d3911dd89def8fd34a0f4..8baca54eecb26b06988f7e6c15d83db2faaa4afe5190df85cb434fbe071bb662 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -3,6 +3,15 @@ @unnumbered News See also this page @ref{Новости, on russian}. +@node Release 5.1.1 +@section Release 5.1.1 +@itemize + +@item +Fixed workability of @command{nncp-file} with @option{-chunked 0} option. + +@end itemize + @node Release 5.1.0 @section Release 5.1.0 @itemize diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile index 663a22333ab916287e6e90c08a1f28f31a43028a1519d9c798886fcbceabd32a..c6948ca6cb8030e477d88772ddef9a29a4eb7a95034b4ba3abbf0186acc31e35 100644 --- a/ports/nncp/Makefile +++ b/ports/nncp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: head/net/nncp/Makefile 517819 2019-11-17 11:51:56Z dmgk $ PORTNAME= nncp -DISTVERSION= 5.1.0 +DISTVERSION= 5.1.1 CATEGORIES= net MASTER_SITES= http://www.nncpgo.org/download/ diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go index 0874098c333d2056097793b47658f7c45f6f56d0cb1d7503485a5f998ca5559f..08bca0e7ab7ad7b4c6cdf038050459a4944949f2512fcbfd0f51170d3ac21f8e 100644 --- a/src/cmd/nncp-file/main.go +++ b/src/cmd/nncp-file/main.go @@ -108,6 +108,9 @@ chunkSize = node.FreqChunked } else if *argChunkSize > 0 { chunkSize = *argChunkSize * 1024 } + if chunkSize == 0 { + chunkSize = nncp.MaxFileSize + } if err = ctx.TxFile( node,