From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 1 May 2019 20:06:18 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 4.1^0
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=62cb16b579fa8a6e92c9ed73ae0349d412b8dd3a;hp=5a70eb101538b11bb4e4a87d00a75505c81a1ebc;p=nncp.git

Merge branch 'develop'
---

diff --git a/BSDmakefile b/BSDmakefile
index 63c724c..12bf97a 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -1,3 +1,14 @@
 VERSION != cat VERSION
+GO ?= go
+
+GO_MOD_EXISTS != $(GO) help mod >/dev/null 2>&1 || echo no
+
+.if ${GO_MOD_EXISTS} == "no"
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+.else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+.endif
 
 include common.mk
diff --git a/GNUmakefile b/GNUmakefile
index 5af4eb0..1bcb1be 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,3 +1,14 @@
 VERSION = $(shell cat VERSION)
+GO ?= go
+
+GO_MOD_EXISTS = $(shell $(GO) help mod >/dev/null 2>&1 || echo no)
+
+ifeq ($(GO_MOD_EXISTS), no)
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+endif
 
 include common.mk
diff --git a/VERSION b/VERSION
index 5186d07..7d5c902 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.1
diff --git a/common.mk b/common.mk
index 602d754..6c887a5 100644
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,4 @@
 PREFIX ?= /usr/local
-GO ?= go
 
 SENDMAIL ?= /usr/sbin/sendmail
 CFGPATH ?= $(PREFIX)/etc/nncp.yaml
@@ -16,7 +15,6 @@ LDFLAGS = \
 	-X cypherpunks.ru/nncp.DefaultSendmailPath=$(SENDMAIL) \
 	-X cypherpunks.ru/nncp.DefaultSpoolPath=$(SPOOLPATH) \
 	-X cypherpunks.ru/nncp.DefaultLogPath=$(LOGPATH)
-BUILDMOD ?= -mod=vendor
 
 ALL = \
 	nncp-bundle \
@@ -40,7 +38,6 @@ ALL = \
 
 SRC := $(PWD)/src/cypherpunks.ru/nncp
 BIN := $(PWD)/bin
-GOPATH ?= $(PWD)/gopath
 
 all: $(ALL)
 
diff --git a/doc/cmds.texi b/doc/cmds.texi
index ac665ac..b61492f 100644
--- a/doc/cmds.texi
+++ b/doc/cmds.texi
@@ -275,7 +275,7 @@ exec:
 @end verbatim
 
 then executing @verb{|echo My message | nncp-exec -replynice 123 REMOTE
-sendmail root@localhost|} will lead to executing of:
+sendmail root@localhost|} will lead to execution of:
 
 @verbatim
 echo My message |
diff --git a/doc/download.texi b/doc/download.texi
index 0722f04..0418f47 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -23,6 +23,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 4.0, 4.0} @tab 2019-04-28 @tab 1227 KiB
+@tab @url{download/nncp-4.0.tar.xz, link} @url{download/nncp-4.0.tar.xz.sig, sign}
+@tab @code{EAFA6272 22E355FC EB772A90 FC6DEA8E AE1F1695 3F48A4A3 57ADA0B4 FF918452}
+
 @item @ref{Release 3.4, 3.4} @tab 2018-06-10 @tab 1154 KiB
 @tab @url{download/nncp-3.4.tar.xz, link} @url{download/nncp-3.4.tar.xz.sig, sign}
 @tab @code{9796C4CB 7B670FC7 5FEED3CD 467CA556 B230387D 935B09BB 4B19FD57 FD17FFBA}
diff --git a/doc/install.texi b/doc/install.texi
index b4df484..db3be1d 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -11,7 +11,7 @@ Possibly NNCP package already exists for your distribution:
 NNCP should run on any POSIX-compatible operating system.
 
 NNCP is written on @url{https://golang.org/, Go} programming language
-and you have to install Go compiler (1.7+ version is highly
+and you have to install Go compiler (1.10+ version is highly
 recommended). @emph{Make} (BSD and GNU ones are fine) is recommended for
 convenient building. @url{https://www.gnu.org/software/texinfo/,
 Texinfo} is used for building documentation.
diff --git a/doc/integration.texi b/doc/integration.texi
index 984f662..729752e 100644
--- a/doc/integration.texi
+++ b/doc/integration.texi
@@ -121,9 +121,9 @@ nncp      unix  -       n       n       -       -       pipe
 
 This runs the @command{nncp-exec} command to place outgoing mail into
 the NNCP queue. It substitutes the hostname (@emph{nncp-gateway}, or
-whatever you specified) and the recipients before executing the command.
-The @command{nncp-exec} command is executed without assistance from the
-shell, so there are no problems with shell meta characters.
+whatever you specified) and the recipients before execution of the
+command. The @command{nncp-exec} command is executed without assistance
+from the shell, so there are no problems with shell meta characters.
 
 @item Execute the command @command{postfix reload} to make the changes
 effective.
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index a17c2ef..25865b7 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 4.1
+@subsection Релиз 4.1
+@itemize
+@item
+Восстановлена работоспособность на GNU/Linux системах и Go версии 1.10.
+@end itemize
+
 @node Релиз 4.0
 @subsection Релиз 4.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index ed1bf08..839effc 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 4.1
+@section Release 4.1
+@itemize
+@item
+Workability on GNU/Linux systems and Go 1.10 is fixed.
+@end itemize
+
 @node Release 4.0
 @section Release 4.0
 @itemize
diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 77a7f97..a10018d 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,8 @@
-# $FreeBSD: head/net/nncp/Makefile 471003 2018-05-27 20:24:00Z krion $
+# $FreeBSD: head/net/nncp/Makefile 484628 2018-11-10 18:12:57Z bapt $
 
 PORTNAME=	nncp
-DISTVERSION=	3.4
+DISTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
@@ -24,6 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
 INFO=		nncp
+MAKE_ARGS=	INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
diff --git a/src/cypherpunks.ru/nncp/ctx.go b/src/cypherpunks.ru/nncp/ctx.go
index fb7246a..3f4def9 100644
--- a/src/cypherpunks.ru/nncp/ctx.go
+++ b/src/cypherpunks.ru/nncp/ctx.go
@@ -112,5 +112,5 @@ func (ctx *Ctx) IsEnoughSpace(want int64) bool {
 	if err := unix.Statfs(ctx.Spool, &s); err != nil {
 		log.Fatalln(err)
 	}
-	return s.Bavail*int64(s.Bsize) > want
+	return int64(s.Bavail)*int64(s.Bsize) > want
 }