commit containerd for openSUSE:Factory

2024-09-12 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-09-12 16:54:01

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.17570 (New)


Package is "containerd"

Thu Sep 12 16:54:01 2024 rev:70 rq:1200080 version:1.7.22

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-09-06 
17:18:21.839440126 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.17570/containerd.changes 
2024-09-12 16:54:06.291231009 +0200
@@ -1,0 +2,9 @@
+Wed Sep 11 08:58:49 UTC 2024 - Aleksa Sarai 
+
+- Update to containerd v1.7.22. Upstream release notes:
+  
+- Bump minimum Go version to 1.22.
+- Rebase patches:
+  * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
+---

Old:

  containerd-1.7.21_472731909fa3.tar.xz

New:

  containerd-1.7.22_7f7fdf5fed64.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.g1IeYw/_old  2024-09-12 16:54:07.919298843 +0200
+++ /var/tmp/diff_new_pack.g1IeYw/_new  2024-09-12 16:54:07.931299342 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 472731909fa34bd7bc9c087e4c27943f9835f111
-%define git_short   472731909fa3
+%define git_version 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c
+%define git_short   7f7fdf5fed64
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.21
+Version:1.7.22
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -43,7 +43,7 @@
 Patch1: 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
-BuildRequires:  go >= 1.19
+BuildRequires:  go >= 1.22
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
 BuildRequires:  libbtrfs-devel >= 3.8

++ 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch ++
--- /var/tmp/diff_new_pack.g1IeYw/_old  2024-09-12 16:54:08.159308842 +0200
+++ /var/tmp/diff_new_pack.g1IeYw/_new  2024-09-12 16:54:08.191310176 +0200
@@ -1,4 +1,4 @@
-From 876958fd21984b77e0a70d6ac5763e757ca976ef Mon Sep 17 00:00:00 2001
+From 0d0424334da85c9192a29a4e108094f7c28bbab5 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai 
 Date: Wed, 22 May 2024 12:58:32 -0700
 Subject: [PATCH] BUILD: SLE12: revert "btrfs: depend on kernel UAPI instead of

++ _service ++
--- /var/tmp/diff_new_pack.g1IeYw/_old  2024-09-12 16:54:08.371317676 +0200
+++ /var/tmp/diff_new_pack.g1IeYw/_new  2024-09-12 16:54:08.407319176 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.21_%h
-v1.7.21
+1.7.22_%h
+v1.7.22
 .git
   
   

++ containerd-1.7.21_472731909fa3.tar.xz -> 
containerd-1.7.22_7f7fdf5fed64.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.7.21_472731909fa3/.github/actions/install-go/action.yml 
new/containerd-1.7.22_7f7fdf5fed64/.github/actions/install-go/action.yml
--- old/containerd-1.7.21_472731909fa3/.github/actions/install-go/action.yml
2024-08-27 00:04:19.0 +0200
+++ new/containerd-1.7.22_7f7fdf5fed64/.github/actions/install-go/action.yml
2024-09-09 22:09:31.0 +0200
@@ -3,7 +3,7 @@
 inputs:
   go-version:
 required: true
-default: "1.22.6"
+default: "1.22.7"
 description: "Go version to install"
 
 runs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.7.21_472731909fa3/.github/workflows/api-release.yml 
new/containerd-1.7.22_7f7fdf5fed64/.github/workflows/api-release.yml
--- old/containerd-1.7.21_472731909fa3/.github/workflows/api-release.yml
2024-08-27 00:04:19.0 +0200
+++ new/containerd-1.7.22_7f7fdf5fed64/.github/workflows/api-release.yml
2024-09-09 22:09:31.0 +0200
@@ -6,7 +6,7 @@
 name: API Release
 
 env:
-  GO_VERSION: "1.22.6"
+  GO_VERSION: "1.22.7"
 
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.7.21_472731909fa3/.github/workflows/ci.yml 
new/containerd-1.7.22_7f7fdf5fed64/.github/workflows/ci.yml
--- old/containerd-1.7.21_472731909fa3/.github/workflows/ci.yml 2024-08-27 
00:04:19.0 +0200
+++ new/containerd-1.7.22_7f7fdf5fed64/.github/workflows/ci.yml

commit containerd for openSUSE:Factory

2024-09-06 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-09-06 17:18:07

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.10096 (New)


Package is "containerd"

Fri Sep  6 17:18:07 2024 rev:69 rq:1199002 version:1.7.21

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-06-28 
15:47:26.958886175 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.10096/containerd.changes 
2024-09-06 17:18:21.839440126 +0200
@@ -1,0 +2,10 @@
+Thu Sep  5 14:03:03 UTC 2024 - Aleksa Sarai 
+
+- Update to containerd v1.7.21. Upstream release notes:
+  
+  Fixes CVE-2023-47108. bsc#1217070
+  Fixes CVE-2023-45142. bsc#1228553
+- Rebase patches:
+  * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
+---

Old:

  containerd-1.7.17_3a4de459a689.tar.xz

New:

  containerd-1.7.21_472731909fa3.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.cS0VIQ/_old  2024-09-06 17:18:22.327460404 +0200
+++ /var/tmp/diff_new_pack.cS0VIQ/_new  2024-09-06 17:18:22.331460570 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 3a4de459a68952ffb703bbe7f2290861a75b6b67
-%define git_short   3a4de459a689
+%define git_version 472731909fa34bd7bc9c087e4c27943f9835f111
+%define git_short   472731909fa3
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.17
+Version:1.7.21
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch ++
--- /var/tmp/diff_new_pack.cS0VIQ/_old  2024-09-06 17:18:22.351461401 +0200
+++ /var/tmp/diff_new_pack.cS0VIQ/_new  2024-09-06 17:18:22.355461567 +0200
@@ -1,4 +1,4 @@
-From 0a038dd20742bcc5e244d92af75399b0c3cdc030 Mon Sep 17 00:00:00 2001
+From 876958fd21984b77e0a70d6ac5763e757ca976ef Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai 
 Date: Wed, 22 May 2024 12:58:32 -0700
 Subject: [PATCH] BUILD: SLE12: revert "btrfs: depend on kernel UAPI instead of
@@ -143,20 +143,20 @@
  delete mode 100644 vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
 
 diff --git a/go.mod b/go.mod
-index 8028c97c1b0c..865356aced28 100644
+index a12092d07279..d9468814b976 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -9,7 +9,7 @@ require (
github.com/Microsoft/go-winio v0.6.2
-   github.com/Microsoft/hcsshim v0.11.5
+   github.com/Microsoft/hcsshim v0.11.7
github.com/containerd/aufs v1.0.0
 -  github.com/containerd/btrfs/v2 v2.0.0
 +  github.com/containerd/btrfs v1.0.0
github.com/containerd/cgroups/v3 v3.0.2
github.com/containerd/console v1.0.3
-   github.com/containerd/continuity v0.4.2
+   github.com/containerd/containerd/api v1.7.19
 diff --git a/go.sum b/go.sum
-index 4695f33f521e..7a8a8d9f0121 100644
+index 044d37b41889..d488196d9c00 100644
 --- a/go.sum
 +++ b/go.sum
 @@ -133,8 +133,8 @@ github.com/containerd/aufs 
v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9N
@@ -171,7 +171,7 @@
  github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod 
h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
  github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod 
h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
 diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go
-index a6a41e68e3cd..5cef986b5e7b 100644
+index 841c33aee785..764abf643d52 100644
 --- a/snapshots/btrfs/btrfs.go
 +++ b/snapshots/btrfs/btrfs.go
 @@ -25,7 +25,7 @@ import (
@@ -182,7 +182,7 @@
 +  "github.com/containerd/btrfs"
"github.com/containerd/continuity/fs"
  
-   "github.com/containerd/containerd/log"
+   "github.com/containerd/containerd/mount"
 diff --git a/vendor/github.com/containerd/btrfs/v2/.gitignore 
b/vendor/github.com/containerd/btrfs/.gitignore
 similarity index 100%
 rename from vendor/github.com/containerd/btrfs/v2/.gitignore
@@ -3086,7 +3086,7 @@
 -  return
 -}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 9d97f2a203b2..937ca9b44ded 100644
+index 959f6dafa3f5..0cdfde1f1d5c 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
 @@ -85,9 +85,9 @@ github.com/cilium/ebpf/link
@@ -3102,7 +3102,7 @@
  # github.com/containerd/cgroups v1.1.0
  ## explicit; go 1.17
  github.com/containerd/cgroups/stats/v1
-@@ -532,7 +532,6 @@ golang.org/x/sync/errgroup
+@@ -570,7 +570,6 @@ golang.org/x/sync/errgroup

commit containerd for openSUSE:Factory

2024-05-23 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-05-23 15:34:16

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.24587 (New)


Package is "containerd"

Thu May 23 15:34:16 2024 rev:67 rq:1175972 version:1.7.17

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-05-03 
00:13:24.531125587 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.24587/containerd.changes 
2024-05-23 15:34:40.826353132 +0200
@@ -1,0 +2,14 @@
+Wed May 22 19:31:04 UTC 2024 - Aleksa Sarai 
+
+- Update to containerd v1.7.17. Upstream release notes:
+  
+- Switch back to using tar_scm service. Aside from obs_scm using more bandwidth
+  and storage than a locally-compressed tar.xz, it seems there's some weird
+  issue with paths in obscpio that break our SLE-12-only patch.
+- Rebase patches:
+  * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+- Update to containerd v1.7.16. Upstream release notes:
+  
+  CVE-2023-45288 bsc#1221400
+
+---
@@ -23,0 +38 @@
+  GHSA-jq35-85cj-fj4p bsc#1224323

Old:

  containerd-1.7.15_926c9586.obscpio

New:

  containerd-1.7.17_3a4de459a689.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.JtWxTR/_old  2024-05-23 15:34:41.762387099 +0200
+++ /var/tmp/diff_new_pack.JtWxTR/_new  2024-05-23 15:34:41.762387099 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 926c9586fe4a6236699318391cd44976a98e31f1
-%define git_short   926c9586
+%define git_version 3a4de459a68952ffb703bbe7f2290861a75b6b67
+%define git_short   3a4de459a689
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.15
+Version:1.7.17
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch ++
 843 lines (skipped)
 between 
/work/SRC/openSUSE:Factory/containerd/0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
 and 
/work/SRC/openSUSE:Factory/.containerd.new.24587/0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch

++ _service ++
--- /var/tmp/diff_new_pack.JtWxTR/_old  2024-05-23 15:34:41.806388695 +0200
+++ /var/tmp/diff_new_pack.JtWxTR/_new  2024-05-23 15:34:41.814388985 +0200
@@ -1,18 +1,15 @@
 
-  
+  
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.15_%h
-v1.7.15
+1.7.17_%h
+v1.7.17
 .git
   
-  
-  
-  
-*.tar
+  
+containerd-*.tar
 xz
   
-
 
 

++ containerd.obsinfo ++
--- /var/tmp/diff_new_pack.JtWxTR/_old  2024-05-23 15:34:41.842390001 +0200
+++ /var/tmp/diff_new_pack.JtWxTR/_new  2024-05-23 15:34:41.846390147 +0200
@@ -1,5 +1,5 @@
 name: containerd
-version: 1.7.15_926c9586
-mtime: 1712336502
-commit: 926c9586fe4a6236699318391cd44976a98e31f1
+version: 1.7.17_3a4de459a689
+mtime: 1715895967
+commit: 3a4de459a68952ffb703bbe7f2290861a75b6b67

commit containerd for openSUSE:Factory

2024-05-02 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-05-02 23:46:43

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1880 (New)


Package is "containerd"

Thu May  2 23:46:43 2024 rev:66 rq:1171085 version:1.7.15

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-02-27 
22:44:13.645572925 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1880/containerd.changes  
2024-05-03 00:13:24.531125587 +0200
@@ -1,0 +2,24 @@
+Sun Apr 21 15:57:05 UTC 2024 - Eyad Issa 
+
+- Use obs_scm service instead of tar_scm
+
+- Removed patch 0002-shim-Create-pid-file-with-0644-permissions.patch
+  (merged upstream at
+  )
+
+- Update to containerd v1.7.15. Upstream release notes:
+  
+
+- Update to containerd v1.7.14. Upstream release notes:
+  
+
+- Update to containerd v1.7.13. Upstream release notes:
+  
+
+- Update to containerd v1.7.12. Upstream release notes:
+  
+
+- Update to containerd v1.7.11. Upstream release notes:
+  
+
+---

Old:

  0002-shim-Create-pid-file-with-0644-permissions.patch
  containerd-1.7.10_4e1fe7492b9d.tar.xz

New:

  containerd-1.7.15_926c9586.obscpio
  containerd.obsinfo

BETA DEBUG BEGIN:
  Old:
- Removed patch 0002-shim-Create-pid-file-with-0644-permissions.patch
  (merged upstream at
BETA DEBUG END:



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.rFM4En/_old  2024-05-03 00:13:39.251662248 +0200
+++ /var/tmp/diff_new_pack.rFM4En/_new  2024-05-03 00:13:39.267662832 +0200
@@ -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 @@
 Source2:%{name}.service
 # UPSTREAM: Revert  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 @@
 %if 0%{?sle_version} == 12
 %patch -P 1 -p1
 %endif
-%patch -P 2 -p1
 
 %build
 %goprep %{import_path}

++ _service ++
--- /var/tmp/diff_new_pack.rFM4En/_old  2024-05-03 00:13:39.507671581 +0200
+++ /var/tmp/diff_new_pack.rFM4En/_new  2024-05-03 00:13:39.539672748 +0200
@@ -1,15 +1,18 @@
 
-  
+  
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.10_%h
-v1.7.10
+1.7.15_%h
+v1.7.15
 .git
   
-  
+  
+  
+  
 *.tar
 xz
   
+
 
 

++ containerd.obsinfo ++
name: containerd
version: 1.7.15_926c9586
mtime: 1712336502
commit: 926c9586fe4a6236699318391cd44976a98e31f1

commit containerd for openSUSE:Factory

2024-02-27 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-02-27 22:44:11

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1770 (New)


Package is "containerd"

Tue Feb 27 22:44:11 2024 rev:65 rq:1151211 version:1.7.10

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-01-26 
22:46:48.407203070 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1770/containerd.changes  
2024-02-27 22:44:13.645572925 +0100
@@ -1,0 +2,5 @@
+Mon Feb 26 11:04:13 UTC 2024 - Dominique Leuenberger 
+
+- Use %patch -P N instead of deprecated %patchN.
+
+---



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.fBMpD4/_old  2024-02-27 22:44:14.169591921 +0100
+++ /var/tmp/diff_new_pack.fBMpD4/_new  2024-02-27 22:44:14.169591921 +0100
@@ -100,9 +100,9 @@
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
 %if 0%{?sle_version} == 12
-%patch1 -p1
+%patch -P 1 -p1
 %endif
-%patch2 -p1
+%patch -P 2 -p1
 
 %build
 %goprep %{import_path}

commit containerd for openSUSE:Factory

2024-01-26 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2024-01-26 22:46:41

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1815 (New)


Package is "containerd"

Fri Jan 26 22:46:41 2024 rev:64 rq:1141549 version:1.7.10

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2024-01-09 
20:49:13.975302987 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1815/containerd.changes  
2024-01-26 22:46:48.407203070 +0100
@@ -1,0 +2,7 @@
+Mon Jan 15 11:12:05 UTC 2024 - Dan Čermák 
+
+- Enable manpage generation
+- Make devel package noarch
+- adjust rpmlint filters
+
+---



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.CwZDRW/_old  2024-01-26 22:46:49.867255650 +0100
+++ /var/tmp/diff_new_pack.CwZDRW/_new  2024-01-26 22:46:49.887256370 +0100
@@ -91,6 +91,7 @@
 Summary:Source code for containerd
 Group:  Development/Libraries/Go
 Requires:   %{name} = %{version}
+BuildArch:  noarch
 
 %description devel
 This package contains the source code needed for building packages that
@@ -110,8 +111,8 @@
BUILDTAGS="$BUILDTAGS" \
VERSION="v%{version}" \
REVISION="%{git_version}"
-# TODO: Fix man-page generation.
-#make man
+
+make man
 
 cp -r "$PROJECT/bin" bin
 
@@ -135,13 +136,12 @@
 install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 # Man pages.
-# 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/%{name}-ctr.1
+for file in man/*
+do
+section="${file##*.}"
+install -D -m644 "$file" 
"%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
+done
+mv %{buildroot}/%{_mandir}/man8/{ctr.8,%{name}-ctr.8}
 
 %fdupes %{buildroot}
 
@@ -166,14 +166,12 @@
 %{_sbindir}/containerd
 %{_sbindir}/containerd-shim*
 %{_unitdir}/%{name}.service
-# TODO: Fix man page generation.
-#%{_mandir}/man*/%{name}*
-#%exclude %{_mandir}/man1/*ctr.1*
+%{_mandir}/man*/%{name}*
+%exclude %{_mandir}/man8/*ctr.8*
 
 %files ctr
-%{_sbindir}/containerd-ctr
-# TODO: Fix man page generation.
-#%{_mandir}/man1/*ctr.1*
+%{_sbindir}/%{name}-ctr
+%{_mandir}/man8/%{name}-ctr.8*
 
 %files devel
 %license LICENSE

++ containerd-rpmlintrc ++
--- /var/tmp/diff_new_pack.CwZDRW/_old  2024-01-26 22:46:50.251269480 +0100
+++ /var/tmp/diff_new_pack.CwZDRW/_new  2024-01-26 22:46:50.279270487 +0100
@@ -1,3 +1,2 @@
-addFilter ("^containerd(-kubic)?.*: W: statically-linked-binary 
/usr/sbin/containerd-shim")
-addFilter ("^containerd(-kubic)?-test.noarch: [WE]: 
(hidden-file-or-dir|script-without-shebang|devel-file-in-non-devel-package|env-script-interpreter).*
 /usr/src/containerd/.*")
+addFilter ("^containerd(-kubic)?.*: E: statically-linked-binary 
/usr/sbin/containerd-shim*")

commit containerd for openSUSE:Factory

2023-12-05 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-12-05 17:00:50

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.25432 (New)


Package is "containerd"

Tue Dec  5 17:00:50 2023 rev:62 rq:1130673 version:1.7.10

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-11-28 
22:18:04.222841547 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.25432/containerd.changes 
2023-12-05 17:00:51.795943740 +0100
@@ -1,0 +2,8 @@
+Mon Dec  4 08:44:40 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.7.10. Upstream release notes:
+  
+- Rebase patches:
+  * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
+---

Old:

  containerd-1.7.8_8e4b0bde8667.tar.xz

New:

  containerd-1.7.10_4e1fe7492b9d.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.fVI6XI/_old  2023-12-05 17:00:52.331963498 +0100
+++ /var/tmp/diff_new_pack.fVI6XI/_new  2023-12-05 17:00:52.335963646 +0100
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 8e4b0bde866788eec76735cc77c4720144248fb7
-%define git_short   8e4b0bde8667
+%define git_version 4e1fe7492b9df85914c389d1f15a3ceedbb280ac
+%define git_short   4e1fe7492b9d
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.8
+Version:1.7.10
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch ++
--- /var/tmp/diff_new_pack.fVI6XI/_old  2023-12-05 17:00:52.351964236 +0100
+++ /var/tmp/diff_new_pack.fVI6XI/_new  2023-12-05 17:00:52.355964383 +0100
@@ -1,4 +1,4 @@
-From c6a136e30370e2b94e6373b9c22f6ec3d0d9a738 Mon Sep 17 00:00:00 2001
+From 4c4982da6ba4822ce8ea33a8054fac51465b0c7c Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai 
 Date: Tue, 28 Nov 2023 22:54:03 +1100
 Subject: [PATCH] BUILD: SLE12: revert "btrfs: depend on kernel UAPI instead of
@@ -143,11 +143,11 @@
  delete mode 100644 vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
 
 diff --git a/go.mod b/go.mod
-index 9bafb7ba5944..532d2d63f104 100644
+index 8fa8e5afc0d5..a0c927917263 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -9,7 +9,7 @@ require (
-   github.com/Microsoft/hcsshim v0.11.1
+   github.com/Microsoft/hcsshim v0.11.4
github.com/container-orchestrated-devices/container-device-interface 
v0.5.4
github.com/containerd/aufs v1.0.0
 -  github.com/containerd/btrfs/v2 v2.0.0
@@ -156,7 +156,7 @@
github.com/containerd/console v1.0.3
github.com/containerd/continuity v0.4.2
 diff --git a/go.sum b/go.sum
-index 00dae8b4104a..0e90a8e8855c 100644
+index cd0adb193879..21693007e7bc 100644
 --- a/go.sum
 +++ b/go.sum
 @@ -187,9 +187,8 @@ github.com/containerd/aufs v1.0.0 
h1:2oeJiwX5HstO7shSrPZjrohJZLzK36wvpdmzDRkL/LY
@@ -3129,10 +3129,10 @@
 -  return
 -}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index d38e3a52bf83..3a9043e2b3fd 100644
+index fd5a3491d305..764f922ba25c 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -88,9 +88,9 @@ 
github.com/container-orchestrated-devices/container-device-interface/specs-go
+@@ -87,9 +87,9 @@ 
github.com/container-orchestrated-devices/container-device-interface/specs-go
  ## explicit; go 1.13
  github.com/containerd/aufs
  github.com/containerd/aufs/plugin
@@ -3145,7 +3145,7 @@
  # github.com/containerd/cgroups v1.1.0
  ## explicit; go 1.17
  github.com/containerd/cgroups/stats/v1
-@@ -529,7 +529,6 @@ golang.org/x/sync/errgroup
+@@ -530,7 +530,6 @@ golang.org/x/sync/errgroup
  golang.org/x/sync/semaphore
  # golang.org/x/sys v0.13.0
  ## explicit; go 1.17

++ _service ++
--- /var/tmp/diff_new_pack.fVI6XI/_old  2023-12-05 17:00:52.379965267 +0100
+++ /var/tmp/diff_new_pack.fVI6XI/_new  2023-12-05 17:00:52.379965267 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.8_%h
-v1.7.8
+1.7.10_%h
+v1.7.10
 .git
   
   

++ containerd-1.7.8_8e4b0bde8667.tar.xz -> 
containerd-1.7.10_4e1fe7492b9d.tar.xz ++
 26399 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-10-29 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-10-29 19:39:46

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.17445 (New)


Package is "containerd"

Sun Oct 29 19:39:46 2023 rev:60 rq:1120881 version:1.7.8

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-10-13 
23:14:07.889841048 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.17445/containerd.changes 
2023-10-29 19:39:56.999337493 +0100
@@ -1,0 +2,6 @@
+Fri Oct 27 21:13:23 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.7.8. Upstream release notes:
+  
+
+---

Old:

  containerd-1.7.7_8c087663b023.tar.xz

New:

  containerd-1.7.8_8e4b0bde8667.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.W7n28K/_old  2023-10-29 19:39:58.479391338 +0100
+++ /var/tmp/diff_new_pack.W7n28K/_new  2023-10-29 19:39:58.495391920 +0100
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 8c087663b0233f6e6e2f4515cee61d49f14746a8
-%define git_short   8c087663b023
+%define git_version 8e4b0bde866788eec76735cc77c4720144248fb7
+%define git_short   8e4b0bde8667
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.7
+Version:1.7.8
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.W7n28K/_old  2023-10-29 19:39:58.775402107 +0100
+++ /var/tmp/diff_new_pack.W7n28K/_new  2023-10-29 19:39:58.811403416 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.7_%h
-v1.7.7
+1.7.8_%h
+v1.7.8
 .git
   
   

++ containerd-1.7.7_8c087663b023.tar.xz -> 
containerd-1.7.8_8e4b0bde8667.tar.xz ++
 26645 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-10-13 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-10-13 23:13:53

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.20540 (New)


Package is "containerd"

Fri Oct 13 23:13:53 2023 rev:59 rq:1117567 version:1.7.7

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-09-14 
16:27:06.993692040 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.20540/containerd.changes 
2023-10-13 23:14:07.889841048 +0200
@@ -1,0 +2,8 @@
+Fri Oct 13 05:33:18 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.7.7. Upstream release notes:
+  
+- Add patch to fix build on SLE-12:
+  + 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
+---

Old:

  containerd-1.7.6_091922f03c27.tar.xz

New:

  0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
  containerd-1.7.7_8c087663b023.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.WCR5tB/_old  2023-10-13 23:14:08.397859474 +0200
+++ /var/tmp/diff_new_pack.WCR5tB/_new  2023-10-13 23:14:08.397859474 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 091922f03c2762540fd057fba91260237ff86acb
-%define git_short   091922f03c27
+%define git_version 8c087663b0233f6e6e2f4515cee61d49f14746a8
+%define git_short   8c087663b023
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.7.6
+Version:1.7.7
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -39,6 +39,8 @@
 Source: %{name}-%{version}_%{git_short}.tar.xz
 Source1:%{name}-rpmlintrc
 Source2:%{name}.service
+# UPSTREAM: Revert  to fix 
build on SLE-12.
+Patch1: 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go >= 1.19
@@ -94,6 +96,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
+%if 0%{?sle_version} == 12
+%patch1 -p1
+%endif
 
 %build
 %goprep %{import_path}

++ 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch ++
 3149 lines (skipped)

++ _service ++
--- /var/tmp/diff_new_pack.WCR5tB/_old  2023-10-13 23:14:08.437860925 +0200
+++ /var/tmp/diff_new_pack.WCR5tB/_new  2023-10-13 23:14:08.441861070 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.7.6_%h
-v1.7.6
+1.7.7_%h
+v1.7.7
 .git
   
   

++ containerd-1.7.6_091922f03c27.tar.xz -> 
containerd-1.7.7_8c087663b023.tar.xz ++
 31938 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-09-14 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-09-14 16:25:07

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1766 (New)


Package is "containerd"

Thu Sep 14 16:25:07 2023 rev:58 rq:024 version:1.7.6

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-05-23 
14:53:11.598003852 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1766/containerd.changes  
2023-09-14 16:27:06.993692040 +0200
@@ -1,0 +2,12 @@
+Thu Sep 14 04:27:07 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.7.6 for Docker v24.0.6-ce. Upstream release notes:
+   bsc#1215323
+
+---
+Thu Aug 31 09:20:32 UTC 2023 - Priyanka Saggu 
+
+- Add `Provides: cri-runtime` to use containerd as container runtime in Factory
+  Kubernetes packages
+
+---

Old:

  containerd-1.6.21_3dce8eb055cb.tar.xz

New:

  containerd-1.7.6_091922f03c27.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.A8hhtt/_old  2023-09-14 16:27:08.257737196 +0200
+++ /var/tmp/diff_new_pack.A8hhtt/_new  2023-09-14 16:27:08.261737338 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 3dce8eb055cbb6872793272b4f20ed16117344f8
-%define git_short   3dce8eb055cb
+%define git_version 091922f03c2762540fd057fba91260237ff86acb
+%define git_short   091922f03c27
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.21
+Version:1.7.6
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -41,7 +41,7 @@
 Source2:%{name}.service
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
-BuildRequires:  go >= 1.18
+BuildRequires:  go >= 1.19
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
 BuildRequires:  libbtrfs-devel >= 3.8
@@ -60,6 +60,7 @@
 Obsoletes:  %{name} = 0.2.5+gitr569_2a5e70c
 Obsoletes:  %{name}_2a5e70c
 ExcludeArch:s390
+Provides:   cri-runtime
 
 %description
 Containerd is a daemon with an API and a command line client, to manage

++ _service ++
--- /var/tmp/diff_new_pack.A8hhtt/_old  2023-09-14 16:27:08.285738196 +0200
+++ /var/tmp/diff_new_pack.A8hhtt/_new  2023-09-14 16:27:08.289738339 +0200
@@ -1,13 +1,13 @@
 
-  
+  
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.21_%h
-v1.6.21
+1.7.6_%h
+v1.7.6
 .git
   
-  
+  
 *.tar
 xz
   

++ containerd-1.6.21_3dce8eb055cb.tar.xz -> 
containerd-1.7.6_091922f03c27.tar.xz ++
 660939 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-05-23 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-05-23 14:53:10

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1533 (New)


Package is "containerd"

Tue May 23 14:53:10 2023 rev:57 rq:1088255 version:1.6.21

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-04-22 
21:57:31.308162310 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1533/containerd.changes  
2023-05-23 14:53:11.598003852 +0200
@@ -1,0 +2,16 @@
+Sun May 21 11:16:18 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.6.21 for Docker v23.0.6-ce. Upstream release notes:
+   bsc#1211578
+- Require a minimum Go version explicitly rather than using golang(API).
+  Fixes the change for bsc#1210298.
+
+---
+Thu May  4 12:50:57 UTC 2023 - Marcus Meissner 
+
+[ This was only released in SLE. ]
+
+- unversion to golang requires to always use the current default go.
+  (bsc#1210298)
+
+---

Old:

  containerd-1.6.20_2806fc105739.tar.xz

New:

  containerd-1.6.21_3dce8eb055cb.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.9sErbW/_old  2023-05-23 14:53:13.018012253 +0200
+++ /var/tmp/diff_new_pack.9sErbW/_new  2023-05-23 14:53:13.026012301 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 2806fc1057397dbaeefbea0e4e17bddfbd388f38
-%define git_short   2806fc105739
+%define git_version 3dce8eb055cbb6872793272b4f20ed16117344f8
+%define git_short   3dce8eb055cb
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.20
+Version:1.6.21
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -41,12 +41,12 @@
 Source2:%{name}.service
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
+BuildRequires:  go >= 1.18
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
 BuildRequires:  libbtrfs-devel >= 3.8
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
-BuildRequires:  golang(API) = 1.18
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same

++ _service ++
--- /var/tmp/diff_new_pack.9sErbW/_old  2023-05-23 14:53:13.062012513 +0200
+++ /var/tmp/diff_new_pack.9sErbW/_new  2023-05-23 14:53:13.066012537 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.20_%h
-v1.6.20
+1.6.21_%h
+v1.6.21
 .git
   
   

++ containerd-1.6.20_2806fc105739.tar.xz -> 
containerd-1.6.21_3dce8eb055cb.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.6.20_2806fc105739/.github/workflows/build-test-images.yml 
new/containerd-1.6.21_3dce8eb055cb/.github/workflows/build-test-images.yml
--- old/containerd-1.6.20_2806fc105739/.github/workflows/build-test-images.yml  
2023-03-30 22:30:13.0 +0200
+++ new/containerd-1.6.21_3dce8eb055cb/.github/workflows/build-test-images.yml  
2023-05-05 17:13:28.0 +0200
@@ -41,7 +41,7 @@
 steps:
   - uses: actions/setup-go@v3
 with:
-  go-version: '1.19.7'
+  go-version: '1.19.9'
 
   - uses: actions/checkout@v3
 with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.6.20_2806fc105739/.github/workflows/ci.yml 
new/containerd-1.6.21_3dce8eb055cb/.github/workflows/ci.yml
--- old/containerd-1.6.20_2806fc105739/.github/workflows/ci.yml 2023-03-30 
22:30:13.0 +0200
+++ new/containerd-1.6.21_3dce8eb055cb/.github/workflows/ci.yml 2023-05-05 
17:13:28.0 +0200
@@ -12,7 +12,7 @@
 env:
   # Go version we currently use to build containerd across all CI.
   # Note: don't forget to update `Binaries` step, as it contains the matrix of 
all supported Go versions.
-  GO_VERSION: '1.19.7'
+  GO_VERSION: '1.19.9'
 
 permissions:  # added using https://github.com/step-security/secure-workflows
   contents: read
@@ -233,7 +233,7 @@
 strategy:
   matrix:
 os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
-go-version: ["1.17.13", "1.19.7"]
+go-version: ["1.17.13", "1.19.9"]
 steps:
   - name: Install dependencies
 if:

commit containerd for openSUSE:Factory

2023-04-22 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-04-22 21:56:55

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1533 (New)


Package is "containerd"

Sat Apr 22 21:56:55 2023 rev:56 rq:1081093 version:1.6.20

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-03-30 
22:50:54.484459536 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1533/containerd.changes  
2023-04-22 21:57:31.308162310 +0200
@@ -1,0 +2,6 @@
+Tue Apr 18 14:52:44 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.6.20 for Docker v23.0.4-ce. Upstream release notes:
+  
+
+---

Old:

  containerd-1.6.19_1e1ea6e986c6.tar.xz

New:

  containerd-1.6.20_2806fc105739.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.fV3oxi/_old  2023-04-22 21:57:31.888165777 +0200
+++ /var/tmp/diff_new_pack.fV3oxi/_new  2023-04-22 21:57:31.892165801 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
-%define git_short   1e1ea6e986c6
+%define git_version 2806fc1057397dbaeefbea0e4e17bddfbd388f38
+%define git_short   2806fc105739
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.19
+Version:1.6.20
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.fV3oxi/_old  2023-04-22 21:57:31.924165992 +0200
+++ /var/tmp/diff_new_pack.fV3oxi/_new  2023-04-22 21:57:31.928166016 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.19_%h
-v1.6.19
+1.6.20_%h
+v1.6.20
 .git
   
   

++ containerd-1.6.19_1e1ea6e986c6.tar.xz -> 
containerd-1.6.20_2806fc105739.tar.xz ++
 9009 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-03-30 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-03-30 22:50:51

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.31432 (New)


Package is "containerd"

Thu Mar 30 22:50:51 2023 rev:55 rq:1075229 version:1.6.19

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-03-15 
18:53:14.247977997 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.31432/containerd.changes 
2023-03-30 22:50:54.484459536 +0200
@@ -1,0 +2,10 @@
+Wed Mar 29 04:53:24 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.6.19 for Docker v23.0.2-ce. Upstream release notes:
+  
+
+  Includes fixes for:
+   - CVE-2023-25153 bsc#1208423
+   - CVE-2023-25173 bsc#1208426
+
+---
@@ -9 +19 @@
-- Update to containerd v1.6.16 for Docker v23.0.0-ce. Upstream release notes:
+- Update to containerd v1.6.16 for Docker v23.0.1-ce. Upstream release notes:

Old:

  containerd-1.6.16_31aa4358a368.tar.xz

New:

  containerd-1.6.19_1e1ea6e986c6.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.b89scB/_old  2023-03-30 22:50:54.948462020 +0200
+++ /var/tmp/diff_new_pack.b89scB/_new  2023-03-30 22:50:54.948462020 +0200
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 31aa4358a36870b21a992d3ad2bef29e1d693bec
-%define git_short   31aa4358a368
+%define git_version 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
+%define git_short   1e1ea6e986c6
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.16
+Version:1.6.19
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.b89scB/_old  2023-03-30 22:50:54.980462191 +0200
+++ /var/tmp/diff_new_pack.b89scB/_new  2023-03-30 22:50:54.980462191 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.16_%h
-v1.6.16
+1.6.19_%h
+v1.6.19
 .git
   
   

++ containerd-1.6.16_31aa4358a368.tar.xz -> 
containerd-1.6.19_1e1ea6e986c6.tar.xz ++
 1945 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-03-15 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-03-15 18:53:09

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.31432 (New)


Package is "containerd"

Wed Mar 15 18:53:09 2023 rev:54 rq:1071349 version:1.6.16

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2023-03-09 
17:44:37.310550815 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.31432/containerd.changes 
2023-03-15 18:53:14.247977997 +0100
@@ -6,0 +7,6 @@
+Thu Feb  9 01:58:07 UTC 2023 - Aleksa Sarai 
+
+- Update to containerd v1.6.16 for Docker v23.0.0-ce. Upstream release notes:
+  
+
+---
@@ -9,2 +15,3 @@
-- Update to containerd v1.6.12 to fix CVE-2022-23471. Upstream release notes:
-  
+- Update to containerd v1.6.12 to fix CVE-2022-23471 bsc#1206235. Upstream
+  release notes:
+  

Old:

  containerd-1.6.12_a05d175400b1.tar.xz

New:

  containerd-1.6.16_31aa4358a368.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.4GJPcw/_old  2023-03-15 18:53:14.843981167 +0100
+++ /var/tmp/diff_new_pack.4GJPcw/_new  2023-03-15 18:53:14.843981167 +0100
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version a05d175400b1145e5e6a735a6710579d181e7fb0
-%define git_short   a05d175400b1
+%define git_version 31aa4358a36870b21a992d3ad2bef29e1d693bec
+%define git_short   31aa4358a368
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.12
+Version:1.6.16
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.4GJPcw/_old  2023-03-15 18:53:14.871981316 +0100
+++ /var/tmp/diff_new_pack.4GJPcw/_new  2023-03-15 18:53:14.875981337 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.12_%h
-v1.6.12
+1.6.16_%h
+v1.6.16
 .git
   
   

++ containerd-1.6.12_a05d175400b1.tar.xz -> 
containerd-1.6.16_31aa4358a368.tar.xz ++
 2130 lines of diff (skipped)

commit containerd for openSUSE:Factory

2023-03-09 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2023-03-09 17:44:36

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.31432 (New)


Package is "containerd"

Thu Mar  9 17:44:36 2023 rev:53 rq:1070064 version:1.6.12

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-12-09 
13:15:30.366277147 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.31432/containerd.changes 
2023-03-09 17:44:37.310550815 +0100
@@ -1,0 +2,5 @@
+Wed Mar  1 05:29:46 UTC 2023 - Aleksa Sarai 
+
+- Re-build containerd to use updated golang-packaging. jsc#1342
+
+---



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.HXL1qN/_old  2023-03-09 17:44:37.834553603 +0100
+++ /var/tmp/diff_new_pack.HXL1qN/_new  2023-03-09 17:44:37.838553625 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package containerd
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

commit containerd for openSUSE:Factory

2022-12-09 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-12-09 13:15:29

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1835 (New)


Package is "containerd"

Fri Dec  9 13:15:29 2022 rev:52 rq:1041295 version:1.6.12

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-12-07 
17:35:42.052780887 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1835/containerd.changes  
2022-12-09 13:15:30.366277147 +0100
@@ -1,0 +2,12 @@
+Thu Dec  8 01:28:48 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.6.12 to fix CVE-2022-23471. Upstream release notes:
+  
+
+---
+Tue Dec  6 22:41:50 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.6.11. Upstream release notes:
+  
+
+---

Old:

  containerd-1.6.9_1c90a4424897.tar.xz

New:

  containerd-1.6.12_a05d175400b1.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.mheNIl/_old  2022-12-09 13:15:30.934280125 +0100
+++ /var/tmp/diff_new_pack.mheNIl/_new  2022-12-09 13:15:30.938280146 +0100
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 1c90a442489720eec95342e1789ee8a5e1b9536f
-%define git_short   1c90a4424897
+%define git_version a05d175400b1145e5e6a735a6710579d181e7fb0
+%define git_short   a05d175400b1
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.9
+Version:1.6.12
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.mheNIl/_old  2022-12-09 13:15:30.990280419 +0100
+++ /var/tmp/diff_new_pack.mheNIl/_new  2022-12-09 13:15:30.994280440 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.9_%h
-v1.6.9
+1.6.12_%h
+v1.6.12
 .git
   
   

++ containerd-1.6.9_1c90a4424897.tar.xz -> 
containerd-1.6.12_a05d175400b1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.6.9_1c90a4424897/.github/workflows/build-test-images.yml 
new/containerd-1.6.12_a05d175400b1/.github/workflows/build-test-images.yml
--- old/containerd-1.6.9_1c90a4424897/.github/workflows/build-test-images.yml   
2022-10-24 19:30:42.0 +0200
+++ new/containerd-1.6.12_a05d175400b1/.github/workflows/build-test-images.yml  
2022-12-07 22:50:27.0 +0100
@@ -39,7 +39,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.18.7'
+  go-version: '1.18.9'
 
   - uses: actions/checkout@v2
 with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.6.9_1c90a4424897/.github/workflows/ci.yml 
new/containerd-1.6.12_a05d175400b1/.github/workflows/ci.yml
--- old/containerd-1.6.9_1c90a4424897/.github/workflows/ci.yml  2022-10-24 
19:30:42.0 +0200
+++ new/containerd-1.6.12_a05d175400b1/.github/workflows/ci.yml 2022-12-07 
22:50:27.0 +0100
@@ -20,7 +20,7 @@
 
 strategy:
   matrix:
-go-version: [1.18.7]
+go-version: [1.18.9]
 os: [ubuntu-18.04, macos-12, windows-2019]
 
 steps:
@@ -46,7 +46,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.18.7'
+  go-version: '1.18.9'
 
   - uses: actions/checkout@v2
 with:
@@ -78,7 +78,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.18.7'
+  go-version: '1.18.9'
 
   - uses: actions/checkout@v2
 with:
@@ -110,7 +110,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.18.7'
+  go-version: '1.18.9'
   - uses: actions/checkout@v2
   - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
   - run: make man
@@ -148,7 +148,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.18.7'
+  go-version: '1.18.9'
   - uses: actions/checkout@v2
   - run: |
   set -e -x
@@ -215,7 +215,7 @@
 strategy:
   matrix:
 os: [ubuntu-18.04, macos-12, windows-2019, windows-2022]
-go-version: ['1.17.13', '1.18.7']
+go-version: ['1.17.13', '1.18.9']
 
 steps:
   - uses: ac

commit containerd for openSUSE:Factory

2022-12-07 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-12-07 17:34:31

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1835 (New)


Package is "containerd"

Wed Dec  7 17:34:31 2022 rev:51 rq:1040632 version:1.6.9

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-12-04 
14:57:41.244039717 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1835/containerd.changes  
2022-12-07 17:35:42.052780887 +0100
@@ -1,0 +2,7 @@
+Tue Dec  6 04:48:06 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.6.9 for Docker v20.10.21-ce. Also includes a fix for
+  CVE-2022-27191. boo#1206065 bsc#1197284 Upstream release notes:
+  
+
+---

Old:

  containerd-1.6.6_10c12954828e.tar.xz

New:

  containerd-1.6.9_1c90a4424897.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.B2ks8f/_old  2022-12-07 17:35:42.780784873 +0100
+++ /var/tmp/diff_new_pack.B2ks8f/_new  2022-12-07 17:35:42.784784895 +0100
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1
-%define git_short   10c12954828e
+%define git_version 1c90a442489720eec95342e1789ee8a5e1b9536f
+%define git_short   1c90a4424897
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:   containerd
-Version:1.6.6
+Version:1.6.9
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.B2ks8f/_old  2022-12-07 17:35:42.824785115 +0100
+++ /var/tmp/diff_new_pack.B2ks8f/_new  2022-12-07 17:35:42.824785115 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.6.6_%h
-v1.6.6
+1.6.9_%h
+v1.6.9
 .git
   
   

++ containerd-1.6.6_10c12954828e.tar.xz -> 
containerd-1.6.9_1c90a4424897.tar.xz ++
 43672 lines of diff (skipped)

commit containerd for openSUSE:Factory

2022-12-04 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-12-04 14:57:37

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1835 (New)


Package is "containerd"

Sun Dec  4 14:57:37 2022 rev:50 rq:1039672 version:1.6.6

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-06-07 
11:45:06.043227991 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1835/containerd.changes  
2022-12-04 14:57:41.244039717 +0100
@@ -1,0 +2,5 @@
+Tue Nov 29 16:01:11 UTC 2022 - Dirk Müller 
+
+- add devel subpackage, which is needed by open-vm-tools
+
+---



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.uqiF65/_old  2022-12-04 14:57:42.112044718 +0100
+++ /var/tmp/diff_new_pack.uqiF65/_new  2022-12-04 14:57:42.116044741 +0100
@@ -26,6 +26,9 @@
 %define git_version 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1
 %define git_short   10c12954828e
 
+%global provider_prefix github.com/containerd/containerd
+%global import_path %{provider_prefix}
+
 Name:   containerd
 Version:1.6.6
 Release:0
@@ -39,12 +42,11 @@
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go-go-md2man
+BuildRequires:  golang-packaging
 BuildRequires:  libbtrfs-devel >= 3.8
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
-# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.18' here, so just require 1.18 exactly. bsc#1172608
-BuildRequires:  go1.18
+BuildRequires:  golang(API) = 1.18
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same
@@ -80,12 +82,22 @@
 Standalone client for containerd, which allows management of containerd 
containers
 separately from Docker.
 
+%package devel
+Summary:Source code for containerd
+Group:  Development/Libraries/Go
+Requires:   %{name} = %{version}
+
+%description devel
+This package contains the source code needed for building packages that
+reference the following Go import paths: github.com/containerd/containerd
+
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
 
 %build
+%goprep %{import_path}
 BUILDTAGS="apparmor selinux seccomp"
-%make_build \
+make \
BUILDTAGS="$BUILDTAGS" \
VERSION="v%{version}" \
REVISION="%{git_version}"
@@ -95,6 +107,7 @@
 cp -r "$PROJECT/bin" bin
 
 %install
+%gosrc
 # Install binaries.
 pushd bin/
 for bin in containerd{,-shim*}
@@ -153,4 +166,10 @@
 # TODO: Fix man page generation.
 #%{_mandir}/man1/*ctr.1*
 
+%files devel
+%license LICENSE
+%dir %{go_contribsrcdir}/github.com
+%dir %{go_contribsrcdir}/github.com/containerd
+%{go_contribsrcdir}/%{import_path}
+
 %changelog

commit containerd for openSUSE:Factory

2022-06-07 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-06-07 11:44:59

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1548 (New)


Package is "containerd"

Tue Jun  7 11:44:59 2022 rev:49 rq:981103 version:1.6.6

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-04-16 
00:13:18.917574276 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1548/containerd.changes  
2022-06-07 11:45:06.043227991 +0200
@@ -1,0 +2,22 @@
+Tue Jun  7 07:22:02 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.6.6 to fix CVE-2022-31030 and meet the requirements
+  of Docker v20.10.17-ce. bsc#1200145
+- Remove upstreamed patches:
+  - bsc1200145-Limit-the-response-size-of-ExecSync.patch
+
+---
+Mon Jun  6 05:49:56 UTC 2022 - Aleksa Sarai 
+
+[ This patch was only released in SLES and Leap. ]
+
+- Backport patch to fix GHSA-5ffw-gxpp-mxpf CVE-2022-31030. bsc#1200145
+  + bsc1200145-Limit-the-response-size-of-ExecSync.patch
+
+---
+Mon Jun  6 05:41:10 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.5.12. Upstream release notes:
+  
+
+---

Old:

  containerd-1.5.11_3df54a852345.tar.xz

New:

  containerd-1.6.6_10c12954828e.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.PyAehE/_old  2022-06-07 11:45:06.543228673 +0200
+++ /var/tmp/diff_new_pack.PyAehE/_new  2022-06-07 11:45:06.551228684 +0200
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 3df54a852345ae127d1fa3092b95168e4a88e2f8
-%define git_short   3df54a852345
+%define git_version 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1
+%define git_short   10c12954828e
 
 Name:   containerd
-Version:1.5.11
+Version:1.6.6
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -43,8 +43,8 @@
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
 # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.16' here, so just require 1.16 exactly. bsc#1172608
-BuildRequires:  go1.16
+# for 'golang(API) >= 1.18' here, so just require 1.18 exactly. bsc#1172608
+BuildRequires:  go1.18
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same
@@ -84,21 +84,8 @@
 %setup -q -n %{name}-%{version}_%{git_short}
 
 %build
-# NOTE: containerd will switch to go.mod in 1.5.x so this can be removed after
-#   we update to that version.
-
-# Do not use symlinks. If you want to run the unit tests for this package at
-# some point during the build and you need to directly use go list directly it
-# will get confused by symlinks.
-export GOPATH=$HOME/go
-export PROJECT=$HOME/go/src/github.com/containerd/containerd
-export GO111MODULE=off
-mkdir -p $PROJECT
-rm -rf $PROJECT/*
-cp -ar * $PROJECT
-
 BUILDTAGS="apparmor selinux seccomp"
-make -C "$PROJECT"\
+%make_build \
BUILDTAGS="$BUILDTAGS" \
VERSION="v%{version}" \
REVISION="%{git_version}"

++ _service ++
--- /var/tmp/diff_new_pack.PyAehE/_old  2022-06-07 11:45:06.599228749 +0200
+++ /var/tmp/diff_new_pack.PyAehE/_new  2022-06-07 11:45:06.603228754 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.5.11_%h
-v1.5.11
+1.6.6_%h
+v1.6.6
 .git
   
   

++ containerd-1.5.11_3df54a852345.tar.xz -> 
containerd-1.6.6_10c12954828e.tar.xz ++
 382607 lines of diff (skipped)

commit containerd for openSUSE:Factory

2022-04-18 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-04-16 00:13:03

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1941 (New)


Package is "containerd"

Sat Apr 16 00:13:03 2022 rev:48 rq:970049 version:1.5.11

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2022-03-05 
14:44:11.135712555 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1941/containerd.changes  
2022-04-16 00:13:18.917574276 +0200
@@ -1,0 +2,5 @@
+Thu Apr 14 04:15:16 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.5.11 to fix CVE-2022-24769. bsc#1197517
+
+---
@@ -4,0 +10,10 @@
+- Remove upstreamed patch:
+  - CVE-2022-23648.patch
+
+---
+Wed Mar  2 12:48:05 UTC 2022 - Aleksa Sarai 
+
+[ This patch was only released in SLES and Leap. ]
+
+- Add patch for CVE-2022-23648. bsc#1196441
+  + CVE-2022-23648.patch
@@ -9,2 +24,2 @@
-- Update to containerd v1.4.12 for Docker 20.10.11-ce.
-  bsc#1192814 CVE-2021-41190
+- Update to containerd v1.4.12 for Docker 20.10.11-ce. bsc#1192814
+  bsc#1193273 CVE-2021-41190

Old:

  containerd-1.4.13_9cc61520f4cd.tar.xz

New:

  containerd-1.5.11_3df54a852345.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.Ned28n/_old  2022-04-16 00:13:19.413574938 +0200
+++ /var/tmp/diff_new_pack.Ned28n/_new  2022-04-16 00:13:19.417574943 +0200
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 9cc61520f4cd876b86e77edfeb88fbcd536d1f9d
-%define git_short   9cc61520f4cd
+%define git_version 3df54a852345ae127d1fa3092b95168e4a88e2f8
+%define git_short   3df54a852345
 
 Name:   containerd
-Version:1.4.13
+Version:1.5.11
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.Ned28n/_old  2022-04-16 00:13:19.453574992 +0200
+++ /var/tmp/diff_new_pack.Ned28n/_new  2022-04-16 00:13:19.457574997 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.13_%h
-v1.4.13
+1.5.11_%h
+v1.5.11
 .git
   
   

++ containerd-1.4.13_9cc61520f4cd.tar.xz -> 
containerd-1.5.11_3df54a852345.tar.xz ++
 275434 lines of diff (skipped)

commit containerd for openSUSE:Factory

2022-03-05 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2022-03-05 14:43:21

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1958 (New)


Package is "containerd"

Sat Mar  5 14:43:21 2022 rev:47 rq:958598 version:1.4.13

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-11-22 
23:03:51.417997889 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.1958/containerd.changes  
2022-03-05 14:44:11.135712555 +0100
@@ -1,0 +2,5 @@
+Thu Mar  3 07:24:10 UTC 2022 - Aleksa Sarai 
+
+- Update to containerd v1.4.13 to fix CVE-2022-23648. bsc#1196441
+
+---

Old:

  containerd-1.4.12_7b11cfaabd73.tar.xz

New:

  containerd-1.4.13_9cc61520f4cd.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.GGdMQ5/_old  2022-03-05 14:44:11.647712684 +0100
+++ /var/tmp/diff_new_pack.GGdMQ5/_new  2022-03-05 14:44:11.651712685 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package containerd
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 7b11cfaabd73bb80907dd23182b9347b4245eb5d
-%define git_short   7b11cfaabd73
+%define git_version 9cc61520f4cd876b86e77edfeb88fbcd536d1f9d
+%define git_short   9cc61520f4cd
 
 Name:   containerd
-Version:1.4.12
+Version:1.4.13
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.GGdMQ5/_old  2022-03-05 14:44:11.683712693 +0100
+++ /var/tmp/diff_new_pack.GGdMQ5/_new  2022-03-05 14:44:11.687712694 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.12_%h
-v1.4.12
+1.4.13_%h
+v1.4.13
 .git
   
   

++ containerd-1.4.12_7b11cfaabd73.tar.xz -> 
containerd-1.4.13_9cc61520f4cd.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.4.12_7b11cfaabd73/.github/workflows/ci.yml 
new/containerd-1.4.13_9cc61520f4cd/.github/workflows/ci.yml
--- old/containerd-1.4.12_7b11cfaabd73/.github/workflows/ci.yml 2021-11-17 
20:52:12.0 +0100
+++ new/containerd-1.4.13_9cc61520f4cd/.github/workflows/ci.yml 2022-03-02 
19:03:17.0 +0100
@@ -26,7 +26,7 @@
   - name: Install Go
 uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
@@ -82,7 +82,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
@@ -128,7 +128,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
@@ -166,7 +166,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
@@ -199,7 +199,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
@@ -285,7 +285,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Set env
 shell: bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.4.12_7b11cfaabd73/.github/workflows/nightly.yml 
new/containerd-1.4.13_9cc61520f4cd/.github/workflows/nightly.yml
--- old/containerd-1.4.12_7b11cfaabd73/.github/workflows/nightly.yml
2021-11-17 20:52:12.0 +0100
+++ new/containerd-1.4.13_9cc61520f4cd/.github/workflows/nightly.yml
2022-03-02 19:03:17.0 +0100
@@ -14,7 +14,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Checkout
 uses: actions/checkout@v1
@@ -138,7 +138,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.10'
+  go-version: '1.16.14'
 
   - name: Checkout
 uses: actions/checkout@v1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--excl

commit containerd for openSUSE:Factory

2021-11-22 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-11-22 23:03:44

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1895 (New)


Package is "containerd"

Mon Nov 22 23:03:44 2021 rev:46 rq:932376 version:1.4.12

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-10-20 
20:24:38.737391457 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1895/containerd.changes  
2021-11-22 23:03:51.417997889 +0100
@@ -1,0 +2,6 @@
+Fri Nov 19 00:01:23 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.12 for Docker 20.10.11-ce.
+  bsc#1192814 CVE-2021-41190
+
+---

Old:

  containerd-1.4.11_5b46e404f6b9.tar.xz

New:

  containerd-1.4.12_7b11cfaabd73.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.a4lB4I/_old  2021-11-22 23:03:52.081995661 +0100
+++ /var/tmp/diff_new_pack.a4lB4I/_new  2021-11-22 23:03:52.085995648 +0100
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 5b46e404f6b9f661a205e28d59c982d3634148f8
-%define git_short   5b46e404f6b9
+%define git_version 7b11cfaabd73bb80907dd23182b9347b4245eb5d
+%define git_short   7b11cfaabd73
 
 Name:   containerd
-Version:1.4.11
+Version:1.4.12
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.a4lB4I/_old  2021-11-22 23:03:52.113995554 +0100
+++ /var/tmp/diff_new_pack.a4lB4I/_new  2021-11-22 23:03:52.113995554 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.11_%h
-v1.4.11
+1.4.12_%h
+v1.4.12
 .git
   
   

++ containerd-1.4.11_5b46e404f6b9.tar.xz -> 
containerd-1.4.12_7b11cfaabd73.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.4.11_5b46e404f6b9/.github/workflows/ci.yml 
new/containerd-1.4.12_7b11cfaabd73/.github/workflows/ci.yml
--- old/containerd-1.4.11_5b46e404f6b9/.github/workflows/ci.yml 2021-10-04 
17:24:47.0 +0200
+++ new/containerd-1.4.12_7b11cfaabd73/.github/workflows/ci.yml 2021-11-17 
20:52:12.0 +0100
@@ -26,7 +26,7 @@
   - name: Install Go
 uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
@@ -82,7 +82,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
@@ -128,7 +128,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
@@ -166,7 +166,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
@@ -199,7 +199,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
@@ -285,7 +285,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Set env
 shell: bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.4.11_5b46e404f6b9/.github/workflows/nightly.yml 
new/containerd-1.4.12_7b11cfaabd73/.github/workflows/nightly.yml
--- old/containerd-1.4.11_5b46e404f6b9/.github/workflows/nightly.yml
2021-10-04 17:24:47.0 +0200
+++ new/containerd-1.4.12_7b11cfaabd73/.github/workflows/nightly.yml
2021-11-17 20:52:12.0 +0100
@@ -14,7 +14,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Checkout
 uses: actions/checkout@v1
@@ -138,7 +138,7 @@
 steps:
   - uses: actions/setup-go@v2
 with:
-  go-version: '1.16.8'
+  go-version: '1.16.10'
 
   - name: Checkout
 uses: actions/checkout@v1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/containerd-1.4.11_5b46e404f6b9/.github/workflows/release.yml 
new/containerd-1.4.12_7b11cfaabd73/.github/workflows/release.yml
--- old/containerd-1.4.11_5b46e404f6b9/.github/workflows/release.yml
2021-10-04 17:24:47.0 +0200
+++ n

commit containerd for openSUSE:Factory

2021-10-20 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-10-20 20:23:49

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1890 (New)


Package is "containerd"

Wed Oct 20 20:23:49 2021 rev:45 rq:926019 version:1.4.11

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-10-11 
15:30:19.670720935 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1890/containerd.changes  
2021-10-20 20:24:38.737391457 +0200
@@ -7,0 +8,11 @@
+Wed Oct  6 02:54:49 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.11, to fix CVE-2021-41103 bsc#1191121. bsc#1191355
+- Switch to Go 1.16.x compiler, in line with upstream.
+
+---
+Fri Oct  1 06:59:50 UTC 2021 - Dan ??erm??k 
+
+- Install systemd service file as well (fixes bsc#1190826)
+
+---

New:

  containerd.service



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.pckUW7/_old  2021-10-20 20:24:39.253391776 +0200
+++ /var/tmp/diff_new_pack.pckUW7/_new  2021-10-20 20:24:39.253391776 +0200
@@ -35,6 +35,7 @@
 URL:https://containerd.tools
 Source: %{name}-%{version}_%{git_short}.tar.xz
 Source1:%{name}-rpmlintrc
+Source2:%{name}.service
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go-go-md2man
@@ -121,6 +122,9 @@
 install -d -m755 %{buildroot}/%{_sysconfdir}/%{name}
 echo "# See containerd-config.toml(5) for documentation." 
>%{buildroot}/%{_sysconfdir}/%{name}/config.toml
 
+# Install system service
+install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+
 # Man pages.
 # TODO: Fix man page generation.
 #for file in man/*
@@ -132,6 +136,18 @@
 
 %fdupes %{buildroot}
 
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+
+%preun
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+
 %files
 %defattr(-,root,root)
 %doc README.md
@@ -140,6 +156,7 @@
 %config %{_sysconfdir}/%{name}/config.toml
 %{_sbindir}/containerd
 %{_sbindir}/containerd-shim*
+%{_unitdir}/%{name}.service
 # TODO: Fix man page generation.
 #%{_mandir}/man*/%{name}*
 #%exclude %{_mandir}/man1/*ctr.1*

++ containerd.service ++
# Copyright The containerd Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Modifications by SUSE LLC under the same license

[Unit]
Description=containerd container runtime
Documentation=https://containerd.io
After=network.target local-fs.target
Conflicts=docker.service

[Service]
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/sbin/containerd

Type=notify
Delegate=yes
KillMode=process
Restart=always
RestartSec=5
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC=infinity
LimitCORE=infinity
LimitNOFILE=1048576
# Comment TasksMax if your systemd version does not supports it.
# Only systemd 226 and above support this version.
TasksMax=infinity
OOMScoreAdjust=-999

[Install]
WantedBy=multi-user.target

commit containerd for openSUSE:Factory

2021-10-11 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-10-11 15:30:17

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.2443 (New)


Package is "containerd"

Mon Oct 11 15:30:17 2021 rev:44 rq:923377 version:1.4.11

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-07-28 
19:19:28.415680106 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.2443/containerd.changes  
2021-10-11 15:30:19.670720935 +0200
@@ -1,0 +2,6 @@
+Wed Oct  6 02:54:49 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.11, to fix CVE-2021-41103. bsc#1191355
+- Switch to Go 1.16.x compiler, in line with upstream.
+
+---

Old:

  containerd-1.4.8_7eba5930496d.tar.xz

New:

  containerd-1.4.11_5b46e404f6b9.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.sI7HjO/_old  2021-10-11 15:30:20.306721955 +0200
+++ /var/tmp/diff_new_pack.sI7HjO/_new  2021-10-11 15:30:20.310721961 +0200
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 7eba5930496d9bbe375fdf71603e610ad737d2b2
-%define git_short   7eba5930496d
+%define git_version 5b46e404f6b9f661a205e28d59c982d3634148f8
+%define git_short   5b46e404f6b9
 
 Name:   containerd
-Version:1.4.8
+Version:1.4.11
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
@@ -42,8 +42,8 @@
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
 # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.15' here, so just require 1.15 exactly. bsc#1172608
-BuildRequires:  go1.15
+# for 'golang(API) >= 1.16' here, so just require 1.16 exactly. bsc#1172608
+BuildRequires:  go1.16
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same
@@ -91,6 +91,7 @@
 # will get confused by symlinks.
 export GOPATH=$HOME/go
 export PROJECT=$HOME/go/src/github.com/containerd/containerd
+export GO111MODULE=off
 mkdir -p $PROJECT
 rm -rf $PROJECT/*
 cp -ar * $PROJECT

++ _service ++
--- /var/tmp/diff_new_pack.sI7HjO/_old  2021-10-11 15:30:20.346722019 +0200
+++ /var/tmp/diff_new_pack.sI7HjO/_new  2021-10-11 15:30:20.346722019 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.8_%h
-v1.4.8
+1.4.11_%h
+v1.4.11
 .git
   
   

++ containerd-1.4.8_7eba5930496d.tar.xz -> 
containerd-1.4.11_5b46e404f6b9.tar.xz ++
 8379 lines of diff (skipped)

commit containerd for openSUSE:Factory

2021-07-28 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-07-28 19:19:27

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.1899 (New)


Package is "containerd"

Wed Jul 28 19:19:27 2021 rev:43 rq:908505 version:1.4.8

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-07-20 
15:38:44.713395234 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.1899/containerd.changes  
2021-07-28 19:19:28.415680106 +0200
@@ -16,0 +17,5 @@
+Wed Jul  7 17:20:53 UTC 2021 - Bernhard Wiedemann 
+
+- Build with go1.15 for reproducible build results (boo#1102408)
+
+---



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.o54IPZ/_old  2021-07-28 19:19:28.911679455 +0200
+++ /var/tmp/diff_new_pack.o54IPZ/_new  2021-07-28 19:19:28.915679449 +0200
@@ -42,8 +42,8 @@
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
 # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.13' here, so just require 1.13 exactly. bsc#1172608
-BuildRequires:  go1.13
+# for 'golang(API) >= 1.15' here, so just require 1.15 exactly. bsc#1172608
+BuildRequires:  go1.15
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same

commit containerd for openSUSE:Factory

2021-07-20 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-07-20 15:38:39

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.2632 (New)


Package is "containerd"

Tue Jul 20 15:38:39 2021 rev:42 rq:907281 version:1.4.8

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-04-18 
21:45:25.832754323 +0200
+++ /work/SRC/openSUSE:Factory/.containerd.new.2632/containerd.changes  
2021-07-20 15:38:44.713395234 +0200
@@ -1,0 +2,15 @@
+Tue Jul 20 09:30:30 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.8, to fix CVE-2021-32760. bsc#1188282
+- Remove upstreamed patches:
+  - bsc1188282-use-chmod-path-for-checking-symlink.patch
+
+---
+Wed Jul 14 10:23:38 UTC 2021 - Aleksa Sarai 
+
+[ This patch was only released in SLES and Leap. ]
+
+- Add patch for GHSA-c72p-9xmj-rx3w. CVE-2021-32760 bsc#1188282
+  + bsc1188282-use-chmod-path-for-checking-symlink.patch
+
+---

Old:

  containerd-1.4.4_05f951a3781f.tar.xz

New:

  containerd-1.4.8_7eba5930496d.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.p7kpUW/_old  2021-07-20 15:38:45.169396050 +0200
+++ /var/tmp/diff_new_pack.p7kpUW/_new  2021-07-20 15:38:45.169396050 +0200
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 05f951a3781f4f2c1911b05e61c160e9c30eaa8e
-%define git_short   05f951a3781f
+%define git_version 7eba5930496d9bbe375fdf71603e610ad737d2b2
+%define git_short   7eba5930496d
 
 Name:   containerd
-Version:1.4.4
+Version:1.4.8
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.p7kpUW/_old  2021-07-20 15:38:45.201396107 +0200
+++ /var/tmp/diff_new_pack.p7kpUW/_new  2021-07-20 15:38:45.201396107 +0200
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.4_%h
-v1.4.4
+1.4.8_%h
+v1.4.8
 .git
   
   

++ containerd-1.4.4_05f951a3781f.tar.xz -> 
containerd-1.4.8_7eba5930496d.tar.xz ++
 86263 lines of diff (skipped)

commit containerd for openSUSE:Factory

2021-04-18 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-04-18 21:45:15

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.12324 (New)


Package is "containerd"

Sun Apr 18 21:45:15 2021 rev:41 rq:886280 version:1.4.4

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-03-12 
13:31:03.946136151 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.12324/containerd.changes 
2021-04-18 21:45:25.832754323 +0200
@@ -1,0 +2,7 @@
+Fri Apr 16 05:25:40 UTC 2021 - Aleksa Sarai 
+
+- Drop long-since upstreamed patch, originally needed to fix i386 builds on
+  SLES:
+  - 0001-makefile-remove-emoji.patch
+
+---

Old:

  0001-makefile-remove-emoji.patch



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.T3uiRU/_old  2021-04-18 21:45:26.308755127 +0200
+++ /var/tmp/diff_new_pack.T3uiRU/_new  2021-04-18 21:45:26.308755127 +0200
@@ -35,8 +35,6 @@
 URL:https://containerd.tools
 Source: %{name}-%{version}_%{git_short}.tar.xz
 Source1:%{name}-rpmlintrc
-# OPENSUSE-FIX-UPSTREAM: Backport of 
https://github.com/containerd/containerd/pull/2764.
-Patch1: 0001-makefile-remove-emoji.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go-go-md2man
@@ -83,7 +81,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
-%patch1 -p1
 
 %build
 # NOTE: containerd will switch to go.mod in 1.5.x so this can be removed after

commit containerd for openSUSE:Factory

2021-03-12 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-03-12 13:30:48

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.2401 (New)


Package is "containerd"

Fri Mar 12 13:30:48 2021 rev:40 rq:877351 version:1.4.4

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-02-10 
21:30:33.606299478 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.2401/containerd.changes  
2021-03-12 13:31:03.946136151 +0100
@@ -1,0 +2,5 @@
+Sat Mar  6 07:17:00 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.4, to fix CVE-2021-21334.
+
+---
@@ -13,0 +19 @@
+  bsc#1183024

Old:

  containerd-1.4.3_269548fa27e0.tar.xz

New:

  containerd-1.4.4_05f951a3781f.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.bEEBF9/_old  2021-03-12 13:31:04.978137599 +0100
+++ /var/tmp/diff_new_pack.bEEBF9/_new  2021-03-12 13:31:04.978137599 +0100
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 269548fa27e0089a8b8278fc4fc781d7f65a939b
-%define git_short   269548fa27e0
+%define git_version 05f951a3781f4f2c1911b05e61c160e9c30eaa8e
+%define git_short   05f951a3781f
 
 Name:   containerd
-Version:1.4.3
+Version:1.4.4
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.bEEBF9/_old  2021-03-12 13:31:05.010137644 +0100
+++ /var/tmp/diff_new_pack.bEEBF9/_new  2021-03-12 13:31:05.010137644 +0100
@@ -3,8 +3,8 @@
 https://github.com/containerd/containerd.git
 git
 containerd
-1.4.3_%h
-v1.4.3
+1.4.4_%h
+v1.4.4
 .git
   
   

++ containerd-1.4.3_269548fa27e0.tar.xz -> 
containerd-1.4.4_05f951a3781f.tar.xz ++
 4180 lines of diff (skipped)

commit containerd for openSUSE:Factory

2021-02-10 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-02-10 21:30:23

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.28504 (New)


Package is "containerd"

Wed Feb 10 21:30:23 2021 rev:39 rq:870779 version:1.4.3

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2021-02-04 
20:23:38.810787223 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.28504/containerd.changes 
2021-02-10 21:30:33.606299478 +0100
@@ -25 +25 @@
-  boo#1176708
+  boo#1176708 bsc#1177598 CVE-2020-15157
@@ -44 +44 @@
-  bsc#1153367
+  bsc#1153367 bsc#1157330
@@ -108,0 +109 @@
+



Other differences:
--

commit containerd for openSUSE:Factory

2021-02-04 Thread Source-Sync 
Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerd for openSUSE:Factory 
checked in at 2021-02-04 20:22:51

Comparing /work/SRC/openSUSE:Factory/containerd (Old)
 and  /work/SRC/openSUSE:Factory/.containerd.new.28504 (New)


Package is "containerd"

Thu Feb  4 20:22:51 2021 rev:38 rq:869058 version:1.4.3

Changes:

--- /work/SRC/openSUSE:Factory/containerd/containerd.changes2020-12-23 
14:20:31.473683427 +0100
+++ /work/SRC/openSUSE:Factory/.containerd.new.28504/containerd.changes 
2021-02-04 20:23:38.810787223 +0100
@@ -1,0 +2,14 @@
+Tue Feb  2 05:33:02 UTC 2021 - Aleksa Sarai 
+
+- Update to handle the docker-runc removal, and drop the -kubic flavour.
+  bsc#1181677 bsc#1181749
+
+---
+Fri Jan 29 23:24:30 UTC 2021 - Aleksa Sarai 
+
+- Update to containerd v1.4.3, which is needed for Docker v20.10.2-ce.
+  bsc#1181594
+- Install the containerd-shim* binaries and stop creating
+  docker-containerd-shim because that isn't used by Docker anymore.
+
+---

Old:

  _multibuild
  containerd-1.3.9_ea765aba0d05.tar.xz

New:

  containerd-1.4.3_269548fa27e0.tar.xz



Other differences:
--
++ containerd.spec ++
--- /var/tmp/diff_new_pack.Ezsv8H/_old  2021-02-04 20:23:39.338788027 +0100
+++ /var/tmp/diff_new_pack.Ezsv8H/_new  2021-02-04 20:23:39.342788033 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package containerd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,30 +22,19 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-# Handle _multibuild magic.
-%define flavour @BUILD_FLAVOR@%{nil}
-
-# We split the Name: into "realname" and "name_suffix".
-%define realname containerd
-%if "%flavour" == ""
-%define name_suffix %{nil}
-%else
-%define name_suffix -%{flavour}
-%endif
-
 # MANUAL: Update the git_version.
-%define git_version ea765aba0d05254012b0b9e595e995c09186427f
-%define git_short   ea765aba0d05
+%define git_version 269548fa27e0089a8b8278fc4fc781d7f65a939b
+%define git_short   269548fa27e0
 
-Name:   %{realname}%{name_suffix}
-Version:1.3.9
+Name:   containerd
+Version:1.4.3
 Release:0
 Summary:Standalone OCI Container Daemon
 License:Apache-2.0
 Group:  System/Management
 URL:https://containerd.tools
-Source: %{realname}-%{version}_%{git_short}.tar.xz
-Source1:%{realname}-rpmlintrc
+Source: %{name}-%{version}_%{git_short}.tar.xz
+Source1:%{name}-rpmlintrc
 # OPENSUSE-FIX-UPSTREAM: Backport of 
https://github.com/containerd/containerd/pull/2764.
 Patch1: 0001-makefile-remove-emoji.patch
 BuildRequires:  fdupes
@@ -61,25 +50,15 @@
 Provides:   %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same
 # flavour as us, to avoid mixing (the version pinning is done by docker.spec).
-Requires:   docker-runc%{name_suffix}
+Requires:   runc
 Requires(post): %fillup_prereq
+# KUBIC-SPECIFIC: There used to be a kubic-specific containerd package, but now
+# it's been merged into the one package. bsc#1181677
+Obsoletes:  %{name}-kubic < %{version}
+Provides:   %{name}-kubic = %{version}
+Obsoletes:  %{name} = 0.2.5+gitr569_2a5e70c
+Obsoletes:  %{name}_2a5e70c
 ExcludeArch:s390
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything was renamed to -kubic. It also is
-# used to ensure that nothing complains too much when using
-# -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete older package without -kubic suffix: v2 -> v3
-Obsoletes:  %{realname} = 0.2.5+gitr569_2a5e70c
-Obsoletes:  %{realname}_2a5e70c
-# Conflict with non-kubic package, and provide equivalent
-Conflicts:  %{realname} > 0.2.5+gitr569_2a5e70c
-Provides:   %{realname} = %{version}
-# Disable leap based builds for kubic flavor (bsc#1121412)
-%if 0%{?suse_version} == 1500 && 0%{?is_opensuse}
-ExclusiveArch:  do_not_build
-%endif
-%endif
 
 %description
 Containerd is a daemon with an API and a command line client, to manage
@@ -92,27 +71,24 @@
 Summary:Client for %{name}
 Group:  System/Management
 Requires:   %{name} = %{version}
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything