Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package arkade for openSUSE:Factory checked
in at 2023-12-13 18:34:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arkade (Old)
and /work/SRC/openSUSE:Factory/.arkade.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arkade"
Wed Dec 13 18:34:30 2023 rev:23 rq:1132742 version:0.10.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/arkade/arkade.changes 2023-12-05
17:03:55.954731920 +0100
+++ /work/SRC/openSUSE:Factory/.arkade.new.25432/arkade.changes 2023-12-13
18:34:39.313723081 +0100
@@ -1,0 +2,9 @@
+Tue Dec 12 17:31:02 UTC 2023 - ka...@b1-systems.de
+
+- Update to version 0.10.18:
+ * Bump go.mod and vendor
+ * Export LoadFrom
+ * Update README.md
+ * Bump actions/setup-go from 4 to 5
+
+-------------------------------------------------------------------
Old:
----
arkade-0.10.17.obscpio
New:
----
arkade-0.10.18.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arkade.spec ++++++
--- /var/tmp/diff_new_pack.PAIPW1/_old 2023-12-13 18:34:40.237757222 +0100
+++ /var/tmp/diff_new_pack.PAIPW1/_new 2023-12-13 18:34:40.241757369 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: arkade
-Version: 0.10.17
+Version: 0.10.18
Release: 0
Summary: Open Source Kubernetes Marketplace
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.PAIPW1/_old 2023-12-13 18:34:40.265758256 +0100
+++ /var/tmp/diff_new_pack.PAIPW1/_new 2023-12-13 18:34:40.269758404 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/alexellis/arkade</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">0.10.17</param>
+ <param name="revision">0.10.18</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.PAIPW1/_old 2023-12-13 18:34:40.285758995 +0100
+++ /var/tmp/diff_new_pack.PAIPW1/_new 2023-12-13 18:34:40.289759143 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/alexellis/arkade</param>
- <param
name="changesrevision">3da76f9df8c251560b420a90ed27257da6529a5b</param></service></servicedata>
+ <param
name="changesrevision">84ccd116f8be52022651756fb48f4fa1e51ac129</param></service></servicedata>
(No newline at EOF)
++++++ arkade-0.10.17.obscpio -> arkade-0.10.18.obscpio ++++++
/work/SRC/openSUSE:Factory/arkade/arkade-0.10.17.obscpio
/work/SRC/openSUSE:Factory/.arkade.new.25432/arkade-0.10.18.obscpio differ:
char 49, line 1
++++++ arkade.obsinfo ++++++
--- /var/tmp/diff_new_pack.PAIPW1/_old 2023-12-13 18:34:40.321760325 +0100
+++ /var/tmp/diff_new_pack.PAIPW1/_new 2023-12-13 18:34:40.325760473 +0100
@@ -1,5 +1,5 @@
name: arkade
-version: 0.10.17
-mtime: 1701702890
-commit: 3da76f9df8c251560b420a90ed27257da6529a5b
+version: 0.10.18
+mtime: 1702398936
+commit: 84ccd116f8be52022651756fb48f4fa1e51ac129
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
new/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
--- old/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
2023-12-05 09:32:31.000000000 +0100
+++ new/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
2023-12-12 18:31:03.000000000 +0100
@@ -436,9 +436,8 @@
if err != nil {
if err == io.EOF {
break
- } else {
- return nil, fmt.Errorf("failed to parse tar
file, %w", err)
}
+ return nil, fmt.Errorf("failed to parse tar file, %w",
err)
}
switch cleanEntryName(h.Name) {
case PrefetchLandmark, NoPrefetchLandmark:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/fatih/color/color.go
new/vendor/github.com/fatih/color/color.go
--- old/vendor/github.com/fatih/color/color.go 2023-12-05 09:32:31.000000000
+0100
+++ new/vendor/github.com/fatih/color/color.go 2023-12-12 18:31:03.000000000
+0100
@@ -65,6 +65,29 @@
CrossedOut
)
+const (
+ ResetBold Attribute = iota + 22
+ ResetItalic
+ ResetUnderline
+ ResetBlinking
+ _
+ ResetReversed
+ ResetConcealed
+ ResetCrossedOut
+)
+
+var mapResetAttributes map[Attribute]Attribute = map[Attribute]Attribute{
+ Bold: ResetBold,
+ Faint: ResetBold,
+ Italic: ResetItalic,
+ Underline: ResetUnderline,
+ BlinkSlow: ResetBlinking,
+ BlinkRapid: ResetBlinking,
+ ReverseVideo: ResetReversed,
+ Concealed: ResetConcealed,
+ CrossedOut: ResetCrossedOut,
+}
+
// Foreground text colors
const (
FgBlack Attribute = iota + 30
@@ -246,10 +269,7 @@
// On Windows, users should wrap w with colorable.NewColorable() if w is of
// type *os.File.
func (c *Color) Fprintln(w io.Writer, a ...interface{}) (n int, err error) {
- c.SetWriter(w)
- defer c.UnsetWriter(w)
-
- return fmt.Fprintln(w, a...)
+ return fmt.Fprintln(w, c.wrap(fmt.Sprint(a...)))
}
// Println formats using the default formats for its operands and writes to
@@ -258,10 +278,7 @@
// encountered. This is the standard fmt.Print() method wrapped with the given
// color.
func (c *Color) Println(a ...interface{}) (n int, err error) {
- c.Set()
- defer c.unset()
-
- return fmt.Fprintln(Output, a...)
+ return fmt.Fprintln(Output, c.wrap(fmt.Sprint(a...)))
}
// Sprint is just like Print, but returns a string instead of printing it.
@@ -271,7 +288,7 @@
// Sprintln is just like Println, but returns a string instead of printing it.
func (c *Color) Sprintln(a ...interface{}) string {
- return c.wrap(fmt.Sprintln(a...))
+ return fmt.Sprintln(c.Sprint(a...))
}
// Sprintf is just like Printf, but returns a string instead of printing it.
@@ -353,7 +370,7 @@
// string. Windows users should use this in conjunction with color.Output.
func (c *Color) SprintlnFunc() func(a ...interface{}) string {
return func(a ...interface{}) string {
- return c.wrap(fmt.Sprintln(a...))
+ return fmt.Sprintln(c.Sprint(a...))
}
}
@@ -383,7 +400,18 @@
}
func (c *Color) unformat() string {
- return fmt.Sprintf("%s[%dm", escape, Reset)
+ //return fmt.Sprintf("%s[%dm", escape, Reset)
+ //for each element in sequence let's use the speficic reset escape, ou
the generic one if not found
+ format := make([]string, len(c.params))
+ for i, v := range c.params {
+ format[i] = strconv.Itoa(int(Reset))
+ ra, ok := mapResetAttributes[v]
+ if ok {
+ format[i] = strconv.Itoa(int(ra))
+ }
+ }
+
+ return fmt.Sprintf("%s[%sm", escape, strings.Join(format, ";"))
}
// DisableColor disables the color output. Useful to not change any existing
@@ -411,6 +439,12 @@
// Equals returns a boolean value indicating whether two colors are equal.
func (c *Color) Equals(c2 *Color) bool {
+ if c == nil && c2 == nil {
+ return true
+ }
+ if c == nil || c2 == nil {
+ return false
+ }
if len(c.params) != len(c2.params) {
return false
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/klauspost/compress/README.md
new/vendor/github.com/klauspost/compress/README.md
--- old/vendor/github.com/klauspost/compress/README.md 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/README.md 2023-12-12
18:31:03.000000000 +0100
@@ -16,6 +16,22 @@
# changelog
+* Oct 22nd, 2023 -
[v1.17.2](https://github.com/klauspost/compress/releases/tag/v1.17.2)
+ * zstd: Fix rare *CORRUPTION* output in "best" mode. See
https://github.com/klauspost/compress/pull/876
+
+* Oct 14th, 2023 -
[v1.17.1](https://github.com/klauspost/compress/releases/tag/v1.17.1)
+ * s2: Fix S2 "best" dictionary wrong encoding by @klauspost in
https://github.com/klauspost/compress/pull/871
+ * flate: Reduce allocations in decompressor and minor code improvements
by @fakefloordiv in https://github.com/klauspost/compress/pull/869
+ * s2: Fix EstimateBlockSize on 6&7 length input by @klauspost in
https://github.com/klauspost/compress/pull/867
+
+* Sept 19th, 2023 -
[v1.17.0](https://github.com/klauspost/compress/releases/tag/v1.17.0)
+ * Add experimental dictionary builder
https://github.com/klauspost/compress/pull/853
+ * Add xerial snappy read/writer
https://github.com/klauspost/compress/pull/838
+ * flate: Add limited window compression
https://github.com/klauspost/compress/pull/843
+ * s2: Do 2 overlapping match checks
https://github.com/klauspost/compress/pull/839
+ * flate: Add amd64 assembly matchlen
https://github.com/klauspost/compress/pull/837
+ * gzip: Copy bufio.Reader on Reset by @thatguystone in
https://github.com/klauspost/compress/pull/860
+
* July 1st, 2023 -
[v1.16.7](https://github.com/klauspost/compress/releases/tag/v1.16.7)
* zstd: Fix default level first dictionary encode
https://github.com/klauspost/compress/pull/829
* s2: add GetBufferCapacity() method by @GiedriusS in
https://github.com/klauspost/compress/pull/832
@@ -646,6 +662,7 @@
* [github.com/ronanh/intcomp](https://github.com/ronanh/intcomp) - Integer
compression.
* [github.com/spenczar/fpc](https://github.com/spenczar/fpc) - Float
compression.
* [github.com/minio/zipindex](https://github.com/minio/zipindex) - External
ZIP directory index.
+* [github.com/ybirader/pzip](https://github.com/ybirader/pzip) - Fast
concurrent zip archiver and extractor.
# license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/klauspost/compress/fse/compress.go
new/vendor/github.com/klauspost/compress/fse/compress.go
--- old/vendor/github.com/klauspost/compress/fse/compress.go 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/fse/compress.go 2023-12-12
18:31:03.000000000 +0100
@@ -212,7 +212,7 @@
previous0 bool
charnum uint16
- maxHeaderSize = ((int(s.symbolLen) * int(tableLog)) >> 3) + 3
+ maxHeaderSize = ((int(s.symbolLen)*int(tableLog) + 4 + 2) >> 3)
+ 3
// Write Table Size
bitStream = uint32(tableLog - minTablelog)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/github.com/klauspost/compress/huff0/bytereader.go
new/vendor/github.com/klauspost/compress/huff0/bytereader.go
--- old/vendor/github.com/klauspost/compress/huff0/bytereader.go
2023-12-05 09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/huff0/bytereader.go
1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-// Copyright 2018 Klaus Post. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Based on work Copyright (c) 2013, Yann Collet, released under BSD License.
-
-package huff0
-
-// byteReader provides a byte reader that reads
-// little endian values from a byte stream.
-// The input stream is manually advanced.
-// The reader performs no bounds checks.
-type byteReader struct {
- b []byte
- off int
-}
-
-// init will initialize the reader and set the input.
-func (b *byteReader) init(in []byte) {
- b.b = in
- b.off = 0
-}
-
-// Int32 returns a little endian int32 starting at current offset.
-func (b byteReader) Int32() int32 {
- v3 := int32(b.b[b.off+3])
- v2 := int32(b.b[b.off+2])
- v1 := int32(b.b[b.off+1])
- v0 := int32(b.b[b.off])
- return (v3 << 24) | (v2 << 16) | (v1 << 8) | v0
-}
-
-// Uint32 returns a little endian uint32 starting at current offset.
-func (b byteReader) Uint32() uint32 {
- v3 := uint32(b.b[b.off+3])
- v2 := uint32(b.b[b.off+2])
- v1 := uint32(b.b[b.off+1])
- v0 := uint32(b.b[b.off])
- return (v3 << 24) | (v2 << 16) | (v1 << 8) | v0
-}
-
-// remain will return the number of bytes remaining.
-func (b byteReader) remain() int {
- return len(b.b) - b.off
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/github.com/klauspost/compress/huff0/compress.go
new/vendor/github.com/klauspost/compress/huff0/compress.go
--- old/vendor/github.com/klauspost/compress/huff0/compress.go 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/huff0/compress.go 2023-12-12
18:31:03.000000000 +0100
@@ -350,6 +350,7 @@
// Does not update s.clearCount.
func (s *Scratch) countSimple(in []byte) (max int, reuse bool) {
reuse = true
+ _ = s.count // Assert that s != nil to speed up the following loop.
for _, v := range in {
s.count[v]++
}
@@ -415,7 +416,7 @@
// minTableLog provides the minimum logSize to safely represent a distribution.
func (s *Scratch) minTableLog() uint8 {
- minBitsSrc := highBit32(uint32(s.br.remain())) + 1
+ minBitsSrc := highBit32(uint32(s.srcLen)) + 1
minBitsSymbols := highBit32(uint32(s.symbolLen-1)) + 2
if minBitsSrc < minBitsSymbols {
return uint8(minBitsSrc)
@@ -427,7 +428,7 @@
func (s *Scratch) optimalTableLog() {
tableLog := s.TableLog
minBits := s.minTableLog()
- maxBitsSrc := uint8(highBit32(uint32(s.br.remain()-1))) - 1
+ maxBitsSrc := uint8(highBit32(uint32(s.srcLen-1))) - 1
if maxBitsSrc < tableLog {
// Accuracy can be reduced
tableLog = maxBitsSrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/klauspost/compress/huff0/huff0.go
new/vendor/github.com/klauspost/compress/huff0/huff0.go
--- old/vendor/github.com/klauspost/compress/huff0/huff0.go 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/huff0/huff0.go 2023-12-12
18:31:03.000000000 +0100
@@ -88,7 +88,7 @@
// Decoders will return ErrMaxDecodedSizeExceeded is this limit is
exceeded.
MaxDecodedSize int
- br byteReader
+ srcLen int
// MaxSymbolValue will override the maximum symbol value of the next
block.
MaxSymbolValue uint8
@@ -170,7 +170,7 @@
if s.fse == nil {
s.fse = &fse.Scratch{}
}
- s.br.init(in)
+ s.srcLen = len(in)
return s, nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/README.md
new/vendor/github.com/klauspost/compress/zstd/README.md
--- old/vendor/github.com/klauspost/compress/zstd/README.md 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/zstd/README.md 2023-12-12
18:31:03.000000000 +0100
@@ -259,7 +259,7 @@
## Decompressor
-Staus: STABLE - there may still be subtle bugs, but a wide variety of content
has been tested.
+Status: STABLE - there may still be subtle bugs, but a wide variety of content
has been tested.
This library is being continuously
[fuzz-tested](https://github.com/klauspost/compress-fuzz),
kindly supplied by [fuzzit.dev](https://fuzzit.dev/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/github.com/klauspost/compress/zstd/enc_best.go
new/vendor/github.com/klauspost/compress/zstd/enc_best.go
--- old/vendor/github.com/klauspost/compress/zstd/enc_best.go 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/zstd/enc_best.go 2023-12-12
18:31:03.000000000 +0100
@@ -43,7 +43,7 @@
if m.rep < 0 {
ofc = ofCode(uint32(m.s-m.offset) + 3)
} else {
- ofc = ofCode(uint32(m.rep))
+ ofc = ofCode(uint32(m.rep) & 3)
}
// Cost, excluding
ofTT, mlTT := fsePredefEnc[tableOffsets].ct.symbolTT[ofc],
fsePredefEnc[tableMatchLengths].ct.symbolTT[mlc]
@@ -197,12 +197,13 @@
// Set m to a match at offset if it looks like that will
improve compression.
improve := func(m *match, offset int32, s int32, first uint32,
rep int32) {
- if s-offset >= e.maxMatchOff || load3232(src, offset)
!= first {
+ delta := s - offset
+ if delta >= e.maxMatchOff || delta <= 0 ||
load3232(src, offset) != first {
return
}
if debugAsserts {
- if offset <= 0 {
- panic(offset)
+ if offset >= s {
+ panic(fmt.Sprintf("offset: %d - s:%d -
rep: %d - cur :%d - max: %d", offset, s, rep, e.cur, e.maxMatchOff))
}
if !bytes.Equal(src[s:s+4],
src[offset:offset+4]) {
panic(fmt.Sprintf("first match
mismatch: %v != %v, first: %08x", src[s:s+4], src[offset:offset+4], first))
@@ -226,7 +227,7 @@
}
}
l := 4 + e.matchlen(s+4, offset+4, src)
- if rep < 0 {
+ if true {
// Extend candidate match backwards as far as
possible.
tMin := s - e.maxMatchOff
if tMin < 0 {
@@ -281,6 +282,7 @@
// Load next and check...
e.longTable[nextHashL] = prevEntry{offset: s + e.cur, prev:
candidateL.offset}
e.table[nextHashS] = prevEntry{offset: s + e.cur, prev:
candidateS.offset}
+ index0 := s + 1
// Look far ahead, unless we have a really long match already...
if best.length < goodEnough {
@@ -343,8 +345,8 @@
if best.rep > 0 {
var seq seq
seq.matchLen = uint32(best.length - zstdMinMatch)
- if debugAsserts && s <= nextEmit {
- panic("s <= nextEmit")
+ if debugAsserts && s < nextEmit {
+ panic("s < nextEmit")
}
addLiterals(&seq, best.s)
@@ -356,19 +358,16 @@
blk.sequences = append(blk.sequences, seq)
// Index old s + 1 -> s - 1
- index0 := s + 1
s = best.s + best.length
-
nextEmit = s
- if s >= sLimit {
- if debugEncoder {
- println("repeat ended", s, best.length)
- }
- break encodeLoop
- }
+
// Index skipped...
+ end := s
+ if s > sLimit+4 {
+ end = sLimit + 4
+ }
off := index0 + e.cur
- for index0 < s {
+ for index0 < end {
cv0 := load6432(src, index0)
h0 := hashLen(cv0, bestLongTableBits,
bestLongLen)
h1 := hashLen(cv0, bestShortTableBits,
bestShortLen)
@@ -377,6 +376,7 @@
off++
index0++
}
+
switch best.rep {
case 2, 4 | 1:
offset1, offset2 = offset2, offset1
@@ -385,12 +385,17 @@
case 4 | 3:
offset1, offset2, offset3 = offset1-1, offset1,
offset2
}
+ if s >= sLimit {
+ if debugEncoder {
+ println("repeat ended", s, best.length)
+ }
+ break encodeLoop
+ }
continue
}
// A 4-byte match has been found. Update recent offsets.
// We'll later see if more than 4 bytes.
- index0 := s + 1
s = best.s
t := best.offset
offset1, offset2, offset3 = s-t, offset1, offset2
@@ -418,19 +423,25 @@
}
blk.sequences = append(blk.sequences, seq)
nextEmit = s
- if s >= sLimit {
- break encodeLoop
+
+ // Index old s + 1 -> s - 1 or sLimit
+ end := s
+ if s > sLimit-4 {
+ end = sLimit - 4
}
- // Index old s + 1 -> s - 1
- for index0 < s {
+ off := index0 + e.cur
+ for index0 < end {
cv0 := load6432(src, index0)
h0 := hashLen(cv0, bestLongTableBits, bestLongLen)
h1 := hashLen(cv0, bestShortTableBits, bestShortLen)
- off := index0 + e.cur
e.longTable[h0] = prevEntry{offset: off, prev:
e.longTable[h0].offset}
e.table[h1] = prevEntry{offset: off, prev:
e.table[h1].offset}
index0++
+ off++
+ }
+ if s >= sLimit {
+ break encodeLoop
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/github.com/klauspost/compress/zstd/enc_better.go
new/vendor/github.com/klauspost/compress/zstd/enc_better.go
--- old/vendor/github.com/klauspost/compress/zstd/enc_better.go 2023-12-05
09:32:31.000000000 +0100
+++ new/vendor/github.com/klauspost/compress/zstd/enc_better.go 2023-12-12
18:31:03.000000000 +0100
@@ -145,7 +145,7 @@
var t int32
// We allow the encoder to optionally turn off repeat offsets
across blocks
canRepeat := len(blk.sequences) > 2
- var matched int32
+ var matched, index0 int32
for {
if debugAsserts && canRepeat && offset1 == 0 {
@@ -162,6 +162,7 @@
off := s + e.cur
e.longTable[nextHashL] = prevEntry{offset: off, prev:
candidateL.offset}
e.table[nextHashS] = tableEntry{offset: off, val:
uint32(cv)}
+ index0 = s + 1
if canRepeat {
if repIndex >= 0 && load3232(src, repIndex) ==
uint32(cv>>(repOff*8)) {
@@ -258,7 +259,6 @@
}
blk.sequences = append(blk.sequences,
seq)
- index0 := s + repOff2
s += lenght + repOff2
nextEmit = s
if s >= sLimit {
@@ -498,15 +498,15 @@
}
// Index match start+1 (long) -> s - 1
- index0 := s - l + 1
+ off := index0 + e.cur
for index0 < s-1 {
cv0 := load6432(src, index0)
cv1 := cv0 >> 8
h0 := hashLen(cv0, betterLongTableBits, betterLongLen)
- off := index0 + e.cur
e.longTable[h0] = prevEntry{offset: off, prev:
e.longTable[h0].offset}
e.table[hashLen(cv1, betterShortTableBits,
betterShortLen)] = tableEntry{offset: off + 1, val: uint32(cv1)}
index0 += 2
+ off += 2
}
cv = load6432(src, s)
@@ -672,7 +672,7 @@
var t int32
// We allow the encoder to optionally turn off repeat offsets
across blocks
canRepeat := len(blk.sequences) > 2
- var matched int32
+ var matched, index0 int32
for {
if debugAsserts && canRepeat && offset1 == 0 {
@@ -691,6 +691,7 @@
e.markLongShardDirty(nextHashL)
e.table[nextHashS] = tableEntry{offset: off, val:
uint32(cv)}
e.markShortShardDirty(nextHashS)
+ index0 = s + 1
if canRepeat {
if repIndex >= 0 && load3232(src, repIndex) ==
uint32(cv>>(repOff*8)) {
@@ -726,7 +727,6 @@
blk.sequences = append(blk.sequences,
seq)
// Index match start+1 (long) -> s - 1
- index0 := s + repOff
s += lenght + repOff
nextEmit = s
@@ -790,7 +790,6 @@
}
blk.sequences = append(blk.sequences,
seq)
- index0 := s + repOff2
s += lenght + repOff2
nextEmit = s
if s >= sLimit {
@@ -1024,18 +1023,18 @@
}
// Index match start+1 (long) -> s - 1
- index0 := s - l + 1
+ off := index0 + e.cur
for index0 < s-1 {
cv0 := load6432(src, index0)
cv1 := cv0 >> 8
h0 := hashLen(cv0, betterLongTableBits, betterLongLen)
- off := index0 + e.cur
e.longTable[h0] = prevEntry{offset: off, prev:
e.longTable[h0].offset}
e.markLongShardDirty(h0)
h1 := hashLen(cv1, betterShortTableBits, betterShortLen)
e.table[h1] = tableEntry{offset: off + 1, val:
uint32(cv1)}
e.markShortShardDirty(h1)
index0 += 2
+ off += 2
}
cv = load6432(src, s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/mattn/go-isatty/isatty_bsd.go
new/vendor/github.com/mattn/go-isatty/isatty_bsd.go
--- old/vendor/github.com/mattn/go-isatty/isatty_bsd.go 2023-12-05
09:32:32.000000000 +0100
+++ new/vendor/github.com/mattn/go-isatty/isatty_bsd.go 2023-12-12
18:31:03.000000000 +0100
@@ -1,6 +1,7 @@
-//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) &&
!appengine
+//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) &&
!appengine && !tinygo
// +build darwin freebsd openbsd netbsd dragonfly hurd
// +build !appengine
+// +build !tinygo
package isatty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/mattn/go-isatty/isatty_others.go
new/vendor/github.com/mattn/go-isatty/isatty_others.go
--- old/vendor/github.com/mattn/go-isatty/isatty_others.go 2023-12-05
09:32:32.000000000 +0100
+++ new/vendor/github.com/mattn/go-isatty/isatty_others.go 2023-12-12
18:31:03.000000000 +0100
@@ -1,5 +1,6 @@
-//go:build appengine || js || nacl || wasm
-// +build appengine js nacl wasm
+//go:build (appengine || js || nacl || tinygo || wasm) && !windows
+// +build appengine js nacl tinygo wasm
+// +build !windows
package isatty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
new/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
--- old/vendor/github.com/mattn/go-isatty/isatty_tcgets.go 2023-12-05
09:32:32.000000000 +0100
+++ new/vendor/github.com/mattn/go-isatty/isatty_tcgets.go 2023-12-12
18:31:03.000000000 +0100
@@ -1,6 +1,7 @@
-//go:build (linux || aix || zos) && !appengine
+//go:build (linux || aix || zos) && !appengine && !tinygo
// +build linux aix zos
// +build !appengine
+// +build !tinygo
package isatty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sync/errgroup/go120.go
new/vendor/golang.org/x/sync/errgroup/go120.go
--- old/vendor/golang.org/x/sync/errgroup/go120.go 2023-12-05
09:32:32.000000000 +0100
+++ new/vendor/golang.org/x/sync/errgroup/go120.go 2023-12-12
18:31:03.000000000 +0100
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.20
-// +build go1.20
package errgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sync/errgroup/pre_go120.go
new/vendor/golang.org/x/sync/errgroup/pre_go120.go
--- old/vendor/golang.org/x/sync/errgroup/pre_go120.go 2023-12-05
09:32:32.000000000 +0100
+++ new/vendor/golang.org/x/sync/errgroup/pre_go120.go 2023-12-12
18:31:03.000000000 +0100
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !go1.20
-// +build !go1.20
package errgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2023-12-05 09:32:32.000000000 +0100
+++ new/vendor/modules.txt 2023-12-12 18:31:03.000000000 +0100
@@ -11,20 +11,20 @@
## explicit; go 1.17
github.com/cheggaaa/pb/v3
github.com/cheggaaa/pb/v3/termutil
-# github.com/containerd/stargz-snapshotter/estargz v0.14.3
+# github.com/containerd/stargz-snapshotter/estargz v0.15.1
## explicit; go 1.19
github.com/containerd/stargz-snapshotter/estargz
github.com/containerd/stargz-snapshotter/estargz/errorutil
-# github.com/docker/cli v24.0.5+incompatible
+# github.com/docker/cli v24.0.7+incompatible
## explicit
github.com/docker/cli/cli/config
github.com/docker/cli/cli/config/configfile
github.com/docker/cli/cli/config/credentials
github.com/docker/cli/cli/config/types
-# github.com/docker/distribution v2.8.2+incompatible
+# github.com/docker/distribution v2.8.3+incompatible
## explicit
github.com/docker/distribution/registry/client/auth/challenge
-# github.com/docker/docker v24.0.5+incompatible
+# github.com/docker/docker v24.0.7+incompatible
## explicit
github.com/docker/docker/pkg/homedir
# github.com/docker/docker-credential-helpers v0.8.0
@@ -34,7 +34,7 @@
# github.com/docker/go-units v0.5.0
## explicit
github.com/docker/go-units
-# github.com/fatih/color v1.15.0
+# github.com/fatih/color v1.16.0
## explicit; go 1.17
github.com/fatih/color
# github.com/google/go-containerregistry v0.17.0
@@ -70,8 +70,8 @@
# github.com/inconshreveable/mousetrap v1.1.0
## explicit; go 1.18
github.com/inconshreveable/mousetrap
-# github.com/klauspost/compress v1.17.0
-## explicit; go 1.18
+# github.com/klauspost/compress v1.17.4
+## explicit; go 1.19
github.com/klauspost/compress
github.com/klauspost/compress/fse
github.com/klauspost/compress/huff0
@@ -84,7 +84,7 @@
# github.com/mattn/go-colorable v0.1.13
## explicit; go 1.15
github.com/mattn/go-colorable
-# github.com/mattn/go-isatty v0.0.19
+# github.com/mattn/go-isatty v0.0.20
## explicit; go 1.15
github.com/mattn/go-isatty
# github.com/mattn/go-runewidth v0.0.15
@@ -137,8 +137,8 @@
# golang.org/x/mod v0.14.0
## explicit; go 1.18
golang.org/x/mod/semver
-# golang.org/x/sync v0.3.0
-## explicit; go 1.17
+# golang.org/x/sync v0.5.0
+## explicit; go 1.18
golang.org/x/sync/errgroup
golang.org/x/sync/semaphore
# golang.org/x/sys v0.15.0
