diff --git a/packages/addons/addon-depends/podman/podman-bin/package.mk b/packages/addons/addon-depends/podman/podman-bin/package.mk index f24d5211bd..b2fd8c311a 100644 --- a/packages/addons/addon-depends/podman/podman-bin/package.mk +++ b/packages/addons/addon-depends/podman/podman-bin/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="podman-bin" -PKG_VERSION="5.2.2" -PKG_SHA256="571658f175d61724269c1a20626c1e39424af59b7bcf7ff94135d03b790bbecb" +PKG_VERSION="5.4.0" +PKG_SHA256="e5efb825558624d0539dac94847c39aafec68e6d4dd712435ff4ec1b17044b69" PKG_LICENSE="Apache-2.0" PKG_SITE="https://podman.io/" PKG_URL="https://github.com/containers/podman/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="Podman: A tool for managing OCI containers and pods." PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/containers/podman -export PKG_GIT_COMMIT="fcee48106a12dd531702d729d17f40f6e152027f" +export PKG_GIT_COMMIT="f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2" PKG_PODMAN_BUILDTAGS="exclude_graphdriver_devicemapper \ exclude_graphdriver_btrfs \ diff --git a/packages/addons/addon-depends/podman/podman-bin/patches/podman-0002-path-changes.patch b/packages/addons/addon-depends/podman/podman-bin/patches/podman-0002-path-changes.patch index 2ce0f274f0..bc6f9deb7f 100644 --- a/packages/addons/addon-depends/podman/podman-bin/patches/podman-0002-path-changes.patch +++ b/packages/addons/addon-depends/podman/podman-bin/patches/podman-0002-path-changes.patch @@ -1,6 +1,6 @@ diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go ---- a/pkg/api/handlers/libpod/swagger_spec.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/api/handlers/libpod/swagger_spec.go 2024-09-14 06:41:57.836922873 +0000 +--- a/pkg/api/handlers/libpod/swagger_spec.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/api/handlers/libpod/swagger_spec.go 2024-11-22 09:32:20.604644984 +0000 @@ -13,7 +13,7 @@ ) @@ -11,20 +11,20 @@ diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/sw func ServeSwagger(w http.ResponseWriter, r *http.Request) { path := DefaultPodmanSwaggerSpec diff -Nur a/pkg/machine/define/config.go b/pkg/machine/define/config.go ---- a/pkg/machine/define/config.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/machine/define/config.go 2024-09-14 06:41:57.863589758 +0000 -@@ -2,7 +2,7 @@ - +--- a/pkg/machine/define/config.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/machine/define/config.go 2024-11-22 09:32:20.631311705 +0000 +@@ -3,7 +3,7 @@ import "os" --const UserCertsTargetPath = "/etc/containers/certs.d" -+const UserCertsTargetPath = "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d" - const DefaultIdentityName = "machine" - - // MountTag is an identifier to mount a VirtioFS file system tag on a mount point in the VM. + const ( +- UserCertsTargetPath = "/etc/containers/certs.d" ++ UserCertsTargetPath = "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d" + DefaultIdentityName = "machine" + DefaultMachineName = "podman-machine-default" + ) diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go ---- a/pkg/machine/ignition/ignition.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/machine/ignition/ignition.go 2024-09-14 06:41:57.870256479 +0000 +--- a/pkg/machine/ignition/ignition.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/machine/ignition/ignition.go 2024-11-22 09:32:20.637978385 +0000 @@ -381,7 +381,7 @@ files = append(files, File{ Node: Node{ @@ -35,8 +35,8 @@ diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go }, FileEmbedded1: FileEmbedded1{ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go ---- a/pkg/machine/wsl/machine.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/machine/wsl/machine.go 2024-09-14 06:41:57.870256479 +0000 +--- a/pkg/machine/wsl/machine.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/machine/wsl/machine.go 2024-11-22 09:32:20.637978385 +0000 @@ -180,7 +180,7 @@ return fmt.Errorf("could not configure systemd settings for guest OS: %w", err) } @@ -65,8 +65,8 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go return fmt.Errorf("could not configure registries on guest OS: %w", err) } diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go ---- a/pkg/systemd/generate/containers_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/systemd/generate/containers_test.go 2024-09-14 06:41:57.843589594 +0000 +--- a/pkg/systemd/generate/containers_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/systemd/generate/containers_test.go 2024-11-22 09:32:20.611311664 +0000 @@ -1045,7 +1045,7 @@ StopTimeout: 22, PodmanVersion: "CI", @@ -383,8 +383,8 @@ diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/conta RestartSec: 15, }, diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go ---- a/pkg/systemd/generate/pods_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/systemd/generate/pods_test.go 2024-09-14 06:41:57.843589594 +0000 +--- a/pkg/systemd/generate/pods_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/systemd/generate/pods_test.go 2024-11-22 09:32:20.611311664 +0000 @@ -485,7 +485,7 @@ PIDFile: "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", StopTimeout: 42, @@ -521,11 +521,11 @@ diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.g RequiredServices: []string{"container-1", "container-2"}, CreateCommand: []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"}, diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go ---- a/pkg/systemd/quadlet/quadlet.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/systemd/quadlet/quadlet.go 2024-09-14 06:41:57.843589594 +0000 -@@ -21,9 +21,9 @@ - // but it is causing bloat - autoUpdateLabel = "io.containers.autoupdate" +--- a/pkg/systemd/quadlet/quadlet.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/systemd/quadlet/quadlet.go 2024-11-22 09:32:20.611311664 +0000 +@@ -23,9 +23,9 @@ + // Directory for temporary Quadlet files (sysadmin owned) + UnitDirTemp = "/run/containers/systemd" // Directory for global Quadlet files (sysadmin owned) - UnitDirAdmin = "/etc/containers/systemd" + UnitDirAdmin = "/storage/.kodi/addons/service.system.podman/etc/containers/systemd" @@ -536,8 +536,8 @@ diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go // Names of commonly used systemd/quadlet group names ContainerGroup = "Container" diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go ---- a/pkg/trust/registries.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/pkg/trust/registries.go 2024-09-14 06:41:57.860256397 +0000 +--- a/pkg/trust/registries.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/pkg/trust/registries.go 2024-11-22 09:32:20.627978364 +0000 @@ -29,7 +29,7 @@ } @@ -548,9 +548,9 @@ diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go // userRegistriesDir is the path to the per user registries.d. var userRegistriesDir = filepath.FromSlash(".config/containers/registries.d") diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go ---- a/test/e2e/common_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/common_test.go 2024-09-14 06:41:58.060258033 +0000 -@@ -284,7 +284,7 @@ +--- a/test/e2e/common_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/common_test.go 2024-11-22 09:32:20.821312090 +0000 +@@ -314,7 +314,7 @@ } networkBackend := Netavark @@ -560,8 +560,8 @@ diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go networkConfigDir = filepath.Join(root, "etc", "networks") } diff -Nur a/test/e2e/create_test.go b/test/e2e/create_test.go ---- a/test/e2e/create_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/create_test.go 2024-09-14 06:41:58.063591394 +0000 +--- a/test/e2e/create_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/create_test.go 2024-11-22 09:32:20.824645430 +0000 @@ -355,7 +355,7 @@ Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory")) } @@ -572,8 +572,8 @@ diff -Nur a/test/e2e/create_test.go b/test/e2e/create_test.go Expect(session).Should(ExitCleanly()) }) diff -Nur a/test/e2e/import_test.go b/test/e2e/import_test.go ---- a/test/e2e/import_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/import_test.go 2024-09-14 06:41:58.053591313 +0000 +--- a/test/e2e/import_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/import_test.go 2024-11-22 09:32:20.814645410 +0000 @@ -175,7 +175,7 @@ importImage.WaitWithDefaultTimeout() Expect(importImage).To(ExitWithError(125, "open /no/such/file: no such file or directory")) @@ -584,8 +584,8 @@ diff -Nur a/test/e2e/import_test.go b/test/e2e/import_test.go Expect(result).Should(ExitCleanly()) }) diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go ---- a/test/e2e/load_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/load_test.go 2024-09-14 06:41:58.053591313 +0000 +--- a/test/e2e/load_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/load_test.go 2024-11-22 09:32:20.814645410 +0000 @@ -85,7 +85,7 @@ rmi.WaitWithDefaultTimeout() Expect(rmi).Should(ExitCleanly()) @@ -596,9 +596,9 @@ diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go if IsRemote() { Expect(result).To(ExitWithError(125, "unknown flag: --signature-policy")) diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go ---- a/test/e2e/push_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/push_test.go 2024-09-14 06:41:58.056924672 +0000 -@@ -197,11 +197,11 @@ +--- a/test/e2e/push_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/push_test.go 2024-11-22 09:32:20.814645410 +0000 +@@ -198,11 +198,11 @@ // Ideally, this should set SystemContext.RegistriesDirPath, but Podman currently doesn’t // expose that as an option. So, for now, modify /etc/directly, and skip testing sigstore if // we don’t have permission to do so. @@ -612,7 +612,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go } else { defer func() { err := os.Remove(systemRegistriesDAddition) -@@ -267,16 +267,16 @@ +@@ -268,16 +268,16 @@ }) It("podman push to local registry with authorization", func() { @@ -632,7 +632,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go cwd, _ := os.Getwd() certPath := filepath.Join(cwd, "../", "certs") -@@ -315,7 +315,7 @@ +@@ -316,7 +316,7 @@ Expect(push).Should(Exit(0)) Expect(push.ErrorToString()).To(ContainSubstring("Writing manifest to image destination")) @@ -642,9 +642,9 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go push = podmanTest.Podman([]string{"push", "--creds=podmantest:wrongpasswd", ALPINE, "localhost:5004/credstest"}) diff -Nur a/test/e2e/run_test.go b/test/e2e/run_test.go ---- a/test/e2e/run_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/run_test.go 2024-09-14 06:41:58.053591313 +0000 -@@ -124,7 +124,7 @@ +--- a/test/e2e/run_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/run_test.go 2024-11-22 09:32:20.811312070 +0000 +@@ -125,7 +125,7 @@ } Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory")) @@ -654,8 +654,8 @@ diff -Nur a/test/e2e/run_test.go b/test/e2e/run_test.go Expect(session).Should(Exit(0)) Expect(session.ErrorToString()).To(ContainSubstring("Getting image source signatures")) diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go ---- a/test/e2e/save_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/save_test.go 2024-09-14 06:41:58.050257951 +0000 +--- a/test/e2e/save_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/save_test.go 2024-11-22 09:32:20.807978730 +0000 @@ -29,7 +29,7 @@ SkipIfRemote("--signature-policy N/A for remote") outfile := filepath.Join(podmanTest.TempDir, "alpine.tar") @@ -695,8 +695,8 @@ diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go pushedImage := fmt.Sprintf("localhost:%d/alpine", port) session = podmanTest.Podman([]string{"tag", ALPINE, pushedImage}) diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go ---- a/test/e2e/system_reset_test.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/test/e2e/system_reset_test.go 2024-09-14 06:41:58.050257951 +0000 +--- a/test/e2e/system_reset_test.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/test/e2e/system_reset_test.go 2024-11-22 09:32:20.807978730 +0000 @@ -45,7 +45,7 @@ Expect(session).Should(ExitCleanly()) @@ -707,8 +707,8 @@ diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go session = podmanTest.Podman([]string{"images", "-n"}) session.WaitWithDefaultTimeout() diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go ---- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-09-14 06:41:58.693596546 +0000 +--- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-11-22 09:32:21.437980016 +0000 @@ -4,7 +4,7 @@ // cniConfigDir is the directory where cni configuration is found cniConfigDir = "/usr/local/etc/cni/net.d/" @@ -719,8 +719,8 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_fre netavarkRunDir = "/var/run/containers/networks" ) diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go ---- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-09-14 06:41:58.693596546 +0000 +--- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-11-22 09:32:21.437980016 +0000 @@ -4,7 +4,7 @@ // cniConfigDir is the directory where cni configuration is found cniConfigDir = "/etc/cni/net.d/" @@ -731,8 +731,8 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_lin netavarkRunDir = "/run/containers/networks" ) diff -Nur a/vendor/github.com/containers/common/pkg/config/config_bsd.go b/vendor/github.com/containers/common/pkg/config/config_bsd.go ---- a/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-09-14 06:41:58.690263186 +0000 +--- a/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-11-22 09:32:21.434646676 +0000 @@ -11,7 +11,7 @@ // DefaultSignaturePolicyPath is the default value for the @@ -743,8 +743,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_bsd.go b/vendo var defaultHelperBinariesDir = []string{ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/github.com/containers/common/pkg/config/config_darwin.go ---- a/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-09-14 06:41:58.690263186 +0000 +--- a/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-11-22 09:32:21.434646676 +0000 @@ -9,7 +9,7 @@ // DefaultSignaturePolicyPath is the default value for the @@ -755,8 +755,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/ve var defaultHelperBinariesDir = []string{ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go ---- a/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-09-14 06:41:58.693596546 +0000 +--- a/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-11-22 09:32:21.434646676 +0000 @@ -13,7 +13,7 @@ // DefaultSignaturePolicyPath is the default value for the @@ -767,8 +767,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/ven func selinuxEnabled() bool { diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go ---- a/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-09-14 06:41:58.690263186 +0000 +--- a/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-11-22 09:32:21.434646676 +0000 @@ -12,7 +12,7 @@ // DefaultSignaturePolicyPath is the default value for the @@ -779,8 +779,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/v // Mount type for mounting host dir _typeBind = "bind" diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go ---- a/vendor/github.com/containers/common/pkg/config/default.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/config/default.go 2024-09-14 06:41:58.690263186 +0000 +--- a/vendor/github.com/containers/common/pkg/config/default.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/config/default.go 2024-11-22 09:32:21.434646676 +0000 @@ -23,7 +23,7 @@ const ( @@ -800,8 +800,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/g DefaultCdiSpecDirs = []string{"/etc/cdi"} // DefaultCapabilities is the default for the default_capabilities option in the containers.conf file. diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/github.com/containers/common/pkg/hooks/hooks.go ---- a/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-09-14 06:41:58.686929825 +0000 +--- a/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-11-22 09:32:21.431313336 +0000 @@ -20,10 +20,10 @@ const ( @@ -816,8 +816,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/gith // Manager provides an opaque interface for managing CRI-O hooks. diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/github.com/containers/common/pkg/machine/machine.go ---- a/vendor/github.com/containers/common/pkg/machine/machine.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/machine/machine.go 2024-09-14 06:41:58.693596546 +0000 +--- a/vendor/github.com/containers/common/pkg/machine/machine.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/machine/machine.go 2024-11-22 09:32:21.437980016 +0000 @@ -12,7 +12,7 @@ } @@ -828,9 +828,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/ Qemu = "qemu" AppleHV = "applehv" diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go ---- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-09-14 06:41:58.690263186 +0000 -@@ -19,10 +19,10 @@ +--- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-11-22 09:32:21.431313336 +0000 +@@ -20,10 +20,10 @@ var ( // DefaultMountsFile holds the default mount paths in the form // "host_path:container_path" @@ -844,8 +844,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions. // "host_path:container_path" overridden by the rootless user UserOverrideMountsFile = filepath.Join(os.Getenv("HOME"), ".config/containers/mounts.conf") diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/github.com/containers/image/v5/docker/registries_d.go ---- a/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-09-14 06:41:58.673596383 +0000 +--- a/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-11-22 09:32:21.417979975 +0000 @@ -35,7 +35,7 @@ var defaultUserDockerDir = filepath.FromSlash(".local/share/containers/sigstore") @@ -856,8 +856,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendo // registryConfiguration is one of the files in registriesDirPath configuring lookaside locations, or the result of merging them all. // NOTE: Keep this in sync with docs/registries.d.md! diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go ---- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-09-14 06:41:58.666929661 +0000 +--- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-11-22 09:32:21.411313295 +0000 @@ -17,7 +17,7 @@ // If the format changes in an incompatible way, increase the version number. blobInfoCacheFilename = "blob-info-cache-v1.sqlite" @@ -868,8 +868,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b // blobInfoCacheDir returns a path to a blob info cache appropriate for sys and euid. diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go ---- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-09-14 06:41:58.663596301 +0000 +--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-11-22 09:32:21.407979955 +0000 @@ -5,8 +5,8 @@ // builtinRegistriesConfPath is the path to the registry configuration file. @@ -882,8 +882,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_comm -const builtinRegistriesConfDirPath = "/etc/containers/registries.conf.d" +const builtinRegistriesConfDirPath = "/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d" diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go ---- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-09-14 06:41:58.663596301 +0000 +--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-11-22 09:32:21.407979955 +0000 @@ -5,8 +5,8 @@ // builtinRegistriesConfPath is the path to the registry configuration file. @@ -896,8 +896,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_free -const builtinRegistriesConfDirPath = "/usr/local/etc/containers/registries.conf.d" +const builtinRegistriesConfDirPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d" diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go ---- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-09-14 06:41:58.666929661 +0000 +--- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-11-22 09:32:21.411313295 +0000 @@ -5,4 +5,4 @@ // builtinDefaultPolicyPath is the policy path used for DefaultPolicy(). @@ -905,8 +905,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common. -const builtinDefaultPolicyPath = "/etc/containers/policy.json" +const builtinDefaultPolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json" diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go ---- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-09-14 06:41:58.666929661 +0000 +--- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-11-22 09:32:21.411313295 +0000 @@ -5,4 +5,4 @@ // builtinDefaultPolicyPath is the policy path used for DefaultPolicy(). @@ -914,8 +914,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd -const builtinDefaultPolicyPath = "/usr/local/etc/containers/policy.json" +const builtinDefaultPolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json" diff -Nur a/vendor/github.com/containers/storage/types/options_bsd.go b/vendor/github.com/containers/storage/types/options_bsd.go ---- a/vendor/github.com/containers/storage/types/options_bsd.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/storage/types/options_bsd.go 2024-09-14 06:41:58.643596138 +0000 +--- a/vendor/github.com/containers/storage/types/options_bsd.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/storage/types/options_bsd.go 2024-11-22 09:32:21.387979914 +0000 @@ -12,7 +12,7 @@ // defaultConfigFile path to the system wide storage.conf file @@ -926,8 +926,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_bsd.go b/vendor/g // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendor/github.com/containers/storage/types/options_darwin.go ---- a/vendor/github.com/containers/storage/types/options_darwin.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/storage/types/options_darwin.go 2024-09-14 06:41:58.643596138 +0000 +--- a/vendor/github.com/containers/storage/types/options_darwin.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/storage/types/options_darwin.go 2024-11-22 09:32:21.387979914 +0000 @@ -4,11 +4,11 @@ // these are default path for run and graph root for rootful users // for rootless path is constructed via getRootlessStorageOpts @@ -944,8 +944,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendo // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers func canUseRootlessOverlay() bool { diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor/github.com/containers/storage/types/options_linux.go ---- a/vendor/github.com/containers/storage/types/options_linux.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/storage/types/options_linux.go 2024-09-14 06:41:58.643596138 +0000 +--- a/vendor/github.com/containers/storage/types/options_linux.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/storage/types/options_linux.go 2024-11-22 09:32:21.387979914 +0000 @@ -12,13 +12,13 @@ // these are default path for run and graph root for rootful users // for rootless path is constructed via getRootlessStorageOpts @@ -964,8 +964,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vendor/github.com/containers/storage/types/options_windows.go ---- a/vendor/github.com/containers/storage/types/options_windows.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/containers/storage/types/options_windows.go 2024-09-14 06:41:58.643596138 +0000 +--- a/vendor/github.com/containers/storage/types/options_windows.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/containers/storage/types/options_windows.go 2024-11-22 09:32:21.387979914 +0000 @@ -4,13 +4,13 @@ // these are default path for run and graph root for rootful users // for rootless path is constructed via getRootlessStorageOpts @@ -984,8 +984,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vend // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers diff -Nur a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go ---- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-08-21 17:43:11.000000000 +0000 -+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-09-14 06:41:58.540261960 +0000 +--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-11-21 13:40:20.000000000 +0000 ++++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-11-22 09:32:21.287979709 +0000 @@ -23,7 +23,7 @@ const (