buildlog.go | 2 +- doc/features.texi | 2 +- doc/logs.texi | 2 +- doc/news.texi | 7 +++++++ go.mod | 10 +++++----- go.sum | 21 ++++++++++----------- run.go | 12 ++++++------ usage.go | 2 +- diff --git a/buildlog.go b/buildlog.go index 4cc7152efa2f4c9c4b2611bd996996d5144883971fb89a5667e517765695e992..1a14c913d9a28e5ce8a481335eb01e6d14162001f4cfa0a4635be812d97a901d 100644 --- a/buildlog.go +++ b/buildlog.go @@ -30,7 +30,7 @@ "strings" "time" "go.cypherpunks.su/recfile/v2" - "go.cypherpunks.su/tai64n/v3" + "go.cypherpunks.su/tai64n/v4" ) const HumanTimeFmt = "2006-01-02 15:04:05.000000000 Z07:00" diff --git a/doc/features.texi b/doc/features.texi index 2cd496c4e95ca583c645816a7b40eb255e7d5d4cd9613a045f65564032b9530c..51d97ca8c2d726a5ebded4036e06be846d4023b5142e7f70534c2e686b0fabbd 100644 --- a/doc/features.texi +++ b/doc/features.texi @@ -42,7 +42,7 @@ @url{http://cr.yp.to/libtai/tai64.html, TAI64N} timestamp prefixes for each line. To convert them to localtime you can use either @command{tai64nlocal} utility from @url{http://cr.yp.to/daemontools.html, daemontools}, or similar one: - @code{go install go.cypherpunks.su/tai64n/v3/cmd/tai64nlocal@@latest} + @code{go install go.cypherpunks.su/tai64n/v4/cmd/tai64nlocal@@latest} @item Either @url{https://www.gnu.org/software/make/, GNU Make} or @url{http://netbsd.org/, NetBSD}'s @command{bmake} @ref{Jobserver, jobserver} compatibility support diff --git a/doc/logs.texi b/doc/logs.texi index 2f69d4cc457cd57b3ce2a837a70a879db099feda63556d1bf4577466eaa2f442..507e4ce86cbbc1af382b1dce1217e6f501b3de796ff46aa3ffc6e8dbb3a44b8c 100644 --- a/doc/logs.texi +++ b/doc/logs.texi @@ -23,7 +23,7 @@ Logs are stored in corresponding @file{.redo/tgt.log} file. Each line of it is prefixed with @url{http://cr.yp.to/libtai/tai64.html, TAI64N} timestamp, that you can decode with @command{tai64nlocal} utility from @url{http://cr.yp.to/daemontools.html, daemontools}, or similar one: -@code{go install go.cypherpunks.su/tai64n/v3/cmd/tai64nlocal}. +@code{go install go.cypherpunks.su/tai64n/v4/cmd/tai64nlocal}. When @option{-k} is in use, all environment variables, working directory, command line arguments, start/finish times, duration, diff --git a/doc/news.texi b/doc/news.texi index 7fe43235e4833882f6d85704cb16dddf31c808193add9485611b72dd55b9cca0..0c5b13131ae4e35bf5bbb10e7bae9f9cb726829a62fc2d22ff90d8f438481e70 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -2,6 +2,13 @@ @node News @cindex news @unnumbered News +@anchor{Release 2_6_3} +@section Release 2.6.3 +@itemize +@item + Updated dependant libraries. Should fix workability on modern OpenBSD. +@end itemize + @anchor{Release 2_6_2} @section Release 2.6.2 @itemize diff --git a/go.mod b/go.mod index 867b2d91f093096ddc7471feded7c09bd26b587e53dc4e8a302ffa4b604624a1..0fb2d787627a129cb9209a1d20c80bfc739b9ec1094bd0ca5373647156b460cf 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ toolchain go1.22.5 require ( - github.com/google/uuid v1.3.1 + github.com/google/uuid v1.6.0 go.cypherpunks.su/recfile/v2 v2.0.0 - go.cypherpunks.su/tai64n/v3 v3.0.0 + go.cypherpunks.su/tai64n/v4 v4.1.0 golang.org/x/sys v0.27.0 - golang.org/x/term v0.11.0 - lukechampine.com/blake3 v1.2.1 + golang.org/x/term v0.26.0 + lukechampine.com/blake3 v1.3.0 ) -require github.com/klauspost/cpuid/v2 v2.2.5 // indirect +require github.com/klauspost/cpuid/v2 v2.2.9 // indirect diff --git a/go.sum b/go.sum index 85b991c243557b43b798a060142f80cb803dd19764a6fc64b94a51568942f6ab..8685ae038e1f4af0dfe3a946bca3ed119b94c67ec1352c95b8745209f5818332 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,14 @@ -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= go.cypherpunks.su/recfile/v2 v2.0.0 h1:Q2o+OzM1H2O1WnshU88r+waBqylkqZj8plBdBWZitcU= go.cypherpunks.su/recfile/v2 v2.0.0/go.mod h1:36EnyBwx6VpsSM5MMcYGTDiKrVEP49S09p33EFuhQYU= -go.cypherpunks.su/tai64n/v3 v3.0.0 h1:JvQiZJwkswUttMNcPrYS4KUK9Zfl6xllD0N6ZnSZX/U= -go.cypherpunks.su/tai64n/v3 v3.0.0/go.mod h1:zGDFuyiFKJk+iem8lyBaFeCm+MNMOn7RRWy456n1J78= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +go.cypherpunks.su/tai64n/v4 v4.1.0 h1:jW0EyklKXpSy9DSFMcDbu7XuLlMkn6kkpNWiMG6UT5c= +go.cypherpunks.su/tai64n/v4 v4.1.0/go.mod h1:/uKUdhLOy8UciRKpapPaFXSOoa/SiXjs3XsDDpAz7OA= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= -lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= diff --git a/run.go b/run.go index 6d7038a1522a351f7d2bca10f42d0c3705d59cffa4011803e7f75da0c09a4270..77560a5d55ee7d25d033b8403c1a12fe6c691faaf108edb74c2d7c0cb437736b 100644 --- a/run.go +++ b/run.go @@ -38,7 +38,7 @@ "time" "github.com/google/uuid" "go.cypherpunks.su/recfile/v2" - "go.cypherpunks.su/tai64n/v3" + "go.cypherpunks.su/tai64n/v4" "golang.org/x/sys/unix" ) @@ -534,14 +534,14 @@ fields = append(fields, recfile.Field{ Name: "PID", Value: strconv.Itoa(cmd.Process.Pid), }) } - ts := new(tai64n.TAI64N) + var ts tai64n.TAI64N ts.FromTime(started) fields = append(fields, - recfile.Field{Name: "Started", Value: tai64n.Encode(ts[:])}, + recfile.Field{Name: "Started", Value: ts.Encode()}, ) ts.FromTime(finished) fields = append(fields, - recfile.Field{Name: "Finished", Value: tai64n.Encode(ts[:])}) + recfile.Field{Name: "Finished", Value: ts.Encode()}) fields = append(fields, recfile.Field{ Name: "Duration", Value: strconv.FormatInt(finished.Sub(started).Nanoseconds(), 10), @@ -627,7 +627,7 @@ stderrTerm := make(chan struct{}) go func() { scanner := bufio.NewScanner(stderr) var line string - ts := new(tai64n.TAI64N) + var ts tai64n.TAI64N for scanner.Scan() { line = scanner.Text() if strings.HasPrefix(line, childStderrPrefix) { @@ -641,7 +641,7 @@ continue } if fdStderr != nil { ts.FromTime(time.Now()) - fmt.Fprintln(fdStderr, tai64n.Encode(ts[:]), line) + fmt.Fprintln(fdStderr, ts.Encode(), line) } if StderrSilent { continue diff --git a/usage.go b/usage.go index 721c8d3a84e9f970866d52940a7a9198d223657b3094ce8e5337f46aa515d092..ea0b88a2671824c8891514c9b50535cd1a5e1c9a319ae9500513cb43df61e6ff 100644 --- a/usage.go +++ b/usage.go @@ -22,7 +22,7 @@ "os" ) const ( - Version = "2.6.2" + Version = "2.6.3" Warranty = `Copyright (C) 2020-2024 Sergey Matveev This program is free software: you can redistribute it and/or modify