* [PR PATCH] podman: update to 4.0.2
@ 2022-03-11 7:12 CameronNemo
2022-03-11 9:56 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: CameronNemo @ 2022-03-11 7:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]
There is a new pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages podman
https://github.com/void-linux/void-packages/pull/36090
podman: update to 4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36090.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-podman-36090.patch --]
[-- Type: text/x-diff, Size: 4044 bytes --]
From cd2c13f16a83c74c0be2af9c2c27db84a4e8daef Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:07:35 -0800
Subject: [PATCH] podman: update to 4.0.2
---
srcpkgs/podman/patches/musl.patch | 47 -------------------------------
srcpkgs/podman/template | 11 +++++---
2 files changed, 7 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/podman/patches/musl.patch
diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch
deleted file mode 100644
index 2732d190233c..000000000000
--- a/srcpkgs/podman/patches/musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001
-From: Marc Nguyen <nguyen_marc@live.fr>
-Date: Fri, 10 Dec 2021 03:07:20 +0100
-Subject: [PATCH] [NO NEW TESTS NEEDED] rootless: declare TEMP_FAILURE_RETRY
- before usage (Fixes: #12563)
-
-Signed-off-by: Nguyen Marc <nguyen_marc@live.fr>
----
- pkg/rootless/rootless_linux.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
-index e71d5d999fe..92f331ce493 100644
---- a/pkg/rootless/rootless_linux.c
-+++ b/pkg/rootless/rootless_linux.c
-@@ -19,6 +19,15 @@
- #include <sys/select.h>
- #include <stdio.h>
-
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
-+ __result; }))
-+#endif
-+
- #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
- #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
- #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
-@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha
- return rename (oldpath, newpath);
- }
-
--#ifndef TEMP_FAILURE_RETRY
--#define TEMP_FAILURE_RETRY(expression) \
-- (__extension__ \
-- ({ long int __result; \
-- do __result = (long int) (expression); \
-- while (__result == -1L && errno == EINTR); \
-- __result; }))
--#endif
--
- static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
- static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
-
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 8558180f3a4b..e83467c87f7c 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,9 +1,9 @@
# Template file for 'podman'
pkgname=podman
-version=3.4.4
+version=4.0.2
revision=1
build_style=go
-go_import_path="github.com/containers/podman/v3"
+go_import_path="github.com/containers/podman/v4"
go_package="${go_import_path}/cmd/podman"
go_build_tags="seccomp apparmor containers_image_ostree_stub"
hostmakedepends="pkg-config go-md2man"
@@ -15,15 +15,18 @@ license="Apache-2.0"
homepage="https://podman.io/"
changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
+checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
if [ "$CROSS_BUILD" ]; then
go_build_tags+=" containers_image_openpgp"
fi
+post_build() {
+ make docs
+}
+
post_install() {
make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
- make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
vendor/github.com/containers/common/pkg/config/containers.conf \
>containers.cgfs.conf
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: podman: update to 4.0.2
2022-03-11 7:12 [PR PATCH] podman: update to 4.0.2 CameronNemo
@ 2022-03-11 9:56 ` leahneukirchen
0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2022-03-11 9:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1035 bytes --]
There's a merged pull request on the void-packages repository
podman: update to 4.0.2
https://github.com/void-linux/void-packages/pull/36090
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-11 9:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-11 7:12 [PR PATCH] podman: update to 4.0.2 CameronNemo
2022-03-11 9:56 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).