From 4af23d4d20660bc29e0da13df74842377b723ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 10 Dec 2021 11:44:48 +0100 Subject: [PATCH] podman: update to 3.4.4. --- .../rootless-declare-TEMP_FAILURE_RETRY.patch | 47 +++++++++++++++++++ srcpkgs/podman/template | 4 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/podman/patches/rootless-declare-TEMP_FAILURE_RETRY.patch diff --git a/srcpkgs/podman/patches/rootless-declare-TEMP_FAILURE_RETRY.patch b/srcpkgs/podman/patches/rootless-declare-TEMP_FAILURE_RETRY.patch new file mode 100644 index 00000000000000..2732d190233c6a --- /dev/null +++ b/srcpkgs/podman/patches/rootless-declare-TEMP_FAILURE_RETRY.patch @@ -0,0 +1,47 @@ +From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001 +From: Marc Nguyen +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 +--- + 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 + #include + ++#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 dd4b69d1ecb01c..8558180f3a4ba9 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=3.4.2 +version=3.4.4 revision=1 build_style=go go_import_path="github.com/containers/podman/v3" @@ -15,7 +15,7 @@ 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=b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31 +checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp"