mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Vendor Update (#14496)
* update code.gitea.io/sdk/gitea v0.13.1 -> v0.13.2 * update github.com/go-swagger/go-swagger v0.25.0 -> v0.26.0 * update github.com/google/uuid v1.1.2 -> v1.2.0 * update github.com/klauspost/compress v1.11.3 -> v1.11.7 * update github.com/lib/pq 083382b7e6fc -> v1.9.0 * update github.com/markbates/goth v1.65.0 -> v1.66.1 * update github.com/mattn/go-sqlite3 v1.14.4 -> v1.14.6 * update github.com/mgechev/revive 246eac737dc7 -> v1.0.3 * update github.com/minio/minio-go/v7 v7.0.6 -> v7.0.7 * update github.com/niklasfasching/go-org v1.3.2 -> v1.4.0 * update github.com/olivere/elastic/v7 v7.0.21 -> v7.0.22 * update github.com/pquerna/otp v1.2.0 -> v1.3.0 * update github.com/xanzy/go-gitlab v0.39.0 -> v0.42.0 * update github.com/yuin/goldmark v1.2.1 -> v1.3.1
This commit is contained in:
		
							
								
								
									
										2
									
								
								vendor/github.com/spf13/afero/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/spf13/afero/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -19,4 +19,4 @@ script: | ||||
|   - go build -v ./... | ||||
|   - go test -count=1 -cover -race -v ./... | ||||
|   - go vet ./... | ||||
|   - FILES=$(gofmt -s -l . zipfs sftpfs mem); if [[ -n "${FILES}" ]]; then  echo "You have go format errors; gofmt your changes"; exit 1; fi | ||||
|   - FILES=$(gofmt -s -l . zipfs sftpfs mem tarfs); if [[ -n "${FILES}" ]]; then  echo "You have go format errors; gofmt your changes"; exit 1; fi | ||||
|   | ||||
							
								
								
									
										7
									
								
								vendor/github.com/spf13/afero/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/spf13/afero/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -227,7 +227,7 @@ operation and a mock filesystem during testing or as needed. | ||||
|  | ||||
| ```go | ||||
| appfs := afero.NewOsFs() | ||||
| appfs.MkdirAll("src/a", 0755)) | ||||
| appfs.MkdirAll("src/a", 0755) | ||||
| ``` | ||||
|  | ||||
| ## Memory Backed Storage | ||||
| @@ -241,7 +241,7 @@ safely. | ||||
|  | ||||
| ```go | ||||
| mm := afero.NewMemMapFs() | ||||
| mm.MkdirAll("src/a", 0755)) | ||||
| mm.MkdirAll("src/a", 0755) | ||||
| ``` | ||||
|  | ||||
| #### InMemoryFile | ||||
| @@ -306,7 +306,7 @@ Any Afero FileSystem can be used as an httpFs. | ||||
|  | ||||
| ```go | ||||
| httpFs := afero.NewHttpFs(<ExistingFS>) | ||||
| fileserver := http.FileServer(httpFs.Dir(<PATH>))) | ||||
| fileserver := http.FileServer(httpFs.Dir(<PATH>)) | ||||
| http.Handle("/", fileserver) | ||||
| ``` | ||||
|  | ||||
| @@ -380,7 +380,6 @@ The following is a short list of possible backends we hope someone will | ||||
| implement: | ||||
|  | ||||
| * SSH | ||||
| * TAR | ||||
| * S3 | ||||
|  | ||||
| # About the project | ||||
|   | ||||
							
								
								
									
										2
									
								
								vendor/github.com/spf13/afero/go.mod
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/spf13/afero/go.mod
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -3,7 +3,7 @@ module github.com/spf13/afero | ||||
| require ( | ||||
| 	github.com/pkg/sftp v1.10.1 | ||||
| 	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 | ||||
| 	golang.org/x/text v0.3.0 | ||||
| 	golang.org/x/text v0.3.3 | ||||
| ) | ||||
|  | ||||
| go 1.13 | ||||
|   | ||||
							
								
								
									
										9
									
								
								vendor/github.com/spf13/afero/go.sum
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								vendor/github.com/spf13/afero/go.sum
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,4 @@ | ||||
| github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= | ||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= | ||||
| github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= | ||||
| @@ -5,16 +6,24 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= | ||||
| github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pkg/sftp v1.10.1 h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc= | ||||
| github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= | ||||
| github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||
| github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= | ||||
| github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= | ||||
| golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= | ||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= | ||||
| gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
|   | ||||
							
								
								
									
										10
									
								
								vendor/github.com/spf13/afero/mem/file.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/spf13/afero/mem/file.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -225,11 +225,11 @@ func (f *File) Seek(offset int64, whence int) (int64, error) { | ||||
| 		return 0, ErrFileClosed | ||||
| 	} | ||||
| 	switch whence { | ||||
| 	case 0: | ||||
| 	case io.SeekStart: | ||||
| 		atomic.StoreInt64(&f.at, offset) | ||||
| 	case 1: | ||||
| 		atomic.AddInt64(&f.at, int64(offset)) | ||||
| 	case 2: | ||||
| 	case io.SeekCurrent: | ||||
| 		atomic.AddInt64(&f.at, offset) | ||||
| 	case io.SeekEnd: | ||||
| 		atomic.StoreInt64(&f.at, int64(len(f.fileData.data))+offset) | ||||
| 	} | ||||
| 	return f.at, nil | ||||
| @@ -260,7 +260,7 @@ func (f *File) Write(b []byte) (n int, err error) { | ||||
| 	} | ||||
| 	setModTime(f.fileData, time.Now()) | ||||
|  | ||||
| 	atomic.StoreInt64(&f.at, int64(len(f.fileData.data))) | ||||
| 	atomic.AddInt64(&f.at, int64(n)) | ||||
| 	return | ||||
| } | ||||
|  | ||||
|   | ||||
							
								
								
									
										28
									
								
								vendor/github.com/spf13/afero/memmap.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								vendor/github.com/spf13/afero/memmap.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -25,6 +25,8 @@ import ( | ||||
| 	"github.com/spf13/afero/mem" | ||||
| ) | ||||
|  | ||||
| const chmodBits = os.ModePerm | os.ModeSetuid | os.ModeSetgid | os.ModeSticky // Only a subset of bits are allowed to be changed. Documented under os.Chmod() | ||||
|  | ||||
| type MemMapFs struct { | ||||
| 	mu   sync.RWMutex | ||||
| 	data map[string]*mem.FileData | ||||
| @@ -40,7 +42,9 @@ func (m *MemMapFs) getData() map[string]*mem.FileData { | ||||
| 		m.data = make(map[string]*mem.FileData) | ||||
| 		// Root should always exist, right? | ||||
| 		// TODO: what about windows? | ||||
| 		m.data[FilePathSeparator] = mem.CreateDir(FilePathSeparator) | ||||
| 		root := mem.CreateDir(FilePathSeparator) | ||||
| 		mem.SetMode(root, os.ModeDir|0755) | ||||
| 		m.data[FilePathSeparator] = root | ||||
| 	}) | ||||
| 	return m.data | ||||
| } | ||||
| @@ -52,7 +56,7 @@ func (m *MemMapFs) Create(name string) (File, error) { | ||||
| 	m.mu.Lock() | ||||
| 	file := mem.CreateFile(name) | ||||
| 	m.getData()[name] = file | ||||
| 	m.registerWithParent(file) | ||||
| 	m.registerWithParent(file, 0) | ||||
| 	m.mu.Unlock() | ||||
| 	return mem.NewFileHandle(file), nil | ||||
| } | ||||
| @@ -83,14 +87,14 @@ func (m *MemMapFs) findParent(f *mem.FileData) *mem.FileData { | ||||
| 	return pfile | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) registerWithParent(f *mem.FileData) { | ||||
| func (m *MemMapFs) registerWithParent(f *mem.FileData, perm os.FileMode) { | ||||
| 	if f == nil { | ||||
| 		return | ||||
| 	} | ||||
| 	parent := m.findParent(f) | ||||
| 	if parent == nil { | ||||
| 		pdir := filepath.Dir(filepath.Clean(f.Name())) | ||||
| 		err := m.lockfreeMkdir(pdir, 0777) | ||||
| 		err := m.lockfreeMkdir(pdir, perm) | ||||
| 		if err != nil { | ||||
| 			//log.Println("Mkdir error:", err) | ||||
| 			return | ||||
| @@ -119,13 +123,15 @@ func (m *MemMapFs) lockfreeMkdir(name string, perm os.FileMode) error { | ||||
| 		} | ||||
| 	} else { | ||||
| 		item := mem.CreateDir(name) | ||||
| 		mem.SetMode(item, os.ModeDir|perm) | ||||
| 		m.getData()[name] = item | ||||
| 		m.registerWithParent(item) | ||||
| 		m.registerWithParent(item, perm) | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) Mkdir(name string, perm os.FileMode) error { | ||||
| 	perm &= chmodBits | ||||
| 	name = normalizePath(name) | ||||
|  | ||||
| 	m.mu.RLock() | ||||
| @@ -137,8 +143,9 @@ func (m *MemMapFs) Mkdir(name string, perm os.FileMode) error { | ||||
|  | ||||
| 	m.mu.Lock() | ||||
| 	item := mem.CreateDir(name) | ||||
| 	mem.SetMode(item, os.ModeDir|perm) | ||||
| 	m.getData()[name] = item | ||||
| 	m.registerWithParent(item) | ||||
| 	m.registerWithParent(item, perm) | ||||
| 	m.mu.Unlock() | ||||
|  | ||||
| 	return m.setFileMode(name, perm|os.ModeDir) | ||||
| @@ -208,6 +215,7 @@ func (m *MemMapFs) lockfreeOpen(name string) (*mem.FileData, error) { | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) OpenFile(name string, flag int, perm os.FileMode) (File, error) { | ||||
| 	perm &= chmodBits | ||||
| 	chmod := false | ||||
| 	file, err := m.openWrite(name) | ||||
| 	if err == nil && (flag&os.O_EXCL > 0) { | ||||
| @@ -300,7 +308,7 @@ func (m *MemMapFs) Rename(oldname, newname string) error { | ||||
| 		delete(m.getData(), oldname) | ||||
| 		mem.ChangeFileName(fileData, newname) | ||||
| 		m.getData()[newname] = fileData | ||||
| 		m.registerWithParent(fileData) | ||||
| 		m.registerWithParent(fileData, 0) | ||||
| 		m.mu.Unlock() | ||||
| 		m.mu.RLock() | ||||
| 	} else { | ||||
| @@ -309,6 +317,11 @@ func (m *MemMapFs) Rename(oldname, newname string) error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) LstatIfPossible(name string) (os.FileInfo, bool, error) { | ||||
| 	fileInfo, err := m.Stat(name) | ||||
| 	return fileInfo, false, err | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) Stat(name string) (os.FileInfo, error) { | ||||
| 	f, err := m.Open(name) | ||||
| 	if err != nil { | ||||
| @@ -319,7 +332,6 @@ func (m *MemMapFs) Stat(name string) (os.FileInfo, error) { | ||||
| } | ||||
|  | ||||
| func (m *MemMapFs) Chmod(name string, mode os.FileMode) error { | ||||
| 	const chmodBits = os.ModePerm | os.ModeSetuid | os.ModeSetgid | os.ModeSticky // Only a subset of bits are allowed to be changed. Documented under os.Chmod() | ||||
| 	mode &= chmodBits | ||||
|  | ||||
| 	m.mu.RLock() | ||||
|   | ||||
							
								
								
									
										17
									
								
								vendor/github.com/spf13/afero/unionFile.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								vendor/github.com/spf13/afero/unionFile.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -186,25 +186,22 @@ func (f *UnionFile) Readdir(c int) (ofi []os.FileInfo, err error) { | ||||
| 		} | ||||
| 		f.files = append(f.files, merged...) | ||||
| 	} | ||||
| 	files := f.files[f.off:] | ||||
|  | ||||
| 	if c <= 0 && len(f.files) == 0 { | ||||
| 		return f.files, nil | ||||
| 	if c <= 0 { | ||||
| 		return files, nil | ||||
| 	} | ||||
|  | ||||
| 	if f.off >= len(f.files) { | ||||
| 	if len(files) == 0 { | ||||
| 		return nil, io.EOF | ||||
| 	} | ||||
|  | ||||
| 	if c <= 0 { | ||||
| 		return f.files[f.off:], nil | ||||
| 	} | ||||
|  | ||||
| 	if c > len(f.files) { | ||||
| 		c = len(f.files) | ||||
| 	if c > len(files) { | ||||
| 		c = len(files) | ||||
| 	} | ||||
|  | ||||
| 	defer func() { f.off += c }() | ||||
| 	return f.files[f.off:c], nil | ||||
| 	return files[:c], nil | ||||
| } | ||||
|  | ||||
| func (f *UnionFile) Readdirnames(c int) ([]string, error) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user