From: daniel-eys <daniel-eys@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] podman: update to 3.4.4.
Date: Sat, 11 Dec 2021 15:08:26 +0100 [thread overview]
Message-ID: <20211211140826.OWMxaf6pjJVFgP2jiAcbEVk1PVWahc3-1Z7hI97w1n0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34465@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by daniel-eys against master on the void-packages repository
https://github.com/daniel-eys/void-packages podman
https://github.com/void-linux/void-packages/pull/34465
[WIP] podman: update to 3.4.4.
<!-- 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/34465.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-podman-34465.patch --]
[-- Type: text/x-diff, Size: 3657 bytes --]
From 4af23d4d20660bc29e0da13df74842377b723ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
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 000000000000..2732d190233c
--- /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 <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 dd4b69d1ecb0..8558180f3a4b 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"
next prev parent reply other threads:[~2021-12-11 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 10:52 [PR PATCH] " daniel-eys
2021-12-10 11:16 ` daniel-eys
2021-12-10 11:20 ` [WIP] " daniel-eys
2021-12-10 19:08 ` ericonr
2021-12-11 14:08 ` daniel-eys [this message]
2021-12-11 14:13 ` daniel-eys
2021-12-16 23:19 ` daniel-eys
2021-12-16 23:19 ` [PR PATCH] [Closed]: " daniel-eys
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211211140826.OWMxaf6pjJVFgP2jiAcbEVk1PVWahc3-1Z7hI97w1n0@z \
--to=daniel-eys@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).