From d3b234748d0a60772c8630bcb87a6fc53b9f35ad Mon Sep 17 00:00:00 2001 From: chenmaodong Date: Sat, 16 Apr 2022 02:12:55 +0000 Subject: [PATCH] sync patch from openeuler-22.03-LTS. The patch solve a directory permission problem and it originally came from https://github.com/containers/podman/pull/2088/commits/4d31065cc50537d4dbc17c57a747204b9343d0e2. --- 0004-create-directories-with-0755-mode.patch | 25 ++++++++++++++++++++ podman.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0004-create-directories-with-0755-mode.patch diff --git a/0004-create-directories-with-0755-mode.patch b/0004-create-directories-with-0755-mode.patch new file mode 100644 index 0000000..87fd946 --- /dev/null +++ b/0004-create-directories-with-0755-mode.patch @@ -0,0 +1,25 @@ +From 473f8f74668bf216f1279186226d221644596bcc Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 28 Mar 2022 19:39:21 +0800 +Subject: [PATCH] create directories with 0755 mode + +--- + cmd/podman/main.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cmd/podman/main.go b/cmd/podman/main.go +index d4c8454..b2e245a 100644 +--- a/cmd/podman/main.go ++++ b/cmd/podman/main.go +@@ -156,6 +156,9 @@ func main() { + logrus.Info("running as rootless") + } + ++ //Be sure we can create directories with 0755 mode. ++ syscall.Umask(0022) ++ + if logLevel == "debug" { + debug = true + +-- +2.27.0 diff --git a/podman.spec b/podman.spec index 80d5e49..11c7c11 100644 --- a/podman.spec +++ b/podman.spec @@ -1,6 +1,6 @@ Name: podman Version: 0.10.1 -Release: 8 +Release: 9 Summary: A daemonless container engine for managing Containers Epoch: 1 License: ASL 2.0 @@ -117,6 +117,7 @@ Patch4: CVE-2021-20188-PRE3.patch Patch5: CVE-2021-20188.patch Patch6: 0002-Fix-the-invalid-memory-address-reference.patch Patch7: 0003-eat-signal-23-in-signal-proxy.patch +Patch8: 0004-create-directories-with-0755-mode.patch %description Podman manages the entire container ecosystem which includes pods, @@ -224,6 +225,9 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf %{_mandir}/man5/*.5* %changelog +* Sat Apr 16 2022 chenmaodong - 1:0.10.1-9 +- Set umask to 022 ensure create directories with 0755 mode + * Thu May 6 2021 lingsheng - 1:0.10.1-8 - Change BuildRequires to golang -- Gitee