mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-05-31 11:52:10 +00:00
switch to use gliderlabs/ssh for builtin server (#7250)
resolves git conflicts from #3896 (credit to @belak, in case github doesn't keep original author during squash) Co-Authored-By: Matti Ranta <techknowlogick@gitea.io>
This commit is contained in:
parent
c44f0b1c76
commit
d0ec940dd7
41 changed files with 2122 additions and 178 deletions
5
vendor/golang.org/x/sys/unix/syscall_linux.go
generated
vendored
5
vendor/golang.org/x/sys/unix/syscall_linux.go
generated
vendored
|
@ -13,7 +13,6 @@ package unix
|
|||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"net"
|
||||
"runtime"
|
||||
"syscall"
|
||||
"unsafe"
|
||||
|
@ -765,7 +764,7 @@ const px_proto_oe = 0
|
|||
|
||||
type SockaddrPPPoE struct {
|
||||
SID uint16
|
||||
Remote net.HardwareAddr
|
||||
Remote []byte
|
||||
Dev string
|
||||
raw RawSockaddrPPPoX
|
||||
}
|
||||
|
@ -916,7 +915,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
|
|||
}
|
||||
sa := &SockaddrPPPoE{
|
||||
SID: binary.BigEndian.Uint16(pp[6:8]),
|
||||
Remote: net.HardwareAddr(pp[8:14]),
|
||||
Remote: pp[8:14],
|
||||
}
|
||||
for i := 14; i < 14+IFNAMSIZ; i++ {
|
||||
if pp[i] == 0 {
|
||||
|
|
1
vendor/golang.org/x/sys/unix/types_netbsd.go
generated
vendored
1
vendor/golang.org/x/sys/unix/types_netbsd.go
generated
vendored
|
@ -254,6 +254,7 @@ type Ptmget C.struct_ptmget
|
|||
|
||||
const (
|
||||
AT_FDCWD = C.AT_FDCWD
|
||||
AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW
|
||||
AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/types_openbsd.go
generated
vendored
1
vendor/golang.org/x/sys/unix/types_openbsd.go
generated
vendored
|
@ -241,6 +241,7 @@ type Winsize C.struct_winsize
|
|||
|
||||
const (
|
||||
AT_FDCWD = C.AT_FDCWD
|
||||
AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW
|
||||
AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
generated
vendored
|
@ -411,6 +411,7 @@ type Ptmget struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x400
|
||||
AT_SYMLINK_NOFOLLOW = 0x200
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
generated
vendored
|
@ -418,6 +418,7 @@ type Ptmget struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x400
|
||||
AT_SYMLINK_NOFOLLOW = 0x200
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
generated
vendored
|
@ -416,6 +416,7 @@ type Ptmget struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x400
|
||||
AT_SYMLINK_NOFOLLOW = 0x200
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
generated
vendored
|
@ -418,6 +418,7 @@ type Ptmget struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x400
|
||||
AT_SYMLINK_NOFOLLOW = 0x200
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
generated
vendored
|
@ -436,6 +436,7 @@ type Winsize struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x4
|
||||
AT_SYMLINK_NOFOLLOW = 0x2
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
generated
vendored
|
@ -436,6 +436,7 @@ type Winsize struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x4
|
||||
AT_SYMLINK_NOFOLLOW = 0x2
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
generated
vendored
|
@ -437,6 +437,7 @@ type Winsize struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x4
|
||||
AT_SYMLINK_NOFOLLOW = 0x2
|
||||
)
|
||||
|
||||
|
|
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
generated
vendored
1
vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
generated
vendored
|
@ -430,6 +430,7 @@ type Winsize struct {
|
|||
|
||||
const (
|
||||
AT_FDCWD = -0x64
|
||||
AT_SYMLINK_FOLLOW = 0x4
|
||||
AT_SYMLINK_NOFOLLOW = 0x2
|
||||
)
|
||||
|
||||
|
|
4
vendor/golang.org/x/sys/windows/syscall_windows.go
generated
vendored
4
vendor/golang.org/x/sys/windows/syscall_windows.go
generated
vendored
|
@ -294,7 +294,7 @@ func NewCallbackCDecl(fn interface{}) uintptr {
|
|||
//sys clsidFromString(lpsz *uint16, pclsid *GUID) (ret error) = ole32.CLSIDFromString
|
||||
//sys stringFromGUID2(rguid *GUID, lpsz *uint16, cchMax int32) (chars int32) = ole32.StringFromGUID2
|
||||
//sys coCreateGuid(pguid *GUID) (ret error) = ole32.CoCreateGuid
|
||||
//sys coTaskMemFree(address unsafe.Pointer) = ole32.CoTaskMemFree
|
||||
//sys CoTaskMemFree(address unsafe.Pointer) = ole32.CoTaskMemFree
|
||||
//sys rtlGetVersion(info *OsVersionInfoEx) (ret error) = ntdll.RtlGetVersion
|
||||
|
||||
// syscall interface implementation for other packages
|
||||
|
@ -1302,7 +1302,7 @@ func (t Token) KnownFolderPath(folderID *KNOWNFOLDERID, flags uint32) (string, e
|
|||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer coTaskMemFree(unsafe.Pointer(p))
|
||||
defer CoTaskMemFree(unsafe.Pointer(p))
|
||||
return UTF16ToString((*[(1 << 30) - 1]uint16)(unsafe.Pointer(p))[:]), nil
|
||||
}
|
||||
|
||||
|
|
2
vendor/golang.org/x/sys/windows/zsyscall_windows.go
generated
vendored
2
vendor/golang.org/x/sys/windows/zsyscall_windows.go
generated
vendored
|
@ -2517,7 +2517,7 @@ func coCreateGuid(pguid *GUID) (ret error) {
|
|||
return
|
||||
}
|
||||
|
||||
func coTaskMemFree(address unsafe.Pointer) {
|
||||
func CoTaskMemFree(address unsafe.Pointer) {
|
||||
syscall.Syscall(procCoTaskMemFree.Addr(), 1, uintptr(address), 0, 0)
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue