Accepting request 1169540 from home:VaiTon:branches:Virtualization:containers
- Use obs_scm service instead of tar_scm - Removed patch as it was merged upstream <https://github.com/containerd/containerd/pull/9571> - Update to containerd v1.7.15. Upstream release notes: <https://github.com/containerd/containerd/releases/tag/v1.7.15> - Update to containerd v1.7.14. Upstream release notes: <https://github.com/containerd/containerd/releases/tag/v1.7.14> - Update to containerd v1.7.13. Upstream release notes: <https://github.com/containerd/containerd/releases/tag/v1.7.13> - Update to containerd v1.7.12. Upstream release notes: <https://github.com/containerd/containerd/releases/tag/v1.7.12> - Update to containerd v1.7.11. Upstream release notes: <https://github.com/containerd/containerd/releases/tag/v1.7.11> OBS-URL: https://build.opensuse.org/request/show/1169540 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=172
This commit is contained in:
Git OBS Bridge
parent
9d391853bb
commit
0230368b5f
@ -1,75 +0,0 @@
|
||||
From 260963a354d972201ffe9a6ce882f1c0e9b319d9 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Jindrak <dzejrou@gmail.com>
|
||||
Date: Sat, 23 Dec 2023 21:41:54 +0100
|
||||
Subject: [PATCH 1/2] shim: Create pid-file with 0644 permissions
|
||||
|
||||
Fixes ae7021300
|
||||
|
||||
In ae7021300 the WritePidFile and WriteAddress functions were
|
||||
changed to use AtomicFile instead of os.CreateFile. However,
|
||||
AtomicFile creates a temporary file and then changes its permissions
|
||||
with os.Chmod which alters the previously observed behavior of
|
||||
os.CreateFile which takes the system's umask into account.
|
||||
|
||||
This means that on Linux-based systems these files suddenly
|
||||
became world writable (#9363). The address file has since been
|
||||
removed, but pid-file was still created as world writable. This
|
||||
commit explicitly requests 0644 permissions as even on systems
|
||||
without default umask of 0022 there is no reason to have these
|
||||
two files world writable.
|
||||
|
||||
Signed-off-by: Jaroslav Jindrak <dzejrou@gmail.com>
|
||||
(cherry picked from commit 9d328410a5c7bab106fe81cd37a36e4534ce9205)
|
||||
Signed-off-by: Jaroslav Jindrak <dzejrou@gmail.com>
|
||||
---
|
||||
runtime/v2/shim/util.go | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
|
||||
index fce1318a63ad..3740d87dbf8a 100644
|
||||
--- a/runtime/v2/shim/util.go
|
||||
+++ b/runtime/v2/shim/util.go
|
||||
@@ -126,7 +126,7 @@ func WritePidFile(path string, pid int) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
- f, err := atomicfile.New(path, 0o666)
|
||||
+ f, err := atomicfile.New(path, 0o644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
From 8d82242eb525f87b91bbc2c2499559855dd363cf Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Jindrak <dzejrou@gmail.com>
|
||||
Date: Sat, 23 Dec 2023 21:46:12 +0100
|
||||
Subject: [PATCH 2/2] shim: Create address file with 0644 permissions
|
||||
|
||||
Fixes ae70213
|
||||
|
||||
In ae70213 the WritePidFile and WriteAddress functions were
|
||||
changed to use AtomicFile instead of os.CreateFile. However,
|
||||
AtomicFile creates a temporary file and then changes its permissions
|
||||
with os.Chmod which alters the previously observed behavior of
|
||||
os.CreateFile which takes the system's umask into account.
|
||||
|
||||
This means that on Linux-based systems these files suddenly
|
||||
became world writable (#9363).
|
||||
|
||||
Signed-off-by: Jaroslav Jindrak <dzejrou@gmail.com>
|
||||
---
|
||||
runtime/v2/shim/util.go | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
|
||||
index 3740d87dbf8a..e8cfeec077c5 100644
|
||||
--- a/runtime/v2/shim/util.go
|
||||
+++ b/runtime/v2/shim/util.go
|
||||
@@ -144,7 +144,7 @@ func WriteAddress(path, address string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
- f, err := atomicfile.New(path, 0o666)
|
||||
+ f, err := atomicfile.New(path, 0o644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
11
_service
11
_service
@ -1,14 +1,17 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="manual">
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="url">https://github.com/containerd/containerd.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">containerd</param>
|
||||
<param name="versionformat">1.7.10_%h</param>
|
||||
<param name="revision">v1.7.10</param>
|
||||
<param name="versionformat">1.7.15_%h</param>
|
||||
<param name="revision">v1.7.15</param>
|
||||
<param name="exclude">.git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="manual">
|
||||
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
|
||||
</services>
|
||||
|
||||
BIN
containerd-1.7.10_4e1fe7492b9d.tar.xz
(Stored with Git LFS)
BIN
containerd-1.7.10_4e1fe7492b9d.tar.xz
(Stored with Git LFS)
Binary file not shown.
3
containerd-1.7.15_926c9586.obscpio
Normal file
3
containerd-1.7.15_926c9586.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e754984125ba0bcca511ad458e79b8dc941ee18bdfa9ce8f1e3ec25505e9f194
|
||||
size 50414093
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 21 15:57:05 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
|
||||
|
||||
- Use obs_scm service instead of tar_scm
|
||||
|
||||
- Removed patch as it was merged upstream
|
||||
<https://github.com/containerd/containerd/pull/9571>
|
||||
|
||||
- Update to containerd v1.7.15. Upstream release notes:
|
||||
<https://github.com/containerd/containerd/releases/tag/v1.7.15>
|
||||
|
||||
- Update to containerd v1.7.14. Upstream release notes:
|
||||
<https://github.com/containerd/containerd/releases/tag/v1.7.14>
|
||||
|
||||
- Update to containerd v1.7.13. Upstream release notes:
|
||||
<https://github.com/containerd/containerd/releases/tag/v1.7.13>
|
||||
|
||||
- Update to containerd v1.7.12. Upstream release notes:
|
||||
<https://github.com/containerd/containerd/releases/tag/v1.7.12>
|
||||
|
||||
- Update to containerd v1.7.11. Upstream release notes:
|
||||
<https://github.com/containerd/containerd/releases/tag/v1.7.11>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 11:04:13 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
4
containerd.obsinfo
Normal file
4
containerd.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
name: containerd
|
||||
version: 1.7.15_926c9586
|
||||
mtime: 1712336502
|
||||
commit: 926c9586fe4a6236699318391cd44976a98e31f1
|
||||
@ -23,14 +23,14 @@
|
||||
%endif
|
||||
|
||||
# MANUAL: Update the git_version.
|
||||
%define git_version 4e1fe7492b9df85914c389d1f15a3ceedbb280ac
|
||||
%define git_short 4e1fe7492b9d
|
||||
%define git_version 926c9586fe4a6236699318391cd44976a98e31f1
|
||||
%define git_short 926c9586
|
||||
|
||||
%global provider_prefix github.com/containerd/containerd
|
||||
%global import_path %{provider_prefix}
|
||||
|
||||
Name: containerd
|
||||
Version: 1.7.10
|
||||
Version: 1.7.15
|
||||
Release: 0
|
||||
Summary: Standalone OCI Container Daemon
|
||||
License: Apache-2.0
|
||||
@ -41,8 +41,6 @@ Source1: %{name}-rpmlintrc
|
||||
Source2: %{name}.service
|
||||
# UPSTREAM: Revert <https://github.com/containerd/containerd/pull/7933> to fix build on SLE-12.
|
||||
Patch1: 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
|
||||
# https://github.com/containerd/containerd/pull/9571
|
||||
Patch2: 0002-shim-Create-pid-file-with-0644-permissions.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: go >= 1.19
|
||||
@ -102,7 +100,6 @@ reference the following Go import paths: github.com/containerd/containerd
|
||||
%if 0%{?sle_version} == 120000
|
||||
%patch -P 1 -p1
|
||||
%endif
|
||||
%patch -P 2 -p1
|
||||
|
||||
%build
|
||||
%goprep %{import_path}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user