From 9439eccc12cf70f1c69c2c17e7e57685f13c8ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= Date: Fri, 20 Oct 2023 15:11:29 +0200 Subject: [PATCH] Update dependencies --- go.mod | 2 +- go.sum | 13 ++-------- vendor/github.com/xyproto/datablock/LICENSE | 24 ++++++------------- vendor/github.com/xyproto/datablock/README.md | 6 ++--- .../github.com/xyproto/datablock/datablock.go | 5 ++++ vendor/modules.txt | 2 +- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 7f9e5bd58..269b6799f 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/tylerb/graceful v1.2.15 github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6 github.com/xyproto/ask v1.0.2 - github.com/xyproto/datablock v0.0.0-20190619140322-71fb859bdac7 + github.com/xyproto/datablock v1.2.0 github.com/xyproto/env/v2 v2.2.4 github.com/xyproto/files v1.4.1 github.com/xyproto/gluamapper v1.2.1 diff --git a/go.sum b/go.sum index 45be79dcc..b7b4319c1 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,6 @@ github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0t github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= 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/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -92,7 +90,6 @@ github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis= github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= -github.com/mattetti/filebuffer v1.0.0/go.mod h1:X6nyAIge2JGVmuJt2MFCqmHrb/5IHiphfHtot0s5cnI= github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM= github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -140,13 +137,9 @@ github.com/russross/blackfriday v1.5.3-0.20190616195246-a925a152c144 h1:DSnT5th1 github.com/russross/blackfriday v1.5.3-0.20190616195246-a925a152c144/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -166,8 +159,8 @@ github.com/xyproto/cookie v0.0.0-20210319112338-2e0ffd4b75a9 h1:9CPJq26PTbHm92sS github.com/xyproto/cookie/v2 v2.2.3/go.mod h1:GLwQP/zGrMRVJ++iavGE7jEhSyF8DY2RW3xmlYhOVhA= github.com/xyproto/cookie/v2 v2.2.4 h1:McHpNU+5r1jpMxGwCoUCoHQHElrW2wr7cXomBauuJ9I= github.com/xyproto/cookie/v2 v2.2.4/go.mod h1:SkeeteOip8UEegYTF4H+WIzrgKVrqh7o0t97i3vymjw= -github.com/xyproto/datablock v0.0.0-20190619140322-71fb859bdac7 h1:QhHTQZv23FYagtq3yYOLr1Q3WYEIF3y34P8lyH2IGzk= -github.com/xyproto/datablock v0.0.0-20190619140322-71fb859bdac7/go.mod h1:TT/TbaPa1pHzsZ1rtzvdfNsVZui5AXFQxTfEig7srvg= +github.com/xyproto/datablock v1.2.0 h1:BRHolvVGIbrbILKecRCGBWt1pp/bEsOC+m2I3A32tig= +github.com/xyproto/datablock v1.2.0/go.mod h1:hQGlZYTpt2QOXcjPKri4bjwU1mebDvrY9Nlx2hUgQe0= github.com/xyproto/env/v2 v2.0.0/go.mod h1:n0AhHu2mZjNMK2auKEF6eUAU6LJ/1PQfss8UuT7Jhzc= github.com/xyproto/env/v2 v2.2.4 h1:Eysqz8rlZRBjKwH0a+oxyFj4WMDBaezKNHLx2S5f8go= github.com/xyproto/env/v2 v2.2.4/go.mod h1:F81ZEzu15s3TWUZJ1uzBl9iNeq9zcfHvxMkQJaLZUl0= @@ -281,8 +274,6 @@ golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190618155005-516e3c20635f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/github.com/xyproto/datablock/LICENSE b/vendor/github.com/xyproto/datablock/LICENSE index 0d6d9e7ef..eb3c3340b 100644 --- a/vendor/github.com/xyproto/datablock/LICENSE +++ b/vendor/github.com/xyproto/datablock/LICENSE @@ -1,21 +1,11 @@ -MIT License +Copyright 2023 Alexander F. Rødseth -Copyright (c) 2019 Alexander F. Rødseth +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/xyproto/datablock/README.md b/vendor/github.com/xyproto/datablock/README.md index 11daf2b3c..499eee044 100644 --- a/vendor/github.com/xyproto/datablock/README.md +++ b/vendor/github.com/xyproto/datablock/README.md @@ -1,4 +1,4 @@ -# Datablock [![Build Status](https://travis-ci.org/xyproto/datablock.svg?branch=master)](https://travis-ci.org/xyproto/datablock) [![GoDoc](https://godoc.org/github.com/xyproto/datablock?status.svg)](http://godoc.org/github.com/xyproto/datablock) [![Report Card](https://img.shields.io/badge/go_report-A+-brightgreen.svg?style=flat)](http://goreportcard.com/report/xyproto/datablock) +# Datablock [![GoDoc](https://godoc.org/github.com/xyproto/datablock?status.svg)](http://godoc.org/github.com/xyproto/datablock) [![Report Card](https://img.shields.io/badge/go_report-A+-brightgreen.svg?style=flat)](http://goreportcard.com/report/xyproto/datablock) Module for reading and caching files into a fixed size cache buffer. @@ -17,6 +17,6 @@ Online API Documentation General information ------------------- -* Version: 1.0 -* License: MIT +* Version: 1.2.0 +* License: BSD-3 * Alexander F Rødseth <xyproto@archlinux.org> diff --git a/vendor/github.com/xyproto/datablock/datablock.go b/vendor/github.com/xyproto/datablock/datablock.go index ed5f7eba4..b7bb5f3ae 100644 --- a/vendor/github.com/xyproto/datablock/datablock.go +++ b/vendor/github.com/xyproto/datablock/datablock.go @@ -59,6 +59,11 @@ func (b *DataBlock) MustData() []byte { return b.data } +// Bytes returns the uncompressed data or an empty byte slice +func (b *DataBlock) Bytes() []byte { + return b.MustData() +} + // String returns the uncompressed data as a string or as an empty string. // Same as MustData, but converted to a string. func (b *DataBlock) String() string { diff --git a/vendor/modules.txt b/vendor/modules.txt index 169647a76..167523fec 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -226,7 +226,7 @@ github.com/xyproto/binary # github.com/xyproto/cookie/v2 v2.2.4 ## explicit; go 1.17 github.com/xyproto/cookie/v2 -# github.com/xyproto/datablock v0.0.0-20190619140322-71fb859bdac7 +# github.com/xyproto/datablock v1.2.0 ## explicit; go 1.12 github.com/xyproto/datablock # github.com/xyproto/env/v2 v2.2.4