[rpms/containerd] rawhide: Update to release v2.3.0

[Bradley G Smith <bradley.g.smith@gmail.com>]

            A new commit has been pushed.

            Repo   : rpms/containerd
            Branch : rawhide
            Commit : 01ff67d7c239947191173d543174fa75b61d3065
            Author : Bradley G Smith <bradley.g.smith@gmail.com>
            Date   : 2026-05-01T14:17:51-07:00
            Stats  : +92/-70 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/containerd/c/01ff67d7c239947191173d543174fa75b61d3065?branch=rawhide

            Log:
            Update to release v2.3.0

- Refreshed spec file using go2rpm
- Build now using gobuild macro for most binaries.
- 'go build' is used for containerd-shim-runc-v2 to emulate makefile
  static build

Signed-off-by: Bradley G Smith <bradley.g.smith@gmail.com>

---
diff --git a/containerd.spec b/containerd.spec
index 33bd72d..00b39ee 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -1,26 +1,23 @@
-# Generated by go2rpm 1.11.0
-%bcond_without check
+# Generated by go2rpm 1.19.0
+%bcond check 1
 
 # https://github.com/containerd/containerd
-%global goipath         github.com/containerd/containerd
-Version:                2.2.3
-%global tag             v%{gsub %{version} ~ -}
+%global goipath         github.com/containerd/containerd/v2
+Version:                2.3.0
+%{lua:
+    local version0 = rpm.expand("%{version}"):gsub("~", "-")
+    rpm.define("tag " .. "v" .. version0)
+    rpm.define("origversion " .. version0)
+}
 
 %gometa -L -f
 
-%global common_description %{expand:
-Containerd is an industry-standard container runtime with an emphasis on
-simplicity, robustness and portability. It is available as a daemon for Linux
-and Windows, which can manage the complete container lifecycle of its host
-system: image transfer and storage, container execution and supervision,
-low-level storage and network attachments, etc.}
 
 Name:           containerd
 Release:        %autorelease
 Summary:        An open and reliable container runtime
 
 # Generated by go-vendor-tools
-# SourceLicense:  Apache-2.0
 License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
@@ -29,23 +26,22 @@ Source1:        %{archivename}-vendor.tar.bz2
 Source2:        go-vendor-tools.toml
 Source3:        containerd.toml
 
-Patch:          0001-Makefile-adjust-GO_LDFLAGS-quoting.patch
-
 BuildRequires:  /usr/bin/go-md2man
 BuildRequires:  btrfs-progs-devel
 BuildRequires:  go-vendor-tools
 BuildRequires:  make
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  procps-ng
+BuildRequires:  git-core
 
-Requires:       runc
 
-%description %{common_description}
+%description
+An open and reliable container runtime.
 
 %prep
-%goprep -A
-%setup -q -T -D -a1 %{forgesetupargs}
-%autopatch -p1
+%goprep -p1
+tar -xf %{S:1}
+
 # Replace default bin directory
 sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service
 cp -p %{S:3} .
@@ -54,30 +50,75 @@ cp -p %{S:3} .
 %go_vendor_license_buildrequires -c %{S:2}
 
 %build
-GO_LDFLAGS="" GO_BUILDFLAGS=""
-%global makeflags %{expand:\\
-    DATADIR=%{_datadir} \\
-    DESTDIR=%{buildroot} \\
-    EXTRA_LDFLAGS=%{gobuild_ldflags_shescaped} \\
-    GO_BUILD_FLAGS=%{gobuild_baseflags_shescaped} \\
-    MANDIR=%{_mandir} \\
-    PREFIX=%{_prefix} \\
-    REVISION=%{release} \\
-    SHIM_CGO_ENABLED=1 \\
-    VERSION=%{gsub %{version} ~ -} \\
-}
-%make_build %{makeflags} binaries man
+%global gomodulesmode GO111MODULE=on
+
+# buildtag as set in MAKEFILE
+export GO_BUILDTAGS="urfave_cli_no_docs"
+
+# generate GO_LDFLAGS and drop go macro settings for version, tag, commit
+export GO_LDFLAGS=" -X %{goipath}/version.Version=%{version} -X %{goipath}/version.Revision=%{release} -X %{goipath}/version.Package=%{goipath} "
+%global currentgoldflags  %{nil}
+
+# commands to build
+for cmd in \
+   ctr \
+   containerd \
+   containerd-stress ; do
+  %gobuild -o %{gobuilddir}/bin/$cmd %{goipath}/cmd/$cmd
+done
+
+# create man pages
+# drop gen-manpages utility in temp ./man dir
+mkdir -p man
+GO_BUILDTAGS=""
+%gobuild -o man/gen-manpages %{goipath}/cmd/gen-manpages
+man/gen-manpages ctr.8        man
+man/gen-manpages containerd.8 man
+go-md2man -in "docs/man/containerd-config.8.md"      -out "man/containerd-config.8"
+go-md2man -in "docs/man/containerd-config.toml.5.md" -out "man/containerd-config.toml.5"
+rm man/gen-manpages
+
+# shim explicity build with static; mimic makefile settings
+export CGO_ENABLED=0
+GO_BUILDTAGS="urfave_cli_no_docs no_grpc"
+GO_LDFLAGS="$GO_LDFLAGS -extldflags \"-static\" -s -w"
+go build \
+    %{gobuild_baseflags} \
+    -ldflags  "$GO_LDFLAGS " \
+    -o %{gobuilddir}/bin/containerd-shim-runc-v2 \
+    %{goipath}/cmd/containerd-shim-runc-v2
+
+#  
+#    %%(echo -n %%{gobuild_ldflags}|sed 's/-linkmode=external //') " \
 
 %install
 %go_vendor_license_install -c %{S:2}
-%make_build %{makeflags} install install-man
-install -Dpm 0644 containerd.service -t %{buildroot}%{_unitdir}
-install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.toml
+
+# binaries
+install -m 0755 -vd                     %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+
+# systemd service file
+install -d -m 0755 %{buildroot}%{_unitdir}
+install -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service
+
+# /etc/containerd/config.toml
+install -d -m 0755 %{buildroot}%{_sysconfdir}/containerd
+install -p -m 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.toml
+
+# man pages
+install -d -m 0755 %{buildroot}%{_mandir}/man5
+install -p -m 0644 man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5
+
+install -d -m 0755 %{buildroot}%{_mandir}/man8
+install -p -m 0644 man/ctr.8                    %{buildroot}%{_mandir}/man8
+install -p -m 0644 man/containerd.8             %{buildroot}%{_mandir}/man8
+install -p -m 0644 man/containerd-config.8      %{buildroot}%{_mandir}/man8
 
 %check
 %go_vendor_license_check -c %{S:2}
+
 %if %{with check}
-# %%make_build %%{makeflags} test
 %global test_ignores %{shrink:
     %dnl tests below fail with create tmp file: open ... invalid argument
     -s "TestWriterTruncateRecoversFromIncompleteWrite"
@@ -109,7 +150,6 @@ install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.t
 %systemd_postun_with_restart containerd.service
 
 %files -f %{go_vendor_license_filelist}
-%license vendor/modules.txt
 %doc ROADMAP.md ADOPTERS.md BUILDING.md README.md RELEASES.md SCOPE.md
 %{_bindir}/ctr
 %{_bindir}/containerd
@@ -123,6 +163,5 @@ install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.t
 %config(noreplace) %{_sysconfdir}/containerd/config.toml
 %{_unitdir}/containerd.service
 
-
 %changelog
 %autochangelog

diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
index f72fa65..4e0c880 100644
--- a/go-vendor-tools.toml
+++ b/go-vendor-tools.toml
@@ -1,37 +1,13 @@
-[licensing]
-detector = "trivy"
-
-exclude_directories = [
-    ".devcontainer",
-    "contrib",
-    "script",
-    "test",
-]
+[archive]
 
+[licensing]
+detector = "askalono"
 [[licensing.licenses]]
 path = "vendor/github.com/grpc-ecosystem/go-grpc-middleware/v2/COPYRIGHT"
 sha256sum = "8befb41eac649775143c81fddaf84b7d7e1197899d968b8b51cfec405f2ff72f"
 expression = "Apache-2.0"
 
 [[licensing.licenses]]
-path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE"
-sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723"
-expression = "Apache-2.0"
-
-[[licensing.licenses]]
-path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD"
-sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d"
-expression = "BSD-3-Clause"
-
-[[licensing.licenses]]
-path = "vendor/go.yaml.in/yaml/v2/LICENSE.libyaml"
-sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a"
-expression = "MIT"
-[[licensing.licenses]]
-path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.BSD"
-sha256sum = "26be8a79415737dfe8edf1be62e71afeb8c770ed5a5605a06270d5701830f47c"
-expression = "BSD-3-Clause"
-[[licensing.licenses]]
-path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.MPL-2.0"
-sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04"
-expression = "MPL-2.0"
+path = "vendor/gopkg.in/yaml.v3/LICENSE"
+sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
+expression = "MIT AND (MIT AND Apache-2.0)"

diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..257632e
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,7 @@
+---
+# temporarily skip broken branch protection test. should be fixed in
+# annochec annobin-13.14
+ annocheck:
+    extra_opts:
+        - hardened: --skip-branch-protection
+...

diff --git a/sources b/sources
index 1986e2b..60036b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (containerd-2.2.3.tar.gz) = 3e8563095c3859f2f58d0f7c5bbe6ba1c3265623ccc89ac7ff163818369097a60f58e133a6eebf5adea5f5308f95e01c43da5c3d4ab99413f0e5fd51c6904432
-SHA512 (containerd-2.2.3-vendor.tar.bz2) = c568ff2ccabd85ccc191e68e72a4b6ca7407d2bf2b0167b8f9109a654f5bb13b718c9c48a617dccde8c10269c8641237d14c24c3ca8019e4f21f609fb8e5c82e
+SHA512 (containerd-2.3.0.tar.gz) = d7c26fd6fd46dd4380652a501b16a8afc478a66f287825df5224048894f02465770d5e89e52ea7366c1ea4013547be94af066dac33419320257bdd4761a48160
+SHA512 (containerd-2.3.0-vendor.tar.bz2) = cb22d1ae8215da265be6fcd4bd7515bf3981dc72c722f91338206910a59b2bbcbfe7915a576159b9ae30040dcbdb87ec5ae42510003a0227fbe4d367c9d9ec99