mirror of
https://github.com/containers/podman.git
synced 2025-07-08 13:36:28 +08:00
Merge pull request #20581 from Luap99/go-systemd
vendor: update github.com/coreos/go-systemd/v22 to latest main
This commit is contained in:
2
go.mod
2
go.mod
@ -21,7 +21,7 @@ require (
|
|||||||
github.com/containers/ocicrypt v1.1.9
|
github.com/containers/ocicrypt v1.1.9
|
||||||
github.com/containers/psgo v1.8.0
|
github.com/containers/psgo v1.8.0
|
||||||
github.com/containers/storage v1.50.3-0.20231101112703-6e72f11598fb
|
github.com/containers/storage v1.50.3-0.20231101112703-6e72f11598fb
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0
|
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
|
||||||
github.com/coreos/stream-metadata-go v0.4.3
|
github.com/coreos/stream-metadata-go v0.4.3
|
||||||
github.com/crc-org/vfkit v0.1.2-0.20231030102423-f3c783d34420
|
github.com/crc-org/vfkit v0.1.2-0.20231030102423-f3c783d34420
|
||||||
github.com/cyphar/filepath-securejoin v0.2.4
|
github.com/cyphar/filepath-securejoin v0.2.4
|
||||||
|
3
go.sum
3
go.sum
@ -297,8 +297,9 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7
|
|||||||
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
||||||
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
||||||
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
|
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||||
|
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 h1:OoRAFlvDGCUqDLampLQjk0yeeSGdF9zzst/3G9IkBbc=
|
||||||
|
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09/go.mod h1:m2r/smMKsKwgMSAoFKHaa68ImdCSNuKE1MxvQ64xuCQ=
|
||||||
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
||||||
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
||||||
github.com/coreos/stream-metadata-go v0.4.3 h1:5GykJ8dtZSx1rdlzEAiDVzA73cwmUF3ceTuIP293L6E=
|
github.com/coreos/stream-metadata-go v0.4.3 h1:5GykJ8dtZSx1rdlzEAiDVzA73cwmUF3ceTuIP293L6E=
|
||||||
|
9
vendor/github.com/coreos/go-systemd/v22/internal/dlopen/dlopen.go
generated
vendored
9
vendor/github.com/coreos/go-systemd/v22/internal/dlopen/dlopen.go
generated
vendored
@ -23,6 +23,7 @@ import "C"
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"runtime"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -56,6 +57,10 @@ func GetHandle(libs []string) (*LibHandle, error) {
|
|||||||
|
|
||||||
// GetSymbolPointer takes a symbol name and returns a pointer to the symbol.
|
// GetSymbolPointer takes a symbol name and returns a pointer to the symbol.
|
||||||
func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
|
func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
|
||||||
|
// Locking the thread is critical here as the dlerror() is thread local so
|
||||||
|
// go should not reschedule this onto another thread.
|
||||||
|
runtime.LockOSThread()
|
||||||
|
defer runtime.UnlockOSThread()
|
||||||
sym := C.CString(symbol)
|
sym := C.CString(symbol)
|
||||||
defer C.free(unsafe.Pointer(sym))
|
defer C.free(unsafe.Pointer(sym))
|
||||||
|
|
||||||
@ -71,6 +76,10 @@ func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
|
|||||||
|
|
||||||
// Close closes a LibHandle.
|
// Close closes a LibHandle.
|
||||||
func (l *LibHandle) Close() error {
|
func (l *LibHandle) Close() error {
|
||||||
|
// Locking the thread is critical here as the dlerror() is thread local so
|
||||||
|
// go should not reschedule this onto another thread.
|
||||||
|
runtime.LockOSThread()
|
||||||
|
defer runtime.UnlockOSThread()
|
||||||
C.dlerror()
|
C.dlerror()
|
||||||
C.dlclose(l.Handle)
|
C.dlclose(l.Handle)
|
||||||
e := C.dlerror()
|
e := C.dlerror()
|
||||||
|
4
vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
generated
vendored
4
vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
generated
vendored
@ -59,7 +59,7 @@ package sdjournal
|
|||||||
// void
|
// void
|
||||||
// my_sd_journal_close(void *f, sd_journal *j)
|
// my_sd_journal_close(void *f, sd_journal *j)
|
||||||
// {
|
// {
|
||||||
// int (*sd_journal_close)(sd_journal *);
|
// void (*sd_journal_close)(sd_journal *);
|
||||||
//
|
//
|
||||||
// sd_journal_close = f;
|
// sd_journal_close = f;
|
||||||
// sd_journal_close(j);
|
// sd_journal_close(j);
|
||||||
@ -104,7 +104,7 @@ package sdjournal
|
|||||||
// void
|
// void
|
||||||
// my_sd_journal_flush_matches(void *f, sd_journal *j)
|
// my_sd_journal_flush_matches(void *f, sd_journal *j)
|
||||||
// {
|
// {
|
||||||
// int (*sd_journal_flush_matches)(sd_journal *);
|
// void (*sd_journal_flush_matches)(sd_journal *);
|
||||||
//
|
//
|
||||||
// sd_journal_flush_matches = f;
|
// sd_journal_flush_matches = f;
|
||||||
// sd_journal_flush_matches(j);
|
// sd_journal_flush_matches(j);
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -403,7 +403,7 @@ github.com/coreos/go-oidc/v3/oidc
|
|||||||
# github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
|
# github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
|
||||||
## explicit
|
## explicit
|
||||||
github.com/coreos/go-systemd/activation
|
github.com/coreos/go-systemd/activation
|
||||||
# github.com/coreos/go-systemd/v22 v22.5.0
|
# github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
|
||||||
## explicit; go 1.12
|
## explicit; go 1.12
|
||||||
github.com/coreos/go-systemd/v22/activation
|
github.com/coreos/go-systemd/v22/activation
|
||||||
github.com/coreos/go-systemd/v22/daemon
|
github.com/coreos/go-systemd/v22/daemon
|
||||||
|
Reference in New Issue
Block a user