mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-30 09:22:57 +02:00
podman: update to 4.0.2
This commit is contained in:
parent
19840e4f67
commit
61299a8c4e
2 changed files with 7 additions and 51 deletions
|
@ -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";
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Template file for 'podman'
|
# Template file for 'podman'
|
||||||
pkgname=podman
|
pkgname=podman
|
||||||
version=3.4.4
|
version=4.0.2
|
||||||
revision=1
|
revision=1
|
||||||
build_style=go
|
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_package="${go_import_path}/cmd/podman"
|
||||||
go_build_tags="seccomp apparmor containers_image_ostree_stub"
|
go_build_tags="seccomp apparmor containers_image_ostree_stub"
|
||||||
hostmakedepends="pkg-config go-md2man"
|
hostmakedepends="pkg-config go-md2man"
|
||||||
|
@ -15,15 +15,18 @@ license="Apache-2.0"
|
||||||
homepage="https://podman.io/"
|
homepage="https://podman.io/"
|
||||||
changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
|
changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
|
||||||
distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
|
distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
|
||||||
checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
|
checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
go_build_tags+=" containers_image_openpgp"
|
go_build_tags+=" containers_image_openpgp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
post_build() {
|
||||||
|
make docs
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
|
make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
|
||||||
make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
|
|
||||||
sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
|
sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
|
||||||
vendor/github.com/containers/common/pkg/config/containers.conf \
|
vendor/github.com/containers/common/pkg/config/containers.conf \
|
||||||
>containers.cgfs.conf
|
>containers.cgfs.conf
|
||||||
|
|
Loading…
Add table
Reference in a new issue