Skip to content
Permalink
Browse files

Merge pull request #2242 from AkihiroSuda/vendor-systemd

vendor: update go-systemd and godbus
  • Loading branch information
AkihiroSuda committed Mar 24, 2020
2 parents 4e6d8a0 + 492d525 commit cc183ca6626c7fdcab8fa3f6d10ec89d9b185ee9
Showing with 431 additions and 234 deletions.
  1. +2 −2 go.mod
  2. +4 −4 go.sum
  3. +2 −2 libcontainer/cgroups/systemd/apply_systemd.go
  4. +1 −1 libcontainer/cgroups/systemd/unified_hierarchy.go
  5. +1 −1 libcontainer/configs/cgroup_linux.go
  6. +2 −2 libcontainer/specconv/spec_linux.go
  7. +1 −1 libcontainer/specconv/spec_linux_test.go
  8. +1 −1 utils_linux.go
  9. 0 vendor/github.com/coreos/go-systemd/{ → v22}/LICENSE
  10. 0 vendor/github.com/coreos/go-systemd/{ → v22}/NOTICE
  11. 0 vendor/github.com/coreos/go-systemd/{ → v22}/activation/files.go
  12. +2 −2 vendor/github.com/coreos/go-systemd/{ → v22}/activation/listeners.go
  13. 0 vendor/github.com/coreos/go-systemd/{ → v22}/activation/packetconns.go
  14. +1 −1 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/dbus.go
  15. +7 −1 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/methods.go
  16. +2 −2 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/properties.go
  17. 0 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/set.go
  18. +1 −1 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/subscription.go
  19. 0 vendor/github.com/coreos/go-systemd/{ → v22}/dbus/subscription_set.go
  20. +0 −46 vendor/github.com/godbus/dbus/.travis.yml
  21. +0 −1 vendor/github.com/godbus/dbus/go.mod
  22. +50 −0 vendor/github.com/godbus/dbus/v5/.travis.yml
  23. 0 vendor/github.com/godbus/dbus/{ → v5}/CONTRIBUTING.md
  24. 0 vendor/github.com/godbus/dbus/{ → v5}/LICENSE
  25. 0 vendor/github.com/godbus/dbus/{ → v5}/MAINTAINERS
  26. 0 vendor/github.com/godbus/dbus/{ → v5}/README.markdown
  27. +2 −2 vendor/github.com/godbus/dbus/{ → v5}/auth.go
  28. 0 vendor/github.com/godbus/dbus/{ → v5}/auth_anonymous.go
  29. 0 vendor/github.com/godbus/dbus/{ → v5}/auth_external.go
  30. +1 −1 vendor/github.com/godbus/dbus/{ → v5}/auth_sha1.go
  31. 0 vendor/github.com/godbus/dbus/{ → v5}/call.go
  32. +116 −51 vendor/github.com/godbus/dbus/{ → v5}/conn.go
  33. 0 vendor/github.com/godbus/dbus/{ → v5}/conn_darwin.go
  34. +4 −2 vendor/github.com/godbus/dbus/{ → v5}/conn_other.go
  35. +2 −3 vendor/github.com/godbus/dbus/{ → v5}/conn_unix.go
  36. 0 vendor/github.com/godbus/dbus/{ → v5}/conn_windows.go
  37. +1 −0 vendor/github.com/godbus/dbus/{ → v5}/dbus.go
  38. +52 −1 vendor/github.com/godbus/dbus/{ → v5}/decoder.go
  39. +61 −54 vendor/github.com/godbus/dbus/{ → v5}/default_handler.go
  40. +1 −1 vendor/github.com/godbus/dbus/{ → v5}/doc.go
  41. +1 −1 vendor/github.com/godbus/dbus/{ → v5}/encoder.go
  42. +1 −1 vendor/github.com/godbus/dbus/{ → v5}/export.go
  43. +3 −0 vendor/github.com/godbus/dbus/v5/go.mod
  44. 0 vendor/github.com/godbus/dbus/v5/go.sum
  45. 0 vendor/github.com/godbus/dbus/{ → v5}/homedir.go
  46. 0 vendor/github.com/godbus/dbus/{ → v5}/homedir_dynamic.go
  47. 0 vendor/github.com/godbus/dbus/{ → v5}/homedir_static.go
  48. +62 −0 vendor/github.com/godbus/dbus/v5/match.go
  49. 0 vendor/github.com/godbus/dbus/{ → v5}/message.go
  50. +27 −35 vendor/github.com/godbus/dbus/{ → v5}/object.go
  51. +8 −0 vendor/github.com/godbus/dbus/{ → v5}/server_interfaces.go
  52. 0 vendor/github.com/godbus/dbus/{ → v5}/sig.go
  53. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_darwin.go
  54. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_generic.go
  55. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_nonce_tcp.go
  56. +0 −2 vendor/github.com/godbus/dbus/{ → v5}/transport_tcp.go
  57. +1 −1 vendor/github.com/godbus/dbus/{ → v5}/transport_unix.go
  58. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_unixcred_dragonfly.go
  59. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_unixcred_freebsd.go
  60. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_unixcred_linux.go
  61. 0 vendor/github.com/godbus/dbus/{ → v5}/transport_unixcred_openbsd.go
  62. +2 −2 vendor/github.com/godbus/dbus/{ → v5}/variant.go
  63. +4 −4 vendor/github.com/godbus/dbus/{ → v5}/variant_lexer.go
  64. 0 vendor/github.com/godbus/dbus/{ → v5}/variant_parser.go
  65. +5 −5 vendor/modules.txt
4 go.mod
@@ -6,10 +6,10 @@ require (
github.com/checkpoint-restore/go-criu v0.0.0-20181120144056-17b0214f6c48
github.com/cilium/ebpf v0.0.0-20191025125908-95b36a581eed
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/go-systemd/v22 v22.0.0
github.com/cyphar/filepath-securejoin v0.2.2
github.com/docker/go-units v0.3.3
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f
github.com/godbus/dbus/v5 v5.0.3
github.com/golang/protobuf v1.0.0
github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618
github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559
8 go.sum
@@ -4,16 +4,16 @@ github.com/cilium/ebpf v0.0.0-20191025125908-95b36a581eed h1:/UgmF+cZTm9kp4uJ122
github.com/cilium/ebpf v0.0.0-20191025125908-95b36a581eed/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 h1:WMpHmC6AxwWb9hMqhudkqG7A/p14KiMnl6d3r1iUMjU=
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f h1:zlOR3rOlPAVvtfuxGKoghCmop5B0TRyu/ZieziZuGiM=
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/protobuf v1.0.0 h1:lsek0oXi8iFE9L+EXARyHIjU5rlWIhhTkjDz3vHhWWQ=
github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
@@ -13,8 +13,8 @@ import (
"sync"
"time"

systemdDbus "github.com/coreos/go-systemd/dbus"
"github.com/godbus/dbus"
systemdDbus "github.com/coreos/go-systemd/v22/dbus"
dbus "github.com/godbus/dbus/v5"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/configs"
@@ -12,7 +12,7 @@ import (
"sync"
"time"

systemdDbus "github.com/coreos/go-systemd/dbus"
systemdDbus "github.com/coreos/go-systemd/v22/dbus"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
"github.com/opencontainers/runc/libcontainer/configs"
@@ -1,7 +1,7 @@
package configs

import (
systemdDbus "github.com/coreos/go-systemd/dbus"
systemdDbus "github.com/coreos/go-systemd/v22/dbus"
)

type FreezerState string
@@ -13,8 +13,8 @@ import (
"strings"
"time"

systemdDbus "github.com/coreos/go-systemd/dbus"
"github.com/godbus/dbus"
systemdDbus "github.com/coreos/go-systemd/v22/dbus"
dbus "github.com/godbus/dbus/v5"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/seccomp"
@@ -9,7 +9,7 @@ import (

"golang.org/x/sys/unix"

"github.com/godbus/dbus"
dbus "github.com/godbus/dbus/v5"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs/validate"
"github.com/opencontainers/runtime-spec/specs-go"
@@ -19,7 +19,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
selinux "github.com/opencontainers/selinux/go-selinux"

"github.com/coreos/go-systemd/activation"
"github.com/coreos/go-systemd/v22/activation"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more.

File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

File renamed without changes.

0 comments on commit cc183ca

Please sign in to comment.
You can’t perform that action at this time.