Merge pull request #5549 from containers/dependabot/go_modules/github.com/containers/common-0.6.1

Bump github.com/containers/common from 0.5.0 to 0.6.1

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/containernetworking/cni v0.7.2-0.20200304161608-4fae32b84921
 	github.com/containernetworking/plugins v0.8.5
 	github.com/containers/buildah v1.14.3
-	github.com/containers/common v0.5.0
+	github.com/containers/common v0.6.1
 	github.com/containers/conmon v2.0.10+incompatible
 	github.com/containers/image/v5 v5.2.1
 	github.com/containers/psgo v1.4.0

go.sum

@@ -77,6 +77,8 @@ github.com/containers/common v0.4.2 h1:O5d1gj/xdpQdZi0MEivRQ/7AeRaVeHdbSP/bvShw4
 github.com/containers/common v0.4.2/go.mod h1:m62kenckrWi5rZx32kaLje2Og0hpf6NsaTBn6+b+Oys=
 github.com/containers/common v0.5.0 h1:ZAef7h3oO46PcbTyfooZf8XLHrYad+GkhSu3EhH6P24=
 github.com/containers/common v0.5.0/go.mod h1:m62kenckrWi5rZx32kaLje2Og0hpf6NsaTBn6+b+Oys=
+github.com/containers/common v0.6.1 h1:z9VeVXYeOnNV99uNLp7zoE5KO1n0hqz1mdm5a6AiIrA=
+github.com/containers/common v0.6.1/go.mod h1:m62kenckrWi5rZx32kaLje2Og0hpf6NsaTBn6+b+Oys=
 github.com/containers/conmon v2.0.10+incompatible h1:EiwL41r5vx8SxG+dyUmbJ3baV9GUWjijPOdCkzM6gWU=
 github.com/containers/conmon v2.0.10+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/image/v5 v5.2.1 h1:rQR6QSUneWBoW1bTFpP9EJJTevQFv27YsKYQVJIzg+s=

vendor/github.com/containers/common/pkg/config/config.go

@@ -160,11 +160,6 @@ type ContainersConfig struct {
 	// ShmSize holds the size of /dev/shm.
 	ShmSize string `toml:"shm_size"`
 
-	// SignaturePolicyPath is the path to a signature policy to use for
-	// validating images. If left empty, the containers/image default signature
-	// policy will be used.
-	SignaturePolicyPath string `toml:"_"`
-
 	// UTSNS indicates how to create a UTS namespace for the container
 	UTSNS string `toml:"utsns"`
 
@@ -283,6 +278,11 @@ type EngineConfig struct {
 	// backwards compat with older version of libpod and Podman.
 	SetOptions
 
+	// SignaturePolicyPath is the path to a signature policy to use for
+	// validating images. If left empty, the containers/image default signature
+	// policy will be used.
+	SignaturePolicyPath string `toml:"_"`
+
 	// SDNotify tells container engine to allow containers to notify the host systemd of
 	// readiness using the SD_NOTIFY mechanism.
 	SDNotify bool
@@ -827,6 +827,9 @@ func isDirectory(path string) error {
 }
 
 func rootlessConfigPath() (string, error) {
+	if configHome := os.Getenv("XDG_CONFIG_HOME"); configHome != "" {
+		return filepath.Join(configHome, UserOverrideContainersConfig), nil
+	}
 	home, err := unshare.HomeDir()
 	if err != nil {
 		return "", err

vendor/github.com/containers/common/pkg/config/default.go

@@ -123,7 +123,6 @@ func DefaultConfig() (*Config, error) {
 		return nil, err
 	}
 
-	var signaturePolicyPath string
 	netns := "bridge"
 	if unshare.IsRootless() {
 		home, err := unshare.HomeDir()
@@ -132,7 +131,7 @@ func DefaultConfig() (*Config, error) {
 		}
 		sigPath := filepath.Join(home, DefaultRootlessSignaturePolicyPath)
 		if _, err := os.Stat(sigPath); err == nil {
-			signaturePolicyPath = sigPath
+			defaultEngineConfig.SignaturePolicyPath = sigPath
 		}
 		netns = "slirp4netns"
 	}
@@ -154,23 +153,22 @@ func DefaultConfig() (*Config, error) {
 			Env: []string{
 				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 			},
-			EnvHost:             false,
-			HTTPProxy:           false,
-			Init:                false,
-			InitPath:            "",
-			IPCNS:               "private",
-			LogDriver:           DefaultLogDriver,
-			LogSizeMax:          DefaultLogSizeMax,
-			NetNS:               netns,
-			NoHosts:             false,
-			PidsLimit:           DefaultPidsLimit,
-			PidNS:               "private",
-			SeccompProfile:      SeccompDefaultPath,
-			ShmSize:             DefaultShmSize,
-			SignaturePolicyPath: signaturePolicyPath,
-			UTSNS:               "private",
-			UserNS:              "private",
-			UserNSSize:          DefaultUserNSSize,
+			EnvHost:        false,
+			HTTPProxy:      false,
+			Init:           false,
+			InitPath:       "",
+			IPCNS:          "private",
+			LogDriver:      DefaultLogDriver,
+			LogSizeMax:     DefaultLogSizeMax,
+			NetNS:          netns,
+			NoHosts:        false,
+			PidsLimit:      DefaultPidsLimit,
+			PidNS:          "private",
+			SeccompProfile: SeccompDefaultPath,
+			ShmSize:        DefaultShmSize,
+			UTSNS:          "private",
+			UserNS:         "private",
+			UserNSSize:     DefaultUserNSSize,
 		},
 		Network: NetworkConfig{
 			DefaultNetwork:   "podman",

vendor/github.com/containers/common/pkg/config/default_linux.go

@@ -18,7 +18,7 @@ func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
 	if err := syscall.Statfs(cgroupRoot, &st); err != nil {
 		isUnified, isUnifiedErr = false, err
 	} else {
-		isUnified, isUnifiedErr = st.Type == unix.CGROUP2_SUPER_MAGIC, nil
+		isUnified, isUnifiedErr = int64(st.Type) == int64(unix.CGROUP2_SUPER_MAGIC), nil
 	}
 	return
 }

vendor/github.com/containers/common/pkg/config/libpodConfig.go

@@ -302,10 +302,9 @@ func rootlessLibpodConfigPath() (string, error) {
 
 func (c *Config) libpodConfig() *ConfigFromLibpod {
 	return &ConfigFromLibpod{
-		SignaturePolicyPath: c.Containers.SignaturePolicyPath,
-		InitPath:            c.Containers.InitPath,
-		MaxLogSize:          c.Containers.LogSizeMax,
-		EnableLabeling:      c.Containers.EnableLabeling,
+		InitPath:       c.Containers.InitPath,
+		MaxLogSize:     c.Containers.LogSizeMax,
+		EnableLabeling: c.Containers.EnableLabeling,
 
 		SetOptions:               c.Engine.SetOptions,
 		VolumePath:               c.Engine.VolumePath,
@@ -334,6 +333,7 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
 		DetachKeys:               c.Engine.DetachKeys,
 		SDNotify:                 c.Engine.SDNotify,
 		CgroupCheck:              c.Engine.CgroupCheck,
+		SignaturePolicyPath:      c.Engine.SignaturePolicyPath,
 
 		CNIConfigDir:      c.Network.NetworkConfigDir,
 		CNIPluginDir:      c.Network.CNIPluginDirs,
@@ -343,11 +343,11 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
 
 func (c *Config) libpodToContainersConfig(libpodConf *ConfigFromLibpod) {
 
-	c.Containers.SignaturePolicyPath = libpodConf.SignaturePolicyPath
 	c.Containers.InitPath = libpodConf.InitPath
 	c.Containers.LogSizeMax = libpodConf.MaxLogSize
 	c.Containers.EnableLabeling = libpodConf.EnableLabeling
 
+	c.Engine.SignaturePolicyPath = libpodConf.SignaturePolicyPath
 	c.Engine.SetOptions = libpodConf.SetOptions
 	c.Engine.VolumePath = libpodConf.VolumePath
 	c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport

vendor/modules.txt

@@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets
 github.com/containers/buildah/pkg/supplemented
 github.com/containers/buildah/pkg/umask
 github.com/containers/buildah/util
-# github.com/containers/common v0.5.0
+# github.com/containers/common v0.6.1
 github.com/containers/common/pkg/capabilities
 github.com/containers/common/pkg/config
 github.com/containers/common/pkg/unshare