Accepting request 857815 from Virtualization:containers
- Update to containerd v1.3.9, which is needed for Docker v19.03.14-ce and fixes CVE-2020-15257. bsc#1178969 bsc#1180243 OBS-URL: https://build.opensuse.org/request/show/857815 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=37
This commit is contained in:
commit
095aa391e3
@ -12,12 +12,12 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 35021fd3b491..2fcee039d1a1 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -50,8 +50,8 @@ else
|
||||
endif
|
||||
Index: containerd-1.3.7_8fba4e9a7d01/Makefile
|
||||
===================================================================
|
||||
--- containerd-1.3.7_8fba4e9a7d01.orig/Makefile
|
||||
+++ containerd-1.3.7_8fba4e9a7d01/Makefile
|
||||
@@ -60,8 +60,8 @@ else
|
||||
DEBUG_TAGS := static_build
|
||||
endif
|
||||
|
||||
-WHALE = "🇩"
|
||||
@ -27,6 +27,3 @@ index 35021fd3b491..2fcee039d1a1 100644
|
||||
|
||||
RELEASE=containerd-$(VERSION:v%=%).${GOOS}-${GOARCH}
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
4
_service
4
_service
@ -3,8 +3,8 @@
|
||||
<param name="url">https://github.com/containerd/containerd.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">containerd</param>
|
||||
<param name="versionformat">1.2.13_%h</param>
|
||||
<param name="revision">v1.2.13</param>
|
||||
<param name="versionformat">1.3.9_%h</param>
|
||||
<param name="revision">v1.3.9</param>
|
||||
<param name="exclude">.git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:03f2e22d304ba27b4857c72b2f8f94b30fb1089d07d94cd31fd7b49785ef0a0c
|
||||
size 2757388
|
3
containerd-1.3.9_ea765aba0d05.tar.xz
Normal file
3
containerd-1.3.9_ea765aba0d05.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e401bedfeeaa467649781cb07b202b32b80e731aa6f5d4229e7c8315f9283fdc
|
||||
size 3150524
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 21 06:53:15 UTC 2020 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
- Update to containerd v1.3.9, which is needed for Docker v19.03.14-ce and
|
||||
fixes CVE-2020-15257. bsc#1178969 bsc#1180243
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 18 08:16:20 UTC 2020 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
- Update to containerd v1.3.7, which is required for Docker 19.03.13-ce.
|
||||
boo#1176708
|
||||
- Refresh patches:
|
||||
* 0001-makefile-remove-emoji.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 25 22:32:08 UTC 2020 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
|
@ -34,11 +34,11 @@
|
||||
%endif
|
||||
|
||||
# MANUAL: Update the git_version.
|
||||
%define git_version 7ad184331fa3e55e52b890ea95e65ba581ae3429
|
||||
%define git_short 7ad184331fa3
|
||||
%define git_version ea765aba0d05254012b0b9e595e995c09186427f
|
||||
%define git_short ea765aba0d05
|
||||
|
||||
Name: %{realname}%{name_suffix}
|
||||
Version: 1.2.13
|
||||
Version: 1.3.9
|
||||
Release: 0
|
||||
Summary: Standalone OCI Container Daemon
|
||||
License: Apache-2.0
|
||||
@ -127,7 +127,8 @@ make -C $PROJECT \
|
||||
BUILDTAGS="$BUILDTAGS" \
|
||||
VERSION="v%{version}" \
|
||||
REVISION="%{git_version}"
|
||||
make man
|
||||
# TODO: Fix man-page generation.
|
||||
#make man
|
||||
|
||||
cp $PROJECT/bin/ctr ctr-%{version}
|
||||
cp $PROJECT/bin/containerd containerd-%{version}
|
||||
@ -157,12 +158,13 @@ install -d -m755 %{buildroot}/%{_sysconfdir}/%{realname}
|
||||
echo "# See containerd-config.toml(5) for documentation." >%{buildroot}/%{_sysconfdir}/%{realname}/config.toml
|
||||
|
||||
# Man pages.
|
||||
for file in man/*
|
||||
do
|
||||
section="${file##*.}"
|
||||
install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
|
||||
done
|
||||
ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
|
||||
# TODO: Fix man page generation.
|
||||
#for file in man/*
|
||||
#do
|
||||
# section="${file##*.}"
|
||||
# install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
|
||||
#done
|
||||
#ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
|
||||
|
||||
%fdupes %{buildroot}
|
||||
|
||||
@ -176,11 +178,13 @@ ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
|
||||
%{_sbindir}/docker-%{realname}
|
||||
%{_sbindir}/%{realname}-shim
|
||||
%{_sbindir}/docker-%{realname}-shim
|
||||
%{_mandir}/man*/%{realname}*
|
||||
%exclude %{_mandir}/man1/*ctr.1*
|
||||
# TODO: Fix man page generation.
|
||||
#%{_mandir}/man*/%{realname}*
|
||||
#%exclude %{_mandir}/man1/*ctr.1*
|
||||
|
||||
%files ctr
|
||||
%{_sbindir}/%{realname}-ctr
|
||||
%{_mandir}/man1/*ctr.1*
|
||||
# TODO: Fix man page generation.
|
||||
#%{_mandir}/man1/*ctr.1*
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user