pkgsrc-WIP-changes archive

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

podman: reference some upstream PRs



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sat Jun 1 22:41:23 2024 -0400
Changeset:	647c0e0bac7fc16dcc73d3563ac59714144b9abe

Modified Files:
	podman/distinfo
	podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
	podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
	podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
	podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
	podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
	podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
	podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.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_syscall__unix.go

Log Message:
podman: reference some upstream PRs

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

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

diffstat:
 podman/distinfo                                    | 22 +++++++++++-----------
 ...m_containers_buildah_copier_hardlink__uint64.go |  3 +++
 ...com_containers_buildah_copier_hardlink__unix.go |  3 +++
 ...containers_buildah_define_mount__unsupported.go |  2 ++
 ...ithub.com_containers_buildah_util_util__unix.go |  1 +
 ...ners_common_pkg_password_password__supported.go |  3 +++
 ....com_containers_storage_drivers_chroot__unix.go |  1 +
 ..._containers_storage_pkg_archive_archive__bsd.go |  1 +
 ...ainers_storage_pkg_directory_directory__unix.go |  1 +
 ...ntainers_storage_pkg_homedir_homedir__others.go |  3 +++
 ...ntainers_storage_pkg_lockfile_lockfile__unix.go |  4 +++-
 ..._containers_storage_pkg_system_syscall__unix.go |  1 +
 12 files changed, 33 insertions(+), 12 deletions(-)

diffs:
diff --git a/podman/distinfo b/podman/distinfo
index d4316822cf..d4fc2e5e4f 100644
--- a/podman/distinfo
+++ b/podman/distinfo
@@ -12,15 +12,15 @@ SHA1 (patch-pkg_machine_qemu_options__netbsd__arm64.go) = 1273821aaa1b1fcfa45c16
 SHA1 (patch-pkg_machine_qemu_stubber.go) = 8060e5e323a7b0115bb7b0812ae03489c2282175
 SHA1 (patch-pkg_machine_vmconfigs_config__common.go) = 3e25fe9b6cce69c67ceed809837ae4e650e2b9a8
 SHA1 (patch-pkg_util_utils__netbsd.go) = dcda52540148e5c77034322198a8ecedcd8c07e7
-SHA1 (patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go) = 81317fae0c5596960d3b17b7a1724734e3f100ca
-SHA1 (patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go) = 54f1ecacf342c1f61a6a5e63294057add3016e66
-SHA1 (patch-vendor_github.com_containers_buildah_define_mount__unsupported.go) = 75d1a3dfce7806476f04d4a6d67a7858583838ee
-SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = baf41542f16a9b73cd52a6162fb021a1259d73c6
-SHA1 (patch-vendor_github.com_containers_common_pkg_password_password__supported.go) = 2110467de202a02e428f71761b2261e578744c81
-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) = 0b8ce4bf45e11dabf97282a755d6f8e692fffb29
-SHA1 (patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go) = d8e194149118d62fce9b50183356854b7c10678f
+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_pkg_system_syscall__unix.go) = 162211df8010d326bab8c098dfc3938a5dd4a88e
diff --git a/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go b/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
index f2640b7742..7b96d4a5ed 100644
--- a/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
+++ b/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__uint64.go
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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 @@
diff --git a/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go b/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
index 867fe162ed..2c23c7512a 100644
--- a/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
+++ b/podman/patches/patch-vendor_github.com_containers_buildah_copier_hardlink__unix.go
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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 @@
diff --git a/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go b/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
index 1a2fcf6b2d..a32eaa1211 100644
--- a/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
+++ b/podman/patches/patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
@@ -2,6 +2,8 @@ $NetBSD: patch-vendor_github.com_containers_buildah_define_mount__unsupported.go
 
 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/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
index f29208abd0..29bd5f1159 100644
--- 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
@@ -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 $
 
 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/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go b/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
index 4e6480f51a..18494c1f49 100644
--- a/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
+++ b/podman/patches/patch-vendor_github.com_containers_common_pkg_password_password__supported.go
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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 @@
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
index a6738ef77a..32f40fd03e 100644
--- 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
@@ -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 $
 
 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/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
index 830f99ab5c..35a781e5e5 100644
--- a/podman/patches/patch-vendor_github.com_containers_storage_pkg_archive_archive__bsd.go
+++ b/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 $
 
 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/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
index 015c084507..77a544d8b1 100644
--- 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
@@ -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 $
 
 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/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
index ff75bc6e48..e4fef7be19 100644
--- 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
@@ -1,5 +1,8 @@
 $NetBSD$
 
+NetBSD support
+https://github.com/containers/storage/pull/1935
+
 --- 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 @@
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
index 029bfeb12c..2f973ebca1 100644
--- 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
@@ -1,6 +1,8 @@
 $NetBSD$
 
-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.
 
diff --git a/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go b/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
index 6fb8190e3f..540fbae3dc 100644
--- a/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_syscall__unix.go
+++ b/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 $
 
 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


Home | Main Index | Thread Index | Old Index