diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 746f79644c61..1d949f506876 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2024/06/01 14:03:03 bsiegert Exp $
+# $NetBSD: Makefile,v 1.20 2024/06/03 02:07:44 maya Exp $
 
-DISTNAME=	podman-4.4.1
+DISTNAME=	podman-5.0.3
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-PKGREVISION=	11
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=containers/}
 
@@ -20,14 +19,20 @@ TOOL_DEPENDS+=	${GO_PACKAGE_DEP}
 DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
 DEPENDS+=	gvproxy-[0-9]*:../../net/gvproxy
 
+post-extract:
+	${CP}	${FILESDIR}/options_netbsd.go	${WRKSRC}/vendor/github.com/containers/storage/types/
+	${CP}	${FILESDIR}/config_netbsd.go	${WRKSRC}/vendor/github.com/containers/common/pkg/config/
+	${CP}	${FILESDIR}/default_netbsd.go	${WRKSRC}/vendor/github.com/containers/common/pkg/config/
+	${CP}	${FILESDIR}/ignition_netbsd.go	${WRKSRC}/pkg/machine/ignition/
+	${MV}	${WRKSRC}/pkg/machine/env/dir_freebsd.go	${WRKSRC}/pkg/machine/env/dir_bsd.go
+
 SUBST_CLASSES+=		prefix
-SUBST_FILES.prefix+=	pkg/machine/qemu/options_netbsd_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/default_netbsd.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 VARBASE
+SUBST_VARS.prefix=	PREFIX VARBASE PKG_SYSCONFDIR
 
 CHECK_PORTABILITY_SKIP+=	vendor/github.com/containers/buildah/release.sh
 
@@ -36,7 +41,7 @@ BUILD_TARGET=	podman-remote
 
 INSTALLATION_DIRS+=	bin
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS:tl}/podman ${DESTDIR}${PREFIX}/bin/podman
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/podman-remote ${DESTDIR}${PREFIX}/bin/podman
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
index 717b2cec2206..bcbe21ee8ed3 100644
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,31 +1,26 @@
-$NetBSD: distinfo,v 1.9 2023/02/20 15:35:46 tnn Exp $
+$NetBSD: distinfo,v 1.10 2024/06/03 02:07:44 maya Exp $
 
-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) = a0323aacb2176f2df4c0e21ad3dfff1479c91db3
-SHA1 (patch-cmd_podman_machine_init.go) = 840273e31e44b670ef5a5ce0f26fedbeb8ebdb34
+BLAKE2s (podman-5.0.3.tar.gz) = 7afdfd82acc64c7308fbc92294dbcea42d12a92f082dda12d8579195827cfb53
+SHA512 (podman-5.0.3.tar.gz) = c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
+Size (podman-5.0.3.tar.gz) = 23814179 bytes
 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_machine.go) = c2ca6388e0517c5485ff532fd7027326ba017edc
 SHA1 (patch-pkg_machine_qemu_options__netbsd.go) = a256dcafceb70f29b4f7a1ed013b52b5d6b0f4ba
-SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 7f5e4fe206e6e1d8f8e2cd33c8ac18b614c2dd61
-SHA1 (patch-pkg_machine_qemu_options__netbsd__arm64.go) = 0aa8256147bf0b984e27625ab21368ed4652dca7
+SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 012b2416bb6dceb81450a53d9a7bc771fcb6a1e4
+SHA1 (patch-pkg_machine_qemu_options__netbsd__arm64.go) = 9c6eda411418b48c2a19cd9c91732f6a0ba5ee80
+SHA1 (patch-pkg_machine_qemu_stubber.go) = 072661b2a3e91ba158d17a0823e5c6f79ccc966c
+SHA1 (patch-pkg_machine_vmconfigs_config__common.go) = 3e25fe9b6cce69c67ceed809837ae4e650e2b9a8
 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_buildah_copier_hardlink__uint64.go) = e254553c4eb5de26bc8be28b3b2e50b86b450ae8
+SHA1 (patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go) = 9b8a9aad973bcb003d87fe17e24e3aa54cd7a069
+SHA1 (patch-vendor_github.com_containers_buildah_define_mount__unsupported.go) = 50cc9672af8566804112483871059e8547cf1916
+SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = 3d279e562b2834677229a93d6c772eef468a74d8
+SHA1 (patch-vendor_github.com_containers_common_pkg_password_password__supported.go) = e559e2daf86ce6656593b60f2aa2721a1307848f
+SHA1 (patch-vendor_github.com_containers_storage_drivers_chroot__unix.go) = abccf4df16b3c83a8628cf9b7a4eccf5882d0596
+SHA1 (patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go) = add3cbd5eadd79680fdb19b45481539839e8dd2d
+SHA1 (patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go) = 212c3f7b45c802f7a0d353810abbdc84f132f6e7
+SHA1 (patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go) = eb065adb395876addd415ead04cfc280fe3138c4
+SHA1 (patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go) = fb2be3086beedb26609f71d3afbed5d629f2a0af
 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) = 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
+SHA1 (patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go) = 162211df8010d326bab8c098dfc3938a5dd4a88e
diff --git a/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go b/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
index eba8021dc0bb..472fdce07602 100644
--- a/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
+++ b/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
@@ -1,24 +1,12 @@
-$NetBSD: patch-pkg_machine_qemu_machine.go,v 1.3 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-pkg_machine_qemu_machine.go,v 1.4 2024/06/03 02:07:44 maya Exp $
 
-Disable the virtfs volume driver by default.
-Doesn't work yet on NetBSD.
+Add NetBSD support
 
---- pkg/machine/qemu/machine.go.orig	2023-02-08 19:03:18.000000000 +0000
+--- pkg/machine/qemu/machine.go.orig	2024-05-29 00:08:32.713658134 +0000
 +++ pkg/machine/qemu/machine.go
-@@ -46,6 +46,7 @@ func GetVirtualizationProvider() machine
+@@ -1,4 +1,4 @@
+-//go:build linux || freebsd
++//go:build linux || freebsd || netbsd
+ 
+ package qemu
  
- 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:
diff --git a/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go b/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
index e0a5a626252f..0f759a55a4cb 100644
--- a/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
+++ b/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
@@ -1,27 +1,19 @@
-$NetBSD: patch-pkg_machine_qemu_options__netbsd__amd64.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+$NetBSD: patch-pkg_machine_qemu_options__netbsd__amd64.go,v 1.2 2024/06/03 02:07:44 maya Exp $
 
 Add netbsd/amd64 support - uses nvmm
 
---- pkg/machine/qemu/options_netbsd_amd64.go.orig	2021-09-04 12:43:04.031906656 +0000
+--- pkg/machine/qemu/options_netbsd_amd64.go.orig	2024-05-28 23:58:18.698452676 +0000
 +++ pkg/machine/qemu/options_netbsd_amd64.go
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,12 @@
 +package qemu
 +
 +var (
 +	QemuCommand = "qemu-system-x86_64"
 +)
 +
-+func (v *MachineVM) addArchOptions() []string {
++func (v *QEMUStubber) addArchOptions(_ *setNewMachineCMDOpts) []string {
 +	opts := []string{
 +		"-accel", "nvmm",
 +	}
 +	return opts
 +}
-+
-+func (v *MachineVM) prepare() error {
-+	return nil
-+}
-+
-+func (v *MachineVM) archRemovalFiles() []string {
-+	return []string{}
-+}
diff --git a/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__arm64.go b/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__arm64.go
index 0613cd73f2df..ef23a3c97c06 100644
--- a/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__arm64.go
+++ b/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__arm64.go
@@ -1,8 +1,8 @@
-$NetBSD: patch-pkg_machine_qemu_options__netbsd__arm64.go,v 1.1 2023/02/20 15:35:46 tnn Exp $
+$NetBSD: patch-pkg_machine_qemu_options__netbsd__arm64.go,v 1.2 2024/06/03 02:07:44 maya Exp $
 
 NetBSD support.
 
---- pkg/machine/qemu/options_netbsd_arm64.go.orig	2023-02-20 15:25:44.049225824 +0000
+--- pkg/machine/qemu/options_netbsd_arm64.go.orig	2024-05-28 23:58:18.721596493 +0000
 +++ pkg/machine/qemu/options_netbsd_arm64.go
 @@ -0,0 +1,50 @@
 +package qemu
@@ -17,7 +17,7 @@ NetBSD support.
 +	QemuCommand = "qemu-system-aarch64"
 +)
 +
-+func (v *MachineVM) addArchOptions() []string {
++func (v *QEMUStubber) addArchOptions(_ *setNewMachineCMDOpts) []string {
 +	ovmfDir := getOvmfDir(v.ImagePath.GetPath(), v.Name)
 +	opts := []string{
 +		"-accel", "tcg",
@@ -28,13 +28,13 @@ NetBSD support.
 +	return opts
 +}
 +
-+func (v *MachineVM) prepare() error {
++func (v *QEMUStubber) prepare() error {
 +	ovmfDir := getOvmfDir(v.ImagePath.GetPath(), v.Name)
 +	cmd := []string{"/bin/dd", "if=/dev/zero", "conv=sync", "bs=1m", "count=64", "of=" + ovmfDir}
 +	return exec.Command(cmd[0], cmd[1:]...).Run()
 +}
 +
-+func (v *MachineVM) archRemovalFiles() []string {
++func (v *QEMUStubber) archRemovalFiles() []string {
 +	ovmDir := getOvmfDir(v.ImagePath.GetPath(), v.Name)
 +	return []string{ovmDir}
 +}
diff --git a/sysutils/podman/patches/patch-pkg_machine_qemu_stubber.go b/sysutils/podman/patches/patch-pkg_machine_qemu_stubber.go
new file mode 100644
index 000000000000..d4ba6d090516
--- /dev/null
+++ b/sysutils/podman/patches/patch-pkg_machine_qemu_stubber.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-pkg_machine_qemu_stubber.go,v 1.1 2024/06/03 02:07:44 maya Exp $
+
+Add NetBSD support
+
+--- pkg/machine/qemu/stubber.go.orig	2024-05-29 00:07:05.307241824 +0000
++++ pkg/machine/qemu/stubber.go
+@@ -1,4 +1,4 @@
+-//go:build linux || freebsd
++//go:build linux || freebsd || netbsd
+ 
+ package qemu
+ 
diff --git a/sysutils/podman/patches/patch-pkg_machine_vmconfigs_config__common.go b/sysutils/podman/patches/patch-pkg_machine_vmconfigs_config__common.go
new file mode 100644
index 000000000000..dfe46c3cc427
--- /dev/null
+++ b/sysutils/podman/patches/patch-pkg_machine_vmconfigs_config__common.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-pkg_machine_vmconfigs_config__common.go,v 1.1 2024/06/03 02:07:44 maya Exp $
+
+--- pkg/machine/vmconfigs/config_common.go.orig	2024-05-29 00:05:33.264766331 +0000
++++ pkg/machine/vmconfigs/config_common.go
+@@ -1,4 +1,4 @@
+-//go:build linux || freebsd
++//go:build linux || freebsd || netbsd
+ 
+ package vmconfigs
+ 
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
new file mode 100644
index 000000000000..a78bda599a16
--- /dev/null
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go,v 1.1 2024/06/03 02:07:44 maya Exp $
+
+NetBSD support
+https://github.com/containers/buildah/pull/5559
+
+--- vendor/github.com/containers/buildah/copier/hardlink_uint64.go.orig	2024-05-28 23:57:05.911122335 +0000
++++ vendor/github.com/containers/buildah/copier/hardlink_uint64.go
+@@ -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 copier
+ 
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
new file mode 100644
index 000000000000..0355b19140d1
--- /dev/null
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go,v 1.1 2024/06/03 02:07:44 maya Exp $
+
+NetBSD support
+https://github.com/containers/buildah/pull/5559
+
+--- vendor/github.com/containers/buildah/copier/hardlink_unix.go.orig	2024-05-28 22:30:37.796669657 +0000
++++ vendor/github.com/containers/buildah/copier/hardlink_unix.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 copier
+ 
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
index 1a2fcf6b2d17..13f57d429f22 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
@@ -1,7 +1,9 @@
-$NetBSD: patch-vendor_github.com_containers_buildah_define_mount__unsupported.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_buildah_define_mount__unsupported.go,v 1.2 2024/06/03 02:07:44 maya Exp $
 
 Add NetBSD support (vendor code)
 
+https://github.com/containers/buildah/pull/5559
+
 --- 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 @@
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
index f29208abd0c8..165986ba8e0d 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
 Add netbsd support (vendor code)
+https://github.com/containers/buildah/pull/5559
 
 --- 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
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go b/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
new file mode 100644
index 000000000000..950a48b9fbca
--- /dev/null
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
@@ -0,0 +1,13 @@
+$NetBSD: patch-vendor_github.com_containers_common_pkg_password_password__supported.go,v 1.1 2024/06/03 02:07:44 maya Exp $
+
+NetBSD support
+https://github.com/containers/common/pull/2035
+
+--- vendor/github.com/containers/common/pkg/password/password_supported.go.orig	2024-05-28 22:06:36.037026351 +0000
++++ vendor/github.com/containers/common/pkg/password/password_supported.go
+@@ -1,4 +1,4 @@
+-//go:build linux || darwin || freebsd
++//go:build linux || darwin || freebsd || netbsd
+ 
+ package password
+ 
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
index a6738ef77ab1..c8c171526623 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
 Add netbsd support (vendor code)
+https://github.com/containers/storage/pull/1935
 
 --- 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
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
index 830f99ab5c41..8c7932f51277 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go,v 1.1 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go,v 1.2 2024/06/03 02:07:44 maya Exp $
 
 Add NetBSD support (vendor code)
+https://github.com/containers/storage/pull/1935
 
 --- 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
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
index 015c084507ce..47695474e6e5 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
 Add netbsd support (vendor code)
+https://github.com/containers/storage/pull/1935
 
 --- 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
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
index 168ad78372f6..ea563594db00 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
@@ -1,14 +1,15 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
-Add netbsd support (vendor code)
+NetBSD support
+https://github.com/containers/storage/pull/1935
 
---- 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.orig	2024-05-28 22:08:53.504670587 +0000
 +++ vendor/github.com/containers/storage/pkg/homedir/homedir_others.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
+-//go:build !linux && !darwin && !freebsd && !windows
+-// +build !linux,!darwin,!freebsd,!windows
++//go:build !linux && !darwin && !freebsd && !netbsd && !windows
++// +build !linux,!darwin,!freebsd,!netbsd,!windows
  
  package homedir
  
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
index 1b3a7c8d1782..98c2e166ad0d 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
@@ -1,10 +1,12 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
-Add netbsd support (vendor code)
+Add netbsd support (vendor code) - https://github.com/containers/storage/pull/1935
+
+NOT UPSTREAMED:
 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	2023-02-08 19:03:18.000000000 +0000
+--- vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go.orig	2024-05-10 15:37:14.000000000 +0000
 +++ vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go
 @@ -1,5 +1,5 @@
 -//go:build linux || solaris || darwin || freebsd
@@ -14,10 +16,10 @@ But SEEK_SET is 0 on every platform, so just use that for now.
  
  package lockfile
  
-@@ -187,7 +187,7 @@ func createLockFileForPath(path string, 
- func (l *LockFile) lock(lType int16) {
+@@ -81,7 +81,7 @@ func lockHandle(fd fileHandle, lType loc
+ 	}
  	lk := unix.Flock_t{
- 		Type:   lType,
+ 		Type:   int16(fType),
 -		Whence: int16(unix.SEEK_SET),
 +		Whence: int16(0),
  		Start:  0,
diff --git a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
index 6fb8190e3fa9..fdbe56594b82 100644
--- a/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
+++ b/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go,v 1.3 2024/06/03 02:07:44 maya Exp $
 
 Add NetBSD support.
+https://github.com/containers/storage/pull/1935
 
 --- 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