Merge branch 'develop' into master

diff --git a/bin/default.do b/bin/default.do
index 8ec11e70b5795609ab9d702557b4d21af70a76ec..bda5482d13c257e5af603ebd17e3d37652d12d9b 100644 (file)
--- a/bin/default.do
+++ b/bin/default.do
@@ -5,7 +5,7 @@ redo-ifchange config gopath module-name
 mod=`cat module-name`
 redo-ifchange src/*.go src/cmd/$1/*.go
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultCfgPath=$CFGPATH"
-GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SENDMAIL"
+GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSendmailPath=$SENDMAIL"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SPOOLPATH"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultLogPath=$LOGPATH"
 cd src

diff --git a/doc/download.texi b/doc/download.texi
index f3af872f3b31b741607b0c89f015080d54c32982..faab86533da65f35ba482800404c5d2599295d25 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -24,6 +24,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 5.4.0, 5.4.0} @tab 2020-09-27 @tab 1136 KiB
+@tab @url{download/nncp-5.4.0.tar.xz, link} @url{download/nncp-5.4.0.tar.xz.sig, sign}
+@tab @code{2730F08B EE590B24 0D096EB8 4105BBCB 8054C840 C3610AF9 6C9D50ED E1F0035C}
+
 @item @ref{Release 5.3.3, 5.3.3} @tab 2020-01-23 @tab 1116 KiB
 @tab @url{download/nncp-5.3.3.tar.xz, link} @url{download/nncp-5.3.3.tar.xz.sig, sign}
 @tab @code{707CD852 4E424C24 BCB22D6B 4BC81709 71C42A5F E0062B93 A8D1DD9D 7FB365D0}

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index f423162b649f771e603b08bff59c4b321d5068ec..6f9c98dea3bfb3b4878d05715238ec4687689d01 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.4.1
+@subsection Релиз 5.4.1
+@itemize
+
+@item
+Исправлена ошибка с учётом @code{SENDMAIL} переменной при сборке.
+
+@end itemize
+
 @node Релиз 5.4.0
 @subsection Релиз 5.4.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 9d0046344981c9104f263af1dea5c412b27de176..37edcc0442f0669246fe4730644871211cbd67cf 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.4.1
+@section Release 5.4.1
+@itemize
+
+@item
+Fixed @code{SENDMAIL} variable usage during the build.
+
+@end itemize
+
 @node Release 5.4.0
 @section Release 5.4.0
 @itemize

diff --git a/src/nncp.go b/src/nncp.go
index d27ed0acdeade8796ed82e28d0eeb7c00f17970d..4431663c3077264b851b41c2f8faeaff473c95ee 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 )
 
 var (
-       Version string = "5.4.0"
+       Version string = "5.4.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )