summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2021-03-29 10:50:05 -0400
committerMatthew Heon <mheon@redhat.com>2021-03-29 10:50:05 -0400
commit0127cc1840f870640c09f6adcf8c35929c189304 (patch)
tree671c022015b37b93763d46a209768f0fbe57989c
parentc8af1747320bb9506ab4ea80892f0dae81c03a95 (diff)
downloadpodman-0127cc1840f870640c09f6adcf8c35929c189304.tar.gz
podman-0127cc1840f870640c09f6adcf8c35929c189304.tar.bz2
podman-0127cc1840f870640c09f6adcf8c35929c189304.zip
Revert go-systemd to v2.22.0
The newer v2.23.0 broke the build on 32-bit systems. We resolved it upstream, but there's no newer release with the fix yet. Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--vendor/github.com/coreos/go-systemd/v22/dbus/methods.go21
-rw-r--r--vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go5
-rw-r--r--vendor/modules.txt2
5 files changed, 8 insertions, 26 deletions
diff --git a/go.mod b/go.mod
index 6e2482bd6..d8c3fd6ad 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
github.com/containers/ocicrypt v1.1.0
github.com/containers/psgo v1.5.2
github.com/containers/storage v1.28.0
- github.com/coreos/go-systemd/v22 v22.3.0
+ github.com/coreos/go-systemd/v22 v22.2.0
github.com/cri-o/ocicni v0.2.1-0.20210301205850-541cf7c703cf
github.com/cyphar/filepath-securejoin v0.2.2
github.com/davecgh/go-spew v1.1.1
diff --git a/go.sum b/go.sum
index 62a83a253..9c362721e 100644
--- a/go.sum
+++ b/go.sum
@@ -215,8 +215,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
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.3.0 h1:C8u/Ljj8G8O6rqWJh2J8cDyeEFBMWvXlvJ/ccMyzcqw=
-github.com/coreos/go-systemd/v22 v22.3.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/go-systemd/v22 v22.2.0 h1:BBmbNtSc5PuUM3Byxs7yE5rLdxQO4/FMoEXY5Rle4GA=
+github.com/coreos/go-systemd/v22 v22.2.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
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/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
diff --git a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go
index 01879ba15..679f244e8 100644
--- a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go
+++ b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go
@@ -24,18 +24,6 @@ import (
"github.com/godbus/dbus/v5"
)
-// Who can be used to specify which process to kill in the unit via the KillUnitWithTarget API
-type Who string
-
-const (
- // All sends the signal to all processes in the unit
- All Who = "all"
- // Main sends the signal to the main process of the unit
- Main Who = "main"
- // Control sends the signal to the control process of the unit
- Control Who = "control"
-)
-
func (c *Conn) jobComplete(signal *dbus.Signal) {
var id uint32
var job dbus.ObjectPath
@@ -208,12 +196,7 @@ func (c *Conn) KillUnit(name string, signal int32) {
// KillUnitContext same as KillUnit with context
func (c *Conn) KillUnitContext(ctx context.Context, name string, signal int32) {
- c.KillUnitWithTarget(ctx, name, All, signal)
-}
-
-// KillUnitWithTarget is like KillUnitContext, but allows you to specify which process in the unit to send the signal to
-func (c *Conn) KillUnitWithTarget(ctx context.Context, name string, target Who, signal int32) error {
- return c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, string(target), signal).Store()
+ c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()
}
// ResetFailedUnit resets the "failed" state of a specific unit.
@@ -377,7 +360,7 @@ func (c *Conn) SetUnitPropertiesContext(ctx context.Context, name string, runtim
// Deprecated: use GetUnitTypePropertyContext instead
func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
- return c.GetUnitTypePropertyContext(context.Background(), unit, unitType, propertyName)
+ return c.GetUnitTypePropertyContext(context.Background(), unitType, unitType, propertyName)
}
// GetUnitTypePropertyContext same as GetUnitTypeProperty with context
diff --git a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
index 344016ebe..c61a2025f 100644
--- a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
+++ b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
@@ -310,7 +310,7 @@ package sdjournal
// }
//
// char *
-// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[SD_ID128_STRING_MAX])
+// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[_SD_ARRAY_STATIC SD_ID128_STRING_MAX])
// {
// char *(*sd_id128_to_string)(sd_id128_t, char *);
//
@@ -1155,8 +1155,7 @@ func (j *Journal) GetBootID() (string, error) {
return "", err
}
- id128StringMax := C.ulong(C.SD_ID128_STRING_MAX)
- c := (*C.char)(C.malloc(id128StringMax))
+ c := (*C.char)(C.malloc(33))
defer C.free(unsafe.Pointer(c))
C.my_sd_id128_to_string(sd_id128_to_string, boot_id, c)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a53009625..de432c596 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -233,7 +233,7 @@ github.com/containers/storage/types
github.com/coreos/go-iptables/iptables
# github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/go-systemd/activation
-# github.com/coreos/go-systemd/v22 v22.3.0
+# github.com/coreos/go-systemd/v22 v22.2.0
github.com/coreos/go-systemd/v22/activation
github.com/coreos/go-systemd/v22/daemon
github.com/coreos/go-systemd/v22/dbus