From fd719025f54ccea67106d66bd8a0bc6a37c98af7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 16 Dec 2021 23:49:24 +0100 Subject: [PATCH] podman: fix musl. --- srcpkgs/podman/patches/musl.patch | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 srcpkgs/podman/patches/musl.patch diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch new file mode 100644 index 0000000000..2732d19023 --- /dev/null +++ b/srcpkgs/podman/patches/musl.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"; +