Merge branch 'develop'

diff --git a/config b/config
index 92406c5d4458c5497d80614fd4b5547f37c71c35..66f5057811c153528af6c115cfd39b51f722230f 100644 (file)
--- a/config
+++ b/config
@@ -9,6 +9,6 @@ CFGPATH=${CFGPATH:-$PREFIX/etc/nncp.hjson}
 SPOOLPATH=${SPOOLPATH:-/var/spool/nncp}
 LOGPATH=${LOGPATH:-/var/spool/nncp/log}
 
-BINDIR=${DESTDIR}${PREFIX}/bin
-INFODIR=${DESTDIR}${PREFIX}/info
-DOCDIR=${DESTDIR}${PREFIX}/share/doc/nncp
+BINDIR=${BINDIR:-${DESTDIR}${PREFIX}/bin}
+INFODIR=${INFODIR:-${DESTDIR}${PREFIX}/info}
+DOCDIR=${DOCDIR:-${DESTDIR}${PREFIX}/share/doc/nncp}

diff --git a/doc/download.texi b/doc/download.texi
index 78f802bb42e6f527723e35ac48a32311a010981f..7c4cd67ee1b809bfb17a563122f5e9bc3261b1c7 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -19,11 +19,16 @@ Tarballs include all necessary required libraries:
 @item @code{golang.org/x/crypto} @tab BSD 3-Clause
 @item @code{golang.org/x/net} @tab BSD 3-Clause
 @item @code{golang.org/x/sys} @tab BSD 3-Clause
+@item @code{golang.org/x/term} @tab BSD 3-Clause
 @end multitable
 
 @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.5.0, 5.5.0} @tab 2021-01-07 @tab 1161 KiB
+@tab @url{download/nncp-5.5.0.tar.xz, link} @url{download/nncp-5.5.0.tar.xz.sig, sign}
+@tab @code{EF0CBEE1 520BE97D A210794C 172BF444 E6F75DB2 84F5BD05 66919193 326AED77}
+
 @item @ref{Release 5.4.1, 5.4.1} @tab 2020-09-28 @tab 1143 KiB
 @tab @url{download/nncp-5.4.1.tar.xz, link} @url{download/nncp-5.4.1.tar.xz.sig, sign}
 @tab @code{A02D0C9B 51533DF8 115C17E1 02F8C485 9F7B805A 64290CDF 79151BA9 E627FA63}

diff --git a/doc/install.texi b/doc/install.texi
index 2da6378ce5a1dab1233a51594e47764b1fa20784..3ca13b162739aae3b9c7494d6d11b7b08b9166e3 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -14,7 +14,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.10+ version. @command{Make} (BSD
+and you have to install Go compiler 1.12+ version. @command{Make} (BSD
 and GNU versions are fine) is recommended for convenient building.
 @url{https://www.gnu.org/software/texinfo/, Texinfo} is used for
 building documentation (although tarballs already include it).

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index d06a15ae882a52e5406312662cec2bb7d1188778..c4ce41d4a408ead9657f51239e8142b8c15aec68 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.5.1
+@subsection Релиз 5.5.1
+@itemize
+
+@item
+Уважать @env{BINDIR}, @env{INFODIR} и @env{DOCDIR} переменные окружения
+в @file{config} во время установки.
+
+@end itemize
+
 @node Релиз 5.5.0
 @subsection Релиз 5.5.0
 @itemize
@@ -22,7 +32,7 @@
 появились @option{-autotoss*} опции для запуска tosser после завершения звонка.
 
 @item
-Обновлены зависимые библиотеки.
+Обновлены зависимые библиотеки. Минимальная требуемая версия Go 1.12.
 
 @end itemize
 

diff --git a/doc/news.texi b/doc/news.texi
index ff9a47fc28ac88173e9fb6698f85758f340ac2fe..a24704fe104f9fbe27eefe4f30d56a3b46dbe8c5 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.5.1
+@section Release 5.5.1
+@itemize
+
+@item
+Respect for @env{BINDIR}, @env{INFODIR} and @env{DOCDIR} environment
+variables in @file{config} during installation.
+
+@end itemize
+
 @node Release 5.5.0
 @section Release 5.5.0
 @itemize
@@ -24,7 +34,7 @@ versions.
 have @option{-autotoss*} options for running tosser after call is ended.
 
 @item
-Updated dependencies.
+Updated dependencies. Minimal required Go version is 1.12.
 
 @end itemize
 

diff --git a/makedist.sh b/makedist.sh
index bf21b01584b6abde66af349392f63c13e8ddc813..e62491ff0df2426f7037e2a3c0b9dc4fed832375 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -9,6 +9,7 @@ git clone . $tmp/nncp-$release
 cd $tmp/nncp-$release
 git checkout v$release
 redo module-name VERSION
+rm -r .redo
 mod_name=`cat module-name`
 rm -fr .git
 
@@ -28,6 +29,7 @@ go.cypherpunks.ru/balloon
 golang.org/x/crypto
 golang.org/x/net
 golang.org/x/sys
+golang.org/x/term
 "
 for mod in $mods; do
     mod_path=$(sed -n "s# // indirect## ; s#^  \($mod\) \(.*\)\$#\1@\2#p" src/$mod_name/go.mod)
@@ -55,7 +57,6 @@ golang.org/x/crypto/PATENTS
 golang.org/x/crypto/poly1305
 golang.org/x/crypto/README.md
 golang.org/x/crypto/salsa20
-golang.org/x/crypto/ssh/terminal
 golang.org/x/net/AUTHORS
 golang.org/x/net/CONTRIBUTORS
 golang.org/x/net/go.mod
@@ -73,6 +74,7 @@ golang.org/x/sys/LICENSE
 golang.org/x/sys/PATENTS
 golang.org/x/sys/README.md
 golang.org/x/sys/unix
+golang.org/x/term
 EOF
 tar cfCI - src $tmp/includes | tar xfC - $tmp
 rm -fr src/golang.org $tmp/includes
@@ -179,7 +181,7 @@ rm -r doc/.well-known doc/nncp.html/.well-known
 
 ########################################################################
 
-rm -r .redo
+rm -r .redo doc/.redo
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 find . -type f -name "*.sh" -exec chmod 755 {} \;

diff --git a/src/cfg.go b/src/cfg.go
index a37fbdcc320463598b1cf316fc74de0e9f767201..50ad498d647c1af91dacf9d1e5376f0acc73e7a6 100644 (file)
--- a/src/cfg.go
+++ b/src/cfg.go
@@ -30,7 +30,7 @@ import (
        "github.com/gorhill/cronexpr"
        "github.com/hjson/hjson-go"
        "golang.org/x/crypto/ed25519"
-       "golang.org/x/crypto/ssh/terminal"
+       "golang.org/x/term"
 )
 
 const (
@@ -107,9 +107,9 @@ type NotifyJSON struct {
 type CfgJSON struct {
        Spool string `json:"spool"`
        Log   string `json:"log"`
-       Umask string `json:"umask",omitempty`
+       Umask string `json:"umask,omitempty"`
 
-       OmitPrgrs bool `json:"noprogress",omitempty`
+       OmitPrgrs bool `json:"noprogress,omitempty"`
 
        Notify *NotifyJSON `json:"notify,omitempty"`
 
@@ -377,7 +377,7 @@ func CfgParse(data []byte) (*Ctx, error) {
        var err error
        if bytes.Compare(data[:8], MagicNNCPBv3[:]) == 0 {
                os.Stderr.WriteString("Passphrase:") // #nosec G104
-               password, err := terminal.ReadPassword(0)
+               password, err := term.ReadPassword(0)
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go
index 7eb6766f1a260598f5c2c27c25e0d0dfe4d8288b..7fdb5d7e8914518be144900f06842a304b095289 100644 (file)
--- a/src/cmd/nncp-cfgenc/main.go
+++ b/src/cmd/nncp-cfgenc/main.go
@@ -30,7 +30,7 @@ import (
        xdr "github.com/davecgh/go-xdr/xdr2"
        "go.cypherpunks.ru/nncp/v5"
        "golang.org/x/crypto/blake2b"
-       "golang.org/x/crypto/ssh/terminal"
+       "golang.org/x/term"
 )
 
 func usage() {
@@ -90,7 +90,7 @@ func main() {
        }
 
        os.Stderr.WriteString("Passphrase:") // #nosec G104
-       password, err := terminal.ReadPassword(0)
+       password, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }
@@ -105,13 +105,13 @@ func main() {
                return
        }
 
-       password1, err := terminal.ReadPassword(0)
+       password1, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }
        os.Stderr.WriteString("\n")                 // #nosec G104
        os.Stderr.WriteString("Repeat passphrase:") // #nosec G104
-       password2, err := terminal.ReadPassword(0)
+       password2, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }

diff --git a/src/go.mod b/src/go.mod
index 1b808cd0d526a07d65ce58f57dc30048a6731dea..56c8b2c6d9931b5eae432dc14fcf14868090e253 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -12,7 +12,8 @@ require (
        golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
        golang.org/x/net v0.0.0-20201224014010-6772e930b67b
        golang.org/x/sys v0.0.0-20210105210732-16f7687f5001
+       golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
        gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )
 
-go 1.10
+go 1.12

diff --git a/src/nncp.go b/src/nncp.go
index 5fc64837c263f3545612260ee923e3029d3ea929..b351b25390fd2b1d526940de53d933eb730154ec 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.5.0"
+       Version string = "5.5.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )