doc/download.texi | 4 ++++ doc/news.ru.texi | 9 +++++++++ doc/news.texi | 9 +++++++++ src/ctx.go | 11 ----------- src/df.go | 20 ++++++++++++++++++++ src/df_netbsd.go | 20 ++++++++++++++++++++ src/nncp.go | 2 +- diff --git a/doc/download.texi b/doc/download.texi index bfa858c80968aa17aa7ed49851822477a6e302b1d8bbe43256c5c061404f45f4..713d1868faf28843c4ce180c325b8be46fbc6f907e8455b48dcebeadbff186fa 100644 --- a/doc/download.texi +++ b/doc/download.texi @@ -28,6 +28,10 @@ @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum +@item @ref{Release 7_5_0, 7.5.0} @tab 2021-07-28 @tab 1151 KiB +@tab @url{download/nncp-7.5.0.tar.xz, link} @url{download/nncp-7.5.0.tar.xz.sig, sign} +@tab @code{14D92DC5 B8164EE4 4926D7AF 46DA9F23 0C8F6207 350CC747 6DB5CDFB 8E7C3FE4} + @item @ref{Release 7_4_0, 7.4.0} @tab 2021-07-19 @tab 1153 KiB @tab @url{download/nncp-7.4.0.tar.xz, link} @url{download/nncp-7.4.0.tar.xz.sig, sign} @tab @code{F7499FBF B0658054 F2732722 D54FE31E A0F105FD 9970B5BB 6413A9CC 065CB0EB} diff --git a/doc/news.ru.texi b/doc/news.ru.texi index ff437cc105fcf1a731c0f5078841315e72d59a83786b5d1351b44d8c0f37d6c8..a06db08318180731c1e764b53ea5658fbd5649bd39105a254a84e99c688d1537 100644 --- a/doc/news.ru.texi +++ b/doc/news.ru.texi @@ -1,6 +1,15 @@ @node Новости @section Новости +@node Релиз 7.5.1 +@subsection Релиз 7.5.1 +@itemize + +@item +NNCP собирается на NetBSD. + +@end itemize + @node Релиз 7.5.0 @subsection Релиз 7.5.0 @itemize diff --git a/doc/news.texi b/doc/news.texi index 5e19c241ab6f45cda65aa09bce70aba0f8df46669ada1269b874aa8b932a1b7d..bd70bf057247fb649168710247381da727d9751d1e5d0f4be77a42b79e0d2ed2 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -3,6 +3,15 @@ @unnumbered News See also this page @ref{Новости, on russian}. +@node Release 7_5_1 +@section Release 7.5.1 +@itemize + +@item +NNCP builds on NetBSD. + +@end itemize + @node Release 7_5_0 @section Release 7.5.0 @itemize diff --git a/src/ctx.go b/src/ctx.go index 00330712ddca09aab1da09fb1688457733fcc85bfd38f537b660b051b43a651f..f85ce1a125561eaa1c406f730285e805db4bec7fd39c032b7744f2249d214d35 100644 --- a/src/ctx.go +++ b/src/ctx.go @@ -21,13 +21,10 @@ import ( "errors" "fmt" "io/ioutil" - "log" "os" "path/filepath" "syscall" - - "golang.org/x/sys/unix" ) type Ctx struct { @@ -147,14 +144,6 @@ } ctx.Quiet = quiet ctx.Debug = debug return ctx, nil -} - -func (ctx *Ctx) IsEnoughSpace(want int64) bool { - var s unix.Statfs_t - if err := unix.Statfs(ctx.Spool, &s); err != nil { - log.Fatalln("Can not stat spool:", err) - } - return int64(s.Bavail)*int64(s.Bsize) > want } func (ctx *Ctx) Umask() { diff --git a/src/df.go b/src/df.go new file mode 100644 index 0000000000000000000000000000000000000000..61e2a5c7efd1b8853754bd2f5e33d38bc86d9e952f6a80ea3020fd7bf87a5526 --- /dev/null +++ b/src/df.go @@ -0,0 +1,20 @@ +// +build !netbsd + +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2021 Sergey Matveev + +package nncp + +import ( + "log" + + "golang.org/x/sys/unix" +) + +func (ctx *Ctx) IsEnoughSpace(want int64) bool { + var s unix.Statfs_t + if err := unix.Statfs(ctx.Spool, &s); err != nil { + log.Fatalln("Can not stat spool:", err) + } + return int64(s.Bavail)*int64(s.Bsize) > want +} diff --git a/src/df_netbsd.go b/src/df_netbsd.go new file mode 100644 index 0000000000000000000000000000000000000000..7bf4fa2dc2da96bea6c7e53eb292d3734c1194a491b70303d80bf37fe1b870c3 --- /dev/null +++ b/src/df_netbsd.go @@ -0,0 +1,20 @@ +// +build netbsd + +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2021 Sergey Matveev + +package nncp + +import ( + "log" + + "golang.org/x/sys/unix" +) + +func (ctx *Ctx) IsEnoughSpace(want int64) bool { + var s unix.Statvfs_t + if err := unix.Statvfs(ctx.Spool, &s); err != nil { + log.Fatalln("Can not stat spool:", err) + } + return int64(s.Bavail)*int64(s.Frsize) > want +} diff --git a/src/nncp.go b/src/nncp.go index e8091f64f48a356f9cdeaafccd909d42bc9f79903788e97daf03c099ea1e6ba4..b0b272bcdb9fac5b9720e34379d396cdba2cef89b89b55254864ee164e0827f8 100644 --- a/src/nncp.go +++ b/src/nncp.go @@ -40,7 +40,7 @@ const Base32Encoded32Len = 52 var ( - Version string = "7.5.0" + Version string = "7.5.1" Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding) )