CVS commit: pkgsrc/sysutils/podman

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/podman
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Tue, 14 Feb 2023 00:33:13 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Feb 14 00:33:13 UTC 2023

Modified Files:
        pkgsrc/sysutils/podman: Makefile distinfo
        pkgsrc/sysutils/podman/patches: patch-Makefile
            patch-cmd_podman_registry_config.go patch-pkg_util_utils__netbsd.go
            patch-utils_utils__supported.go
            patch-vendor_github.com_containers_buildah_util_util__uint64.go
            patch-vendor_github.com_containers_buildah_util_util__unix.go
            patch-vendor_github.com_containers_common_pkg_config_config__darwin.go
            patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
            patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
            patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
            patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
            patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
            patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
            patch-vendor_github.com_moby_sys_mount_flags__bsd.go
Added Files:
        pkgsrc/sysutils/podman/patches: patch-cmd_podman_machine_init.go
            patch-pkg_machine_ignition__netbsd.go
            patch-pkg_machine_qemu_machine.go
            patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
            patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go
            patch-vendor_github.com_containers_common_pkg_util_util__supported.go
            patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
            patch-vendor_github.com_containers_storage_types_options__netbsd.go
Removed Files:
        pkgsrc/sysutils/podman/patches:
            patch-pkg_machine_qemu_options__darwin__arm64.go
            patch-vendor_github.com_containers_common_pkg_config_util__supported.go

Log Message:
podman: update to 4.4.1

Changelog too long and pertains mostly to Linux.
Importantly this update makes 9pfs volume mounts work on macOS
and we can start to work on getting the QEMU side to support
this on NetBSD.

Note: because 9pfs volume mounts are not yet supported on NetBSD,
I have patched this podman version to have a "none" volume driver
and to initialize the machine with "--volume-driver none" by default
instead of virtfs.

To get volumes on macOS with this package you therefore must pass
"--volume-driver virtfs" explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/podman/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/podman/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/podman/patches/patch-Makefile \
    pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go \
    pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go \
    pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_init.go \
    pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition__netbsd.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_util_util__supported.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_types_options__netbsd.go
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__darwin__arm64.go \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/podman/Makefile
diff -u pkgsrc/sysutils/podman/Makefile:1.5 pkgsrc/sysutils/podman/Makefile:1.6
--- pkgsrc/sysutils/podman/Makefile:1.5 Sun Nov  6 12:39:14 2022
+++ pkgsrc/sysutils/podman/Makefile     Tue Feb 14 00:33:12 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/11/06 12:39:14 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2023/02/14 00:33:12 tnn Exp $
 
-DISTNAME=      podman-3.4.4
-PKGREVISION=   1
+DISTNAME=      podman-4.4.1
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=containers/}
@@ -21,17 +20,17 @@ DEPENDS+=   qemu-[0-9]*:../../emulators/qe
 DEPENDS+=      gvproxy-[0-9]*:../../net/gvproxy
 
 SUBST_CLASSES+=                prefix
-SUBST_FILES.prefix+=   pkg/machine/qemu/options_darwin_arm64.go
 SUBST_FILES.prefix+=   vendor/github.com/containers/common/pkg/config/config_darwin.go
 SUBST_FILES.prefix+=   vendor/github.com/containers/common/pkg/config/config_netbsd.go
+SUBST_FILES.prefix+=   vendor/github.com/containers/storage/types/options_netbsd.go
 SUBST_STAGE.prefix=    pre-configure
 SUBST_MESSAGE.prefix=  fix PREFIX inside patch
-SUBST_VARS.prefix=     PREFIX
+SUBST_VARS.prefix=     PREFIX VARBASE
 
 CHECK_PORTABILITY_SKIP+=       vendor/github.com/containers/buildah/release.sh
 
 .if ${OPSYS} != "Linux"
-BUILD_TARGET=  podman-remote-${OPSYS:tl}
+BUILD_TARGET=  podman-remote
 
 INSTALLATION_DIRS+=    bin
 do-install:

Index: pkgsrc/sysutils/podman/distinfo
diff -u pkgsrc/sysutils/podman/distinfo:1.6 pkgsrc/sysutils/podman/distinfo:1.7
--- pkgsrc/sysutils/podman/distinfo:1.6 Sun Nov  6 12:39:14 2022
+++ pkgsrc/sysutils/podman/distinfo     Tue Feb 14 00:33:12 2023
@@ -1,24 +1,30 @@
-$NetBSD: distinfo,v 1.6 2022/11/06 12:39:14 tnn Exp $
+$NetBSD: distinfo,v 1.7 2023/02/14 00:33:12 tnn Exp $
 
-BLAKE2s (podman-3.4.4.tar.gz) = d9923d89d2c36269696e7e8a873cc789988b586121e53d9d8fcd32e156464501
-SHA512 (podman-3.4.4.tar.gz) = cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
-Size (podman-3.4.4.tar.gz) = 10945990 bytes
-SHA1 (patch-Makefile) = 5671f5452430d4b94af924defbb473eb91732281
-SHA1 (patch-cmd_podman_registry_config.go) = 6d32a7526cad5728a385de0029b2bbe5474e7f1b
-SHA1 (patch-pkg_machine_qemu_options__darwin__arm64.go) = fadd696fae75b58b45edd8bd02f42291675bd242
+BLAKE2s (podman-4.4.1.tar.gz) = 6ea927ab6855095064f5d915e407d424ca54a738d4d2a378b522d4eedef7ae37
+SHA512 (podman-4.4.1.tar.gz) = 33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c
+Size (podman-4.4.1.tar.gz) = 14396828 bytes
+SHA1 (patch-Makefile) = a5c09292ef911863db1c7f36d5cba1231f23ee92
+SHA1 (patch-cmd_podman_machine_init.go) = 840273e31e44b670ef5a5ce0f26fedbeb8ebdb34
+SHA1 (patch-cmd_podman_registry_config.go) = 80b0f940c59f0c0f258c2240bac30af6a0cb21dd
+SHA1 (patch-pkg_machine_ignition__netbsd.go) = f5b4640d77c6152aa51c0c0e68de47fded340869
+SHA1 (patch-pkg_machine_qemu_machine.go) = 8b0957edb19a70333b19db27a54b02cedf968696
 SHA1 (patch-pkg_machine_qemu_options__netbsd.go) = a256dcafceb70f29b4f7a1ed013b52b5d6b0f4ba
 SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 7f5e4fe206e6e1d8f8e2cd33c8ac18b614c2dd61
-SHA1 (patch-pkg_util_utils__netbsd.go) = 452c7ca070a945cbcc3e703105c1fe0a65eaedc7
-SHA1 (patch-utils_utils__supported.go) = 37c999dbf55ff98017d1a4d017d20d576e28d42d
-SHA1 (patch-vendor_github.com_containers_buildah_util_util__uint64.go) = 3e8b233c63224e5c2785760342bb42ec064a81a1
-SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = 2073a132dc3bf63436ff29bcd228d960ab3c90d0
-SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__darwin.go) = 72e34c210344d52c08eabd0ce34dc2fd4d7f8bea
-SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 0da82c8c514630fe6afed3041c51869915c3fda8
-SHA1 (patch-vendor_github.com_containers_common_pkg_config_util__supported.go) = 3e02f5ee7d0855d46d8318792f620e18f722d259
-SHA1 (patch-vendor_github.com_containers_storage_drivers_chroot__unix.go) = c2c625898c7651d24ba842a6654d57dd4a0e4428
-SHA1 (patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go) = c65adf43eca0ff10a289ae8f1fa09376164dc89e
-SHA1 (patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go) = afe76698c46e8ae015e7128958336a80016a53b7
-SHA1 (patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go) = 0d143dd2aaa21470bc31e260dc3413b2533208f9
+SHA1 (patch-pkg_util_utils__netbsd.go) = dcda52540148e5c77034322198a8ecedcd8c07e7
+SHA1 (patch-utils_utils__supported.go) = 44938037e4e0a4cd9468b2d37e480b78d404099b
+SHA1 (patch-vendor_github.com_containers_buildah_define_mount__unsupported.go) = 75d1a3dfce7806476f04d4a6d67a7858583838ee
+SHA1 (patch-vendor_github.com_containers_buildah_util_util__uint64.go) = a140e19d7c14439cc61d57acfb41bc601f2cf5a8
+SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = baf41542f16a9b73cd52a6162fb021a1259d73c6
+SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__darwin.go) = f675c6e8a2ba2ca03f0c6642296545ffdb08bc75
+SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 2b0dbfec397ce7765ccbb4d1d4e3b05ff487ed18
+SHA1 (patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go) = a8094d124711fb1da279b99ef98cf1c6f3c3f698
+SHA1 (patch-vendor_github.com_containers_common_pkg_util_util__supported.go) = 7794bb4baa78adedc08e6e2a9d75a37614eb4137
+SHA1 (patch-vendor_github.com_containers_storage_drivers_chroot__unix.go) = 7edf512a4a6c0e0c7cd67b195b53a2d86ac76b14
+SHA1 (patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go) = f93fc181d327d2d462068126abb1a17cce969ae9
+SHA1 (patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go) = a21e2a4053600702e9524a33472e1d8140cd926f
+SHA1 (patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go) = a3d871a486f14fcc14608ba7cebe499d73e60472
+SHA1 (patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go) = ddebc14995dadcfe7913c732abc07f5ab29aaa05
 SHA1 (patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go) = 37bae90c1b3d97f8b4166fca2c59d144c41f81f8
-SHA1 (patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go) = aaca8d584c5f98b7493e165726b304af0c5a341b
-SHA1 (patch-vendor_github.com_moby_sys_mount_flags__bsd.go) = 7261a1aee3334b7da676851851678a49a22559ae
+SHA1 (patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go) = 7acfc6076d0704557e2e1f2c2b7f3467eb2de629
+SHA1 (patch-vendor_github.com_containers_storage_types_options__netbsd.go) = 659586677c81addccde3a0d1e962e744a97a641c
+SHA1 (patch-vendor_github.com_moby_sys_mount_flags__bsd.go) = 07c72a4f943c3f0aa41683c3f49f6199aff04bce

Index: pkgsrc/sysutils/podman/patches/patch-Makefile
diff -u pkgsrc/sysutils/podman/patches/patch-Makefile:1.1 pkgsrc/sysutils/podman/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/podman/patches/patch-Makefile:1.1   Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-Makefile       Tue Feb 14 00:33:13 2023
@@ -1,30 +1,17 @@
-$NetBSD: patch-Makefile,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support
 
---- Makefile.orig      2021-08-30 19:15:26.000000000 +0000
+--- Makefile.orig      2023-02-08 19:03:18.000000000 +0000
 +++ Makefile
-@@ -160,6 +160,9 @@ SRCBINDIR := bin/windows
- else ifeq ($(GOOS),darwin)
+@@ -175,6 +175,10 @@ else ifeq ($(GOOS),darwin)
  BINSFX :=
  SRCBINDIR := bin/darwin
+ CGO_ENABLED := 0
 +else ifeq ($(GOOS),netbsd)
 +BINSFX :=
 +SRCBINDIR := bin/netbsd
++CGO_ENABLED := 0
  else
  BINSFX := -remote
  SRCBINDIR := bin
-@@ -351,6 +354,13 @@ podman-remote-windows: ## Build podman-r
-               GOOS=windows \
-               bin/windows/podman.exe
- 
-+.PHONY: podman-remote-netbsd
-+podman-remote-netbsd: ## Build podman-remote for NetBSD
-+      $(MAKE) \
-+              CGO_ENABLED=0 \
-+              GOOS=netbsd \
-+              bin/netbsd/podman
-+
- .PHONY: podman-remote-darwin
- podman-remote-darwin: ## Build podman-remote for macOS
-       $(MAKE) \
Index: pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go
diff -u pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go:1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go:1.1      Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go  Tue Feb 14 00:33:13 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-cmd_podman_registry_config.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-cmd_podman_registry_config.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support
 
---- cmd/podman/registry/config.go.orig 2021-08-30 19:15:26.000000000 +0000
+--- cmd/podman/registry/config.go.orig 2023-02-08 19:03:18.000000000 +0000
 +++ cmd/podman/registry/config.go
-@@ -54,7 +54,7 @@ func newPodmanConfig() {
+@@ -59,7 +59,7 @@ func newPodmanConfig() {
  
        var mode entities.EngineMode
        switch runtime.GOOS {
 -      case "darwin", "windows":
 +      case "darwin", "netbsd", "windows":
                mode = entities.TunnelMode
-       case "linux":
+       case "linux", "freebsd":
                // Some linux clients might only be compiled without ABI
Index: pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go
diff -u pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go:1.1 pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go:1.1  Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go      Tue Feb 14 00:33:13 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-pkg_util_utils__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-pkg_util_utils__netbsd.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support
 
@@ -12,5 +12,5 @@ Add netbsd support
 +)
 +
 +func GetContainerPidInformationDescriptors() ([]string, error) {
-+      return []string{}, errors.New("this function is not supported on darwin")
++      return []string{}, errors.New("this function is not supported on NetBSD")
 +}
Index: pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go
diff -u pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go:1.1 pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go:1.1  Sat Dec 18 18:11:48 2021
+++ pkgsrc/sysutils/podman/patches/patch-utils_utils__supported.go      Tue Feb 14 00:33:13 2023
@@ -1,12 +1,14 @@
-$NetBSD: patch-utils_utils__supported.go,v 1.1 2021/12/18 18:11:48 leot Exp $
+$NetBSD: patch-utils_utils__supported.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add NetBSD support
 
---- utils/utils_supported.go.orig      2021-09-30 18:44:31.000000000 +0000
+--- utils/utils_supported.go.orig      2023-02-08 19:03:18.000000000 +0000
 +++ utils/utils_supported.go
-@@ -1,4 +1,4 @@
--// +build linux darwin
-+// +build linux darwin netbsd
+@@ -1,5 +1,5 @@
+-//go:build linux || darwin || freebsd
+-// +build linux darwin freebsd
++//go:build linux || darwin || freebsd || netbsd
++// +build linux darwin freebsd netbsd
  
  package utils
  
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go:1.1  Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go      Tue Feb 14 00:33:13 2023
@@ -1,12 +1,14 @@
-$NetBSD: patch-vendor_github.com_containers_buildah_util_util__uint64.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_buildah_util_util__uint64.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support
 
---- vendor/github.com/containers/buildah/util/util_uint64.go.orig      2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/buildah/util/util_uint64.go.orig      2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/buildah/util/util_uint64.go
-@@ -1,4 +1,4 @@
--// +build linux,!mips,!mipsle,!mips64,!mips64le
-+// +build linux,!mips,!mipsle,!mips64,!mips64le netbsd
+@@ -1,5 +1,5 @@
+-//go:build (linux && !mips && !mipsle && !mips64 && !mips64le) || freebsd
+-// +build linux,!mips,!mipsle,!mips64,!mips64le freebsd
++//go:build (linux && !mips && !mipsle && !mips64 && !mips64le) || freebsd || netbsd
++// +build linux,!mips,!mipsle,!mips64,!mips64le freebsd netbsd
  
  package util
  
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go:1.1    Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go        Tue Feb 14 00:33:13 2023
@@ -1,12 +1,14 @@
-$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/containers/buildah/util/util_unix.go.orig        2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/buildah/util/util_unix.go.orig        2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/buildah/util/util_unix.go
-@@ -1,4 +1,4 @@
--// +build linux darwin
-+// +build !windows
+@@ -1,5 +1,5 @@
+-//go:build linux || darwin || freebsd
+-// +build linux darwin freebsd
++//go:build linux || darwin || freebsd || netbsd
++// +build linux darwin freebsd netbsd
  
  package util
  
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go:1.1   Sun Nov  6 12:39:15 2022
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go       Tue Feb 14 00:33:13 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__darwin.go,v 1.1 2022/11/06 12:39:15 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__darwin.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Adjust paths. Needed to find gvproxy.
 
---- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig       2021-12-08 18:41:11
+--- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig       2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/common/pkg/config/config_darwin.go
-@@ -17,6 +17,8 @@ var defaultHelperBinariesDir = []string{
+@@ -29,6 +29,8 @@ func ifRootlessConfigPath() (string, err
  }
  
  var defaultHelperBinariesDir = []string{
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go:1.1       Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go   Tue Feb 14 00:33:13 2023
@@ -1,11 +1,13 @@
-$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/containers/storage/drivers/chroot_unix.go.orig   2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/storage/drivers/chroot_unix.go.orig   2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/storage/drivers/chroot_unix.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build linux || darwin || freebsd || solaris
 -// +build linux darwin freebsd solaris
++//go:build linux || darwin || freebsd || solaris || netbsd
 +// +build !windows
  
  package graphdriver
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go:1.1      Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go  Tue Feb 14 00:33:13 2023
@@ -1,11 +1,13 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/containers/storage/pkg/directory/directory_unix.go.orig  2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/storage/pkg/directory/directory_unix.go.orig  2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/storage/pkg/directory/directory_unix.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build linux || darwin || freebsd || solaris
 -// +build linux darwin freebsd solaris
++//go:build linux || darwin || freebsd || solaris || netbsd
 +// +build !windows
  
  package directory
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go:1.1        Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go    Tue Feb 14 00:33:13 2023
@@ -1,11 +1,13 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/containers/storage/pkg/homedir/homedir_others.go.orig    2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/storage/pkg/homedir/homedir_others.go.orig    2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/storage/pkg/homedir/homedir_others.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build !linux && !darwin && !freebsd
 -// +build !linux,!darwin,!freebsd
++//go:build !linux && !darwin && !freebsd && !netbsd
 +// +build !linux,!darwin,!freebsd,!netbsd
  
  package homedir
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go:1.1        Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go    Tue Feb 14 00:33:13 2023
@@ -1,12 +1,25 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
+For some reason unix.SEEK_SET is not defined in the NetBSD runtime code.
+But SEEK_SET is 0 on every platform, so just use that for now.
 
---- vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go.orig    2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go.orig    2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build linux || solaris || darwin || freebsd
 -// +build linux solaris darwin freebsd
++//go:build linux || solaris || darwin || freebsd || netbsd
 +// +build linux solaris darwin freebsd netbsd
  
  package lockfile
  
+@@ -187,7 +187,7 @@ func createLockFileForPath(path string, 
+ func (l *LockFile) lock(lType int16) {
+       lk := unix.Flock_t{
+               Type:   lType,
+-              Whence: int16(unix.SEEK_SET),
++              Whence: int16(0),
+               Start:  0,
+               Len:    0,
+       }
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go:1.1 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go:1.1   Sat Dec 18 18:11:48 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go       Tue Feb 14 00:33:13 2023
@@ -1,11 +1,13 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go,v 1.1 2021/12/18 18:11:48 leot Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add NetBSD support.
 
---- vendor/github.com/containers/storage/pkg/system/syscall_unix.go.orig       2021-12-08 18:41:11.000000000 +0000
+--- vendor/github.com/containers/storage/pkg/system/syscall_unix.go.orig       2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/containers/storage/pkg/system/syscall_unix.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build linux || freebsd || darwin
 -// +build linux freebsd darwin
++//go:build linux || freebsd || darwin || netbsd
 +// +build linux freebsd darwin netbsd
  
  package system
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go:1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go:1.2
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go:1.1     Sat Sep  4 20:28:42 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go Tue Feb 14 00:33:13 2023
@@ -1,11 +1,13 @@
-$NetBSD: patch-vendor_github.com_moby_sys_mount_flags__bsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-vendor_github.com_moby_sys_mount_flags__bsd.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/moby/sys/mount/flags_bsd.go.orig 2021-08-30 19:15:26.000000000 +0000
+--- vendor/github.com/moby/sys/mount/flags_bsd.go.orig 2023-02-08 19:03:18.000000000 +0000
 +++ vendor/github.com/moby/sys/mount/flags_bsd.go
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
+-//go:build freebsd || openbsd
 -// +build freebsd openbsd
++//go:build freebsd || openbsd || netbsd
 +// +build freebsd openbsd netbsd
  
  package mount

Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
diff -u pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go:1.2 
pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go:1.3
--- pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go:1.2   Sat Dec 18 18:11:48 2021
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go       Tue Feb 14 00:33:13 2023
@@ -1,16 +1,28 @@
-$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go,v 1.2 2021/12/18 18:11:48 leot Exp $
+$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go,v 1.3 2023/02/14 00:33:13 tnn Exp $
 
 Add netbsd support (vendor code)
 
---- vendor/github.com/containers/common/pkg/config/config_netbsd.go.orig       2021-10-01 19:59:28.975404283 +0000
+--- vendor/github.com/containers/common/pkg/config/config_netbsd.go.orig       2023-02-13 22:47:42.194453410 +0000
 +++ vendor/github.com/containers/common/pkg/config/config_netbsd.go
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,34 @@
 +package config
 +
 +import (
 +      "os"
 +)
 +
++const (
++      // OverrideContainersConfig holds the default config path overridden by the root user
++      OverrideContainersConfig = "@PREFIX@/etc/" + _configPath
++
++      // DefaultContainersConfig holds the default containers config path
++      DefaultContainersConfig = "@PREFIX@/share/" + _configPath
++
++      // DefaultSignaturePolicyPath is the default value for the
++      // policy.json file.
++      DefaultSignaturePolicyPath = "@PREFIX@/etc/containers/policy.json"
++)
++
 +// podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.
 +func customConfigFile() (string, error) {
 +      if path, found := os.LookupEnv("CONTAINERS_CONF"); found {

Added files:

Index: pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_init.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_init.go:1.3
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_init.go     Tue Feb 14 00:33:13 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmd_podman_machine_init.go,v 1.3 2023/02/14 00:33:13 tnn Exp $
+
+Disable the virtfs volume driver by default.
+Doesn't work yet on NetBSD.
+
+--- cmd/podman/machine/init.go.orig    2023-02-08 19:03:18.000000000 +0000
++++ cmd/podman/machine/init.go
+@@ -101,7 +101,7 @@ func init() {
+       _ = initCmd.RegisterFlagCompletionFunc(VolumeFlagName, completion.AutocompleteDefault)
+ 
+       VolumeDriverFlagName := "volume-driver"
+-      flags.StringVar(&initOpts.VolumeDriver, VolumeDriverFlagName, "", "Optional volume driver")
++      flags.StringVar(&initOpts.VolumeDriver, VolumeDriverFlagName, "none", "Optional volume driver")
+       _ = initCmd.RegisterFlagCompletionFunc(VolumeDriverFlagName, completion.AutocompleteDefault)
+ 
+       IgnitionPathFlagName := "ignition-path"
Index: pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go:1.3
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go    Tue Feb 14 00:33:13 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-pkg_machine_qemu_machine.go,v 1.3 2023/02/14 00:33:13 tnn Exp $
+
+Disable the virtfs volume driver by default.
+Doesn't work yet on NetBSD.
+
+--- pkg/machine/qemu/machine.go.orig   2023-02-08 19:03:18.000000000 +0000
++++ pkg/machine/qemu/machine.go
+@@ -46,6 +46,7 @@ func GetVirtualizationProvider() machine
+ 
+ const (
+       VolumeTypeVirtfs     = "virtfs"
++      VolumeTypeNone       = "none"
+       MountType9p          = "9p"
+       dockerSock           = "/var/run/docker.sock"
+       dockerConnectTimeout = 5 * time.Second
+@@ -291,6 +292,8 @@ func (v *MachineVM) Init(opts machine.In
+       switch opts.VolumeDriver {
+       case "virtfs":
+               volumeType = VolumeTypeVirtfs
++      case "none":
++              volumeType = VolumeTypeNone
+       case "": // default driver
+               volumeType = VolumeTypeVirtfs
+       default:

Index: pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition__netbsd.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition__netbsd.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition__netbsd.go        Tue Feb 14 00:33:13 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-pkg_machine_ignition__netbsd.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+add netbsd support
+
+--- pkg/machine/ignition_netbsd.go.orig        2023-02-13 23:37:08.090532081 +0000
++++ pkg/machine/ignition_netbsd.go
+@@ -0,0 +1,17 @@
++//go:build netbsd
++// +build netbsd
++
++package machine
++
++import (
++      "os"
++      "strings"
++)
++
++func getLocalTimeZone() (string, error) {
++      tzPath, err := os.Readlink("/etc/localtime")
++      if err != nil {
++              return "", err
++      }
++      return strings.TrimPrefix(tzPath, "/usr/share/zoneinfo/"), nil
++}
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go      Tue Feb 14 00:33:13 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-vendor_github.com_containers_buildah_define_mount__unsupported.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+Add NetBSD support (vendor code)
+
+--- vendor/github.com/containers/buildah/define/mount_unsupported.go.orig      2023-02-08 19:03:18.000000000 +0000
++++ vendor/github.com/containers/buildah/define/mount_unsupported.go
+@@ -1,5 +1,5 @@
+-//go:build darwin || windows
+-// +build darwin windows
++//go:build darwin || windows || netbsd
++// +build darwin windows netbsd
+ 
+ package define
+ 
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go      Tue Feb 14 00:33:13 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-vendor_github.com_containers_common_pkg_config_default__netbsd.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+Disable the virtfs volume driver by default.
+Doesn't work yet on NetBSD.
+
+--- vendor/github.com/containers/common/pkg/config/default_netbsd.go.orig      2023-02-14 00:08:51.256531293 +0000
++++ vendor/github.com/containers/common/pkg/config/default_netbsd.go
+@@ -0,0 +1,20 @@
++package config
++
++func getDefaultCgroupsMode() string {
++      return "enabled"
++}
++
++func getDefaultLockType() string {
++      return "file"
++}
++
++func getLibpodTmpDir() string {
++      return "@VARBASE@/run/libpod"
++}
++
++// getDefaultMachineVolumes returns default mounted volumes (possibly with env vars, which will be expanded)
++func getDefaultMachineVolumes() []string {
++/* XXXTNN this doesn't work yet. Needs virtio-9p in QEMU */
++//    return []string{"$HOME:$HOME"}
++      return []string{}
++}
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_util_util__supported.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_util_util__supported.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_util_util__supported.go        Tue Feb 14 00:33:13 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-vendor_github.com_containers_common_pkg_util_util__supported.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+Add netbsd support (vendor code)
+
+--- vendor/github.com/containers/common/pkg/util/util_supported.go.orig        2023-02-08 19:03:18.000000000 +0000
++++ vendor/github.com/containers/common/pkg/util/util_supported.go
+@@ -1,5 +1,5 @@
+-//go:build linux || darwin || freebsd
+-// +build linux darwin freebsd
++//go:build linux || darwin || freebsd || netbsd
++// +build linux darwin freebsd netbsd
+ 
+ package util
+ 
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go       Tue Feb 14 00:33:13 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+Add NetBSD support (vendor code)
+
+--- vendor/github.com/containers/storage/pkg/archive/archive_bsd.go.orig       2023-02-08 19:03:18.000000000 +0000
++++ vendor/github.com/containers/storage/pkg/archive/archive_bsd.go
+@@ -1,5 +1,5 @@
+-//go:build freebsd || darwin
+-// +build freebsd darwin
++//go:build freebsd || darwin || netbsd
++// +build freebsd darwin netbsd
+ 
+ package archive
+ 
Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_types_options__netbsd.go
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_types_options__netbsd.go:1.1
--- /dev/null   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_types_options__netbsd.go  Tue Feb 14 00:33:13 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-vendor_github.com_containers_storage_types_options__netbsd.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+
+Add NetBSD support (vendor code)
+
+--- vendor/github.com/containers/storage/types/options_netbsd.go.orig  2023-02-13 23:02:15.105475801 +0000
++++ vendor/github.com/containers/storage/types/options_netbsd.go
+@@ -0,0 +1,14 @@
++package types
++
++const (
++      // these are default path for run and graph root for rootful users
++      // for rootless path is constructed via getRootlessStorageOpts
++      defaultRunRoot   string = "@VARBASE@/run/containers/storage"
++      defaultGraphRoot string = "@VARBASE@/db/containers/storage"
++      SystemConfigFile        = "@PREFIX@/share/containers/storage.conf"
++)
++
++// defaultConfigFile path to the system wide storage.conf file
++var (
++      defaultOverrideConfigFile = "@PREFIX@/etc/containers/storage.conf"
++)

Prev by Date: CVS commit: pkgsrc/net/gvproxy
Next by Date: CVS commit: pkgsrc/emulators/qemu
Previous by Thread: CVS commit: pkgsrc/net/gvproxy
Next by Thread: CVS commit: pkgsrc/emulators/qemu
Indexes:

Home | Main Index | Thread Index | Old Index