pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

podman: Import podman-3.4.0



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Oct 1 22:31:02 2021 +0200
Changeset:	642df522784c06073b72703c55f917de9f3f1618

Added Files:
	podman/DESCR
	podman/MESSAGE.NetBSD
	podman/Makefile
	podman/PLIST
	podman/TODO
	podman/distinfo
	podman/patches/patch-Makefile
	podman/patches/patch-cmd_podman_registry_config.go
	podman/patches/patch-pkg_machine_qemu_options__netbsd.go
	podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
	podman/patches/patch-pkg_util_utils__netbsd.go
	podman/patches/patch-utils_utils__supported.go
	podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go
	podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
	podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
	podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go
	podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
	podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
	podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
	podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
	podman/patches/patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go
	podman/patches/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go
	podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go

Log Message:
podman: Import podman-3.4.0

Podman (the POD MANager) is a tool for managing containers and
images, volumes mounted into those containers, and pods made from
groups of containers. Podman is based on libpod, a library for
container lifecycle management that is also contained in this
repository. The libpod library provides APIs for managing containers,
pods, container images, and volumes.

On operating systems other than Linux, it can spawn and talk to a
Linux virtual machine.

Based on sysutils/podman.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=642df522784c06073b72703c55f917de9f3f1618

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

diffstat:
 podman/DESCR                                       |  9 ++++++
 podman/MESSAGE.NetBSD                              |  6 ++++
 podman/Makefile                                    | 36 ++++++++++++++++++++++
 podman/PLIST                                       |  2 ++
 podman/TODO                                        |  4 +++
 podman/distinfo                                    | 23 ++++++++++++++
 podman/patches/patch-Makefile                      | 30 ++++++++++++++++++
 podman/patches/patch-cmd_podman_registry_config.go | 15 +++++++++
 .../patch-pkg_machine_qemu_options__netbsd.go      | 20 ++++++++++++
 ...atch-pkg_machine_qemu_options__netbsd__amd64.go | 27 ++++++++++++++++
 podman/patches/patch-pkg_util_utils__netbsd.go     | 16 ++++++++++
 podman/patches/patch-utils_utils__supported.go     | 10 ++++++
 ...hub.com_containers_buildah_util_util__uint64.go | 12 ++++++++
 ...ithub.com_containers_buildah_util_util__unix.go | 12 ++++++++
 ..._containers_common_pkg_config_config__netbsd.go | 29 +++++++++++++++++
 ...containers_common_pkg_config_util__supported.go | 12 ++++++++
 ....com_containers_storage_drivers_chroot__unix.go | 12 ++++++++
 ...ainers_storage_pkg_directory_directory__unix.go | 12 ++++++++
 ...ntainers_storage_pkg_homedir_homedir__others.go | 12 ++++++++
 ...ntainers_storage_pkg_lockfile_lockfile__unix.go | 12 ++++++++
 ...m_containers_storage_pkg_system_stat__netbsd.go | 20 ++++++++++++
 ...m_godbus_dbus_v5_transport__unixcred__netbsd.go | 22 +++++++++++++
 ...-vendor_github.com_moby_sys_mount_flags__bsd.go | 12 ++++++++
 23 files changed, 365 insertions(+)

diffs:
diff --git a/podman/DESCR b/podman/DESCR
new file mode 100644
index 0000000000..edb8bd6c67
--- /dev/null
+++ b/podman/DESCR
@@ -0,0 +1,9 @@
+Podman (the POD MANager) is a tool for managing containers and
+images, volumes mounted into those containers, and pods made from
+groups of containers. Podman is based on libpod, a library for
+container lifecycle management that is also contained in this
+repository. The libpod library provides APIs for managing containers,
+pods, container images, and volumes.
+
+On operating systems other than Linux, it can spawn and talk to a
+Linux virtual machine.
diff --git a/podman/MESSAGE.NetBSD b/podman/MESSAGE.NetBSD
new file mode 100644
index 0000000000..9311a94b07
--- /dev/null
+++ b/podman/MESSAGE.NetBSD
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+You will need to build a kernel with options HZ=1000, or edit the created
+VM to append "noapic" to the Grub command line.
+===========================================================================
diff --git a/podman/Makefile b/podman/Makefile
new file mode 100644
index 0000000000..35b96c1fe4
--- /dev/null
+++ b/podman/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.2 2021/09/04 21:14:15 leot Exp $
+
+DISTNAME=	podman-3.4.0
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=containers/}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/containers/podman/
+COMMENT=	Tool for managing OCI containers and pods
+LICENSE=	apache-2.0
+
+USE_TOOLS+=	gmake gsed
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../lang/go/version.mk"
+
+BUILD_DEPENDS+=	${GO_PACKAGE_DEP}
+DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
+DEPENDS+=	gvproxy-[0-9]*:../../net/gvproxy
+
+SUBST_CLASSES+=		gvproxy
+SUBST_FILES.gvproxy=	vendor/github.com/containers/common/pkg/config/config_netbsd.go
+SUBST_STAGE.gvproxy=	pre-configure
+SUBST_MESSAGE.gvproxy=	fix PREFIX inside patch
+SUBST_VARS.gvproxy=	PREFIX
+
+.if ${OPSYS} != "Linux"
+BUILD_TARGET=	podman-remote-${OPSYS:tl}
+
+INSTALLATION_DIRS+=	bin
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS:tl}/podman ${DESTDIR}${PREFIX}/bin/podman
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/podman/PLIST b/podman/PLIST
new file mode 100644
index 0000000000..8342aa0d52
--- /dev/null
+++ b/podman/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2021/09/04 20:28:42 maya Exp $
+bin/podman
diff --git a/podman/TODO b/podman/TODO
new file mode 100644
index 0000000000..aba43feba8
--- /dev/null
+++ b/podman/TODO
@@ -0,0 +1,4 @@
+- `podman machine init' does not seem to work - or at least do not create the
+  `.ign' file that can be overwritten/adjusted in order to be able to customize
+  kernel boot arguments.  Investigate it!
+- Document newly added patch
diff --git a/podman/distinfo b/podman/distinfo
new file mode 100644
index 0000000000..627b07cac6
--- /dev/null
+++ b/podman/distinfo
@@ -0,0 +1,23 @@
+$NetBSD: distinfo,v 1.2 2021/09/04 21:14:15 leot Exp $
+
+SHA1 (podman-3.4.0.tar.gz) = eb9c826de70b428b2630522f58d4e1239b68cf06
+RMD160 (podman-3.4.0.tar.gz) = c7b3146b6f0629d5d34754fb5d208e3df60ec0cf
+SHA512 (podman-3.4.0.tar.gz) = 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1
+Size (podman-3.4.0.tar.gz) = 10950594 bytes
+SHA1 (patch-Makefile) = 5671f5452430d4b94af924defbb473eb91732281
+SHA1 (patch-cmd_podman_registry_config.go) = 6d32a7526cad5728a385de0029b2bbe5474e7f1b
+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) = d234233ccf961446286362e9487bd58f1dbccfee
+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__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-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go) = 37bae90c1b3d97f8b4166fca2c59d144c41f81f8
+SHA1 (patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go) = ff256cc59025a279c613ad91d3d483cabfbbf8c8
+SHA1 (patch-vendor_github.com_moby_sys_mount_flags__bsd.go) = 7261a1aee3334b7da676851851678a49a22559ae
diff --git a/podman/patches/patch-Makefile b/podman/patches/patch-Makefile
new file mode 100644
index 0000000000..41fe65cb2a
--- /dev/null
+++ b/podman/patches/patch-Makefile
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support
+
+--- Makefile.orig	2021-08-30 19:15:26.000000000 +0000
++++ Makefile
+@@ -160,6 +160,9 @@ SRCBINDIR := bin/windows
+ else ifeq ($(GOOS),darwin)
+ BINSFX :=
+ SRCBINDIR := bin/darwin
++else ifeq ($(GOOS),netbsd)
++BINSFX :=
++SRCBINDIR := bin/netbsd
+ 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) \
diff --git a/podman/patches/patch-cmd_podman_registry_config.go b/podman/patches/patch-cmd_podman_registry_config.go
new file mode 100644
index 0000000000..1d4c48bad8
--- /dev/null
+++ b/podman/patches/patch-cmd_podman_registry_config.go
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmd_podman_registry_config.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support
+
+--- cmd/podman/registry/config.go.orig	2021-08-30 19:15:26.000000000 +0000
++++ cmd/podman/registry/config.go
+@@ -54,7 +54,7 @@ func newPodmanConfig() {
+ 
+ 	var mode entities.EngineMode
+ 	switch runtime.GOOS {
+-	case "darwin", "windows":
++	case "darwin", "netbsd", "windows":
+ 		mode = entities.TunnelMode
+ 	case "linux":
+ 		// Some linux clients might only be compiled without ABI
diff --git a/podman/patches/patch-pkg_machine_qemu_options__netbsd.go b/podman/patches/patch-pkg_machine_qemu_options__netbsd.go
new file mode 100644
index 0000000000..4991f32bfe
--- /dev/null
+++ b/podman/patches/patch-pkg_machine_qemu_options__netbsd.go
@@ -0,0 +1,20 @@
+$NetBSD: patch-pkg_machine_qemu_options__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support
+
+--- pkg/machine/qemu/options_netbsd.go.orig	2021-09-04 13:34:34.955121865 +0000
++++ pkg/machine/qemu/options_netbsd.go
+@@ -0,0 +1,13 @@
++package qemu
++
++import (
++	"os"
++)
++
++func getRuntimeDir() (string, error) {
++	tmpDir, ok := os.LookupEnv("TMPDIR")
++	if !ok {
++		tmpDir = "/tmp"
++	}
++	return tmpDir, nil
++}
diff --git a/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go b/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
new file mode 100644
index 0000000000..e0a5a62625
--- /dev/null
+++ b/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
@@ -0,0 +1,27 @@
+$NetBSD: patch-pkg_machine_qemu_options__netbsd__amd64.go,v 1.1 2021/09/04 20:28:42 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
+@@ -0,0 +1,20 @@
++package qemu
++
++var (
++	QemuCommand = "qemu-system-x86_64"
++)
++
++func (v *MachineVM) addArchOptions() []string {
++	opts := []string{
++		"-accel", "nvmm",
++	}
++	return opts
++}
++
++func (v *MachineVM) prepare() error {
++	return nil
++}
++
++func (v *MachineVM) archRemovalFiles() []string {
++	return []string{}
++}
diff --git a/podman/patches/patch-pkg_util_utils__netbsd.go b/podman/patches/patch-pkg_util_utils__netbsd.go
new file mode 100644
index 0000000000..d4336ef068
--- /dev/null
+++ b/podman/patches/patch-pkg_util_utils__netbsd.go
@@ -0,0 +1,16 @@
+$NetBSD: patch-pkg_util_utils__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support
+
+--- pkg/util/utils_netbsd.go.orig	2021-09-04 12:43:04.032001543 +0000
++++ pkg/util/utils_netbsd.go
+@@ -0,0 +1,9 @@
++package util
++
++import (
++	"github.com/pkg/errors"
++)
++
++func GetContainerPidInformationDescriptors() ([]string, error) {
++	return []string{}, errors.New("this function is not supported on darwin")
++}
diff --git a/podman/patches/patch-utils_utils__supported.go b/podman/patches/patch-utils_utils__supported.go
new file mode 100644
index 0000000000..1598d380aa
--- /dev/null
+++ b/podman/patches/patch-utils_utils__supported.go
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- utils/utils_supported.go.orig	2021-09-30 18:44:31.000000000 +0000
++++ utils/utils_supported.go
+@@ -1,4 +1,4 @@
+-// +build linux darwin
++// +build linux darwin netbsd
+ 
+ package utils
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go b/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go
new file mode 100644
index 0000000000..1b025ccef7
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_buildah_util_util__uint64.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build linux,!mips,!mipsle,!mips64,!mips64le
++// +build linux,!mips,!mipsle,!mips64,!mips64le netbsd
+ 
+ package util
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go b/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
new file mode 100644
index 0000000000..427fe38499
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build linux darwin
++// +build !windows
+ 
+ package util
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go b/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
new file mode 100644
index 0000000000..01362fd844
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
@@ -0,0 +1,29 @@
+$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -0,0 +1,22 @@
++package config
++
++import (
++	"os"
++)
++
++// 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 {
++		return path, nil
++	}
++	return rootlessConfigPath()
++}
++
++func ifRootlessConfigPath() (string, error) {
++	return rootlessConfigPath()
++}
++
++var defaultHelperBinariesDir = []string{
++	// pkgsrc paths
++	"@PREFIX@/bin",
++}
diff --git a/podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go b/podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go
new file mode 100644
index 0000000000..c8488f4fb3
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_common_pkg_config_util__supported.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support (vendor code)
+
+--- vendor/github.com/containers/common/pkg/config/util_supported.go.orig	2021-08-30 19:15:26.000000000 +0000
++++ vendor/github.com/containers/common/pkg/config/util_supported.go
+@@ -1,4 +1,4 @@
+-// +build linux darwin
++// +build linux darwin netbsd
+ 
+ package config
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go b/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
new file mode 100644
index 0000000000..646873973d
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build linux darwin freebsd solaris
++// +build !windows
+ 
+ package graphdriver
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
new file mode 100644
index 0000000000..045f6e85df
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build linux darwin freebsd solaris
++// +build !windows
+ 
+ package directory
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
new file mode 100644
index 0000000000..65470b839b
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build !linux,!darwin,!freebsd
++// +build !linux,!darwin,!freebsd,!netbsd
+ 
+ package homedir
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
new file mode 100644
index 0000000000..1b3bb0ad3b
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support (vendor code)
+
+--- 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
+@@ -1,4 +1,4 @@
+-// +build linux solaris darwin freebsd
++// +build linux solaris darwin freebsd netbsd
+ 
+ package lockfile
+ 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go
new file mode 100644
index 0000000000..fc605b9eb8
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go
@@ -0,0 +1,20 @@
+$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support (vendor code)
+
+--- vendor/github.com/containers/storage/pkg/system/stat_netbsd.go.orig	2021-09-04 12:43:05.852178601 +0000
++++ vendor/github.com/containers/storage/pkg/system/stat_netbsd.go
+@@ -0,0 +1,13 @@
++package system
++
++import "syscall"
++
++// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
++func fromStatT(s *syscall.Stat_t) (*StatT, error) {
++	return &StatT{size: s.Size,
++		mode: uint32(s.Mode),
++		uid:  s.Uid,
++		gid:  s.Gid,
++		rdev: uint64(s.Rdev),
++		mtim: s.Mtimespec}, nil
++}
diff --git a/podman/patches/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go b/podman/patches/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go
new file mode 100644
index 0000000000..8ec650e139
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go
@@ -0,0 +1,22 @@
+$NetBSD: patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
+
+Add netbsd support (vendor code)
+Taken from openbsd example.
+
+--- vendor/github.com/godbus/dbus/v5/transport_unixcred_netbsd.go.orig	2021-09-04 12:43:05.852290581 +0000
++++ vendor/github.com/godbus/dbus/v5/transport_unixcred_netbsd.go
+@@ -0,0 +1,14 @@
++package dbus
++
++import "io"
++
++func (t *unixTransport) SendNullByte() error {
++	n, _, err := t.UnixConn.WriteMsgUnix([]byte{0}, nil, nil)
++	if err != nil {
++		return err
++	}
++	if n != 1 {
++		return io.ErrShortWrite
++	}
++	return nil
++}
diff --git a/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go b/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
new file mode 100644
index 0000000000..743d24fc8e
--- /dev/null
+++ b/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_github.com_moby_sys_mount_flags__bsd.go,v 1.1 2021/09/04 20:28:42 maya 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
+@@ -1,4 +1,4 @@
+-// +build freebsd openbsd
++// +build freebsd openbsd netbsd
+ 
+ package mount
+ 


Home | Main Index | Thread Index | Old Index