浏览代码

updated 4 packages

containerd-1.7.20-1

docker-compose-2.29.1-1

moby-engine-27.1.1-1

runc-1.1.13-1
Tomohiro "Tomo-p" KATO 4 月之前
父节点
当前提交
f23ec2f241
共有 4 个文件被更改,包括 848 次插入68 次删除
  1. 111 0
      c/containerd/containerd-vl.spec
  2. 48 68
      d/docker-compose/docker-compose-vl.spec
  3. 570 0
      m/moby-engine/moby-engine-vl.spec
  4. 119 0
      r/runc/runc-vl.spec

+ 111 - 0
c/containerd/containerd-vl.spec

@@ -0,0 +1,111 @@
+%bcond_with systemd
+%bcond_without check
+
+Name:           containerd
+Version:        1.7.20
+Release:        1%{_dist_release}%{?with_systemd:.systemd}
+Summary:        An open and reliable container runtime
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+# 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:            https://github.com/containerd/containerd
+Source0:        https://github.com/containerd/containerd/archive/refs/tags/v%{version}.tar.gz#/containerd-%{version}.tar.gz
+
+Patch:          0001-Makefile-fix-GO_LDFLAGS-quoting.patch
+
+%if %{with man}
+BuildRequires:  /usr/bin/go-md2man
+%endif
+BuildRequires:  btrfs-progs-devel
+BuildRequires:  libseccomp-devel
+BuildRequires:  make
+BuildRequires:  golang
+
+Requires:       runc
+
+%description
+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.
+
+
+%prep
+%setup -q
+%autopatch -p1
+# Replace default bin directory
+sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service
+
+
+%build
+GO_LDFLAGS="-s -w" GO_BUILDFLAGS="-E -trimpath"
+%global makeflags %{expand:\\
+    DATADIR=%{_datadir} \\
+    DESTDIR=%{buildroot} \\
+    MANDIR=%{_mandir} \\
+    PREFIX=%{_prefix} \\
+    SHIM_CGO_ENABLED=1 \\
+    BUILDTAGS="apparmor selinux seccomp" \\
+    VERSION=%{version} \\
+    REVISION=%{release} \\
+}
+%if %{with man}
+%make_build %{makeflags} binaries man
+%else
+%make_build %{makeflags} binaries
+%endif
+
+
+%install
+%if %{with man}
+%make_build %{makeflags} install install-man
+%else
+%make_build %{makeflags} install
+%endif
+
+# Set up dummy configuration.
+install -d -m755 %{buildroot}/%{_sysconfdir}/%{name}
+echo "# See containerd-config.toml(5) for documentation." >%{buildroot}/%{_sysconfdir}/%{name}/config.toml
+
+%if %{with systemd}
+install -Dpm 0644 containerd.service -t %{buildroot}%{_unitdir}
+%endif
+
+
+%check
+%if %{with check}
+%make_build %{makeflags} test
+%endif
+
+
+%files
+%license vendor/modules.txt
+%doc ROADMAP.md ADOPTERS.md BUILDING.md README.md RELEASES.md SCOPE.md
+%{_bindir}/ctr
+%{_bindir}/containerd
+%{_bindir}/containerd-stress
+%{_bindir}/containerd-shim*
+%if %{with man}
+%{_mandir}/man5/containerd-config.toml.5*
+%{_mandir}/man8/ctr.8*
+%{_mandir}/man8/containerd.8*
+%{_mandir}/man8/containerd-config.8*
+%endif
+%dir %{_sysconfdir}/containerd
+%config(noreplace) %{_sysconfdir}/containerd/config.toml
+%if %{with systemd}
+%{_unitdir}/containerd.service
+%endif
+
+
+%changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.20-1
+- new upstream release.
+
+* Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.19-1
+- initial build for Vine Linux.

+ 48 - 68
d/docker-compose/docker-compose-vl.spec

@@ -1,91 +1,71 @@
-%bcond_with build_nosrc
-
-%if !%{with build_nosrc}
-%global _disable_source_fetch 0
-%endif
-
-Name: docker-compose
-Summary: Define and run multi-container applications with Docker
-Version: 2.18.1
-Release: 1%{?_dist_release}
-Group: admin-tools,virtualization
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
-License: ASL 2.0
-URL: https://www.docker.com
-Source0: https://github.com/docker/compose/releases/download/v%{version}/docker-compose-linux-x86_64#/docker-compose-%{version}
-Source1: https://raw.githubusercontent.com/docker/compose/%{version}/README.md
-Source2: https://raw.githubusercontent.com/docker/compose/%{version}/LICENSE
-
-%if %{with build_nosrc}
-NoSource: 0
-NoSource: 1
-NoSource: 2
-%endif
-
-Requires: docker-ce-cli
+Name:           docker-compose
+Summary:        Define and run multi-container applications with Docker
+Version:        2.29.1
+Release:        1%{_dist_release}
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        Apache-2.0
+URL:            https://github.com/docker/compose
+Source:         https://github.com/docker/compose/archive/refs/tags/v%{version}.tar.gz#/compose-%{version}.tar.gz
+# GOPROXY=https://proxy.golang.org,direct go mod vendor
+Source1:        vendor.tar.xz
+BuildRequires:  golang
+Requires:       moby-engine
 
 %description
-Compose is a tool for defining and running multi-container Docker applications. With Compose, you use a Compose file to configure your application's services. Then, using a single command, you create and start all the services from your configuration.
+Docker Compose is a tool for running multi-container applications on Docker defined using the Compose file format. A Compose file is used to define how the one or more containers that make up your application are configured. Once you have a Compose file, you can create and start your application with a single command: docker compose up.
+About update and backward compatibility
+
+Docker Compose V2 is a major version bump release of Docker Compose. It has been completely rewritten from scratch in Golang (V1 was in Python). The installation instructions for Compose V2 differ from V1. V2 is not a standalone binary anymore, and installation scripts will have to be adjusted. Some commands are different.
+
+For a smooth transition from legacy docker-compose 1.xx, please consider installing compose-switch to translate docker-compose ... commands into Compose V2's docker compose .... . Also check V2's --compatibility flag.
 
 
 %prep
+%setup -q -a 1 -n compose-%{version}
 
 
 %build
+go build \
+   -mod=vendor \
+   -buildmode=pie \
+   -trimpath \
+   -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=%{version}" \
+   -o _build/docker-compose ./cmd/
 
 
 %install
-# install binary
-install -d %{buildroot}%{_bindir}
+install -Dpm 0755 _build/%{name} %{buildroot}%{_bindir}/%{name}
+mkdir -p %{buildroot}/usr/lib/docker/cli-plugins
+ln -sf ../../../bin/%{name} %{buildroot}/usr/lib/docker/cli-plugins/%{name}
+
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+ln -sf docker %{buildroot}%{_datadir}/bash-completion/completions/docker-compose
 
-install -p -m 755 %{SOURCE0} %{buildroot}%{_bindir}/docker-compose
-install -p -m 755 %{SOURCE1} ./
-install -p -m 755 %{SOURCE2} ./
+
+%pre
+if [ -e /usr/lib/docker/cli-plugins/%{name} -a ! -L /usr/lib/docker/cli-plugins/%{name} ]; then
+	rm -f /usr/lib/docker/cli-plugins/%{name}
+fi
 
 
 %files
-%defattr(-,root,root,-)
 %license LICENSE
 %doc README.md
-%{_bindir}/docker-compose
+%{_bindir}/*
+%dir /usr/lib/docker/
+%dir /usr/lib/docker/cli-plugins/
+/usr/lib/docker/cli-plugins/%{name}
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/docker-compose
 
 
 %changelog
-* Thu Jun 08 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.18.1-1
-- new upstream release.
-
-* Mon Feb 13 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.16.0-1
-- new upstream release.
-
-* Mon Sep 12 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.2-1
-- new upstream release.
-
-* Tue Dec 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.2-1
-- new upstream release.
-
-* Wed Dec 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.1-1
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.29.1-1
 - new upstream release.
 
-* Wed May 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.29.2-1
-- new upstream release.
-
-* Thu Feb 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.28.2-1
-- new upstream release.
-
-* Thu Dec 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.27.4-1
-- new upstream release.
-
-* Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.2-1
-- new upstream release.
-
-* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.25.4-1
-- new upstream release.
-
-* Thu Oct 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.24.1-2
-- rebuilt to upload to VineSeed official repository.
-
-* Tue Aug 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.24.1-1
+* Tue Jul 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.28.1-1
 - initial build for Vine Linux.

+ 570 - 0
m/moby-engine/moby-engine-vl.spec

@@ -0,0 +1,570 @@
+%bcond_with systemd
+%bcond_with man
+
+# moby
+%global goipath_moby github.com/docker/docker
+%global git_moby https://%%{goipath_moby}
+#%%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d
+#%%global shortcommit_moby %%(c=%%{commit_moby}; echo ${c:0:7})
+
+# cli
+%global goipath_cli github.com/docker/cli
+%global git_cli https://%%{goipath_cli}
+#%%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49
+#%%global shortcommit_cli %%(c=%%{commit_cli}; echo ${c:0:7})
+
+# tini
+%global git_tini https://github.com/krallin/tini
+%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4
+%global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
+
+Name:           moby-engine
+Summary:        The open-source application container engine
+Version:        27.1.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        Apache-2.0
+URL:            https://www.docker.com
+Source0:        %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz
+Source1:        %{git_cli}/archive/refs/tags/v%{version}.tar.gz#/cli-%{version}.tar.gz
+Source2:        %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz
+Source3:        docker.service
+Source4:        docker.sysconfig
+Source5:        moby-engine-systemd-sysusers.conf
+
+Source100:      docker.init
+Source101:      docker.sysconfig-sysvinit
+
+# Specfile license
+Source200:      moby-engine.spec.license
+
+ExclusiveArch:  i686 x86_64
+
+BuildRequires:  containerd
+BuildRequires:  btrfs-progs-devel
+BuildRequires:  device-mapper-devel
+BuildRequires:  golang
+BuildRequires:  pkgconfig(libseccomp) >= 2.3.0
+BuildRequires:  make
+BuildRequires:  pkgconfig(audit)
+
+# Build dependencies for tini
+BuildRequires:  cmake
+BuildRequires:  glibc-static
+
+# required packages on install
+Requires:       containerd
+Requires:       iptables
+Requires:       runc
+Requires:       tar
+Requires:       xz
+
+%if %{with systemd}
+BuildRequires:  systemd-devel
+#BuildRequires:  firewalld-filesystem
+Requires:       systemd
+%endif
+
+# Replace the old Docker packages
+Provides:       docker = %{version}-%{release}
+Provides:       docker-latest = %{version}-%{release}
+
+# conflicting packages
+Conflicts:      docker-ce
+Conflicts:      docker-ce-cli
+Conflicts:      docker-common
+Conflicts:      docker-ee
+Conflicts:      docker-engine-cs
+Conflicts:      docker-io
+Conflicts:      podman-docker
+
+%description
+Docker is an open source project to build, ship and run any application as a
+lightweight container.
+
+Docker containers are both hardware-agnostic and platform-agnostic. This means
+they can run anywhere, from your laptop to the largest EC2 compute instance and
+everything in between - and they don't require you to use a particular
+language, framework or packaging system. That makes them great building blocks
+for deploying and scaling web apps, databases, and backend services without
+depending on a particular stack or provider.
+
+
+%package nano
+Summary:        GNU nano syntax highlighting files for Moby
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Requires:       nano
+
+%description nano
+This package installs %{summary}.
+
+
+%prep
+%setup -q -a 1 -a 2 -n moby-%{version}
+
+# correct rpmlint errors for bash completion
+sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker
+
+
+%build
+mkdir -p _build/bin
+mkdir -p src/github.com/docker
+ln -sf `pwd` src/github.com/docker/docker
+
+# build docker-proxy / libnetwork
+(
+
+        # Build binary using `golang-github-docker-libnetwork-devel`
+        # (github.com/docker/libnetwork) installed in system GOPATH.
+        export GOPATH="%{_datadir}/gocode:"`pwd`
+        export GO111MODULE=off
+        go build -o _build/bin/docker-proxy github.com/docker/docker/cmd/docker-proxy
+)
+
+# build tini (installed as docker-init)
+(
+        cd tini-%{commit_tini}
+        %cmake
+        make tini-static -C "%{__cmake_builddir}"
+)
+
+%global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ")
+# build engine
+(
+        mkdir -p src/github.com/docker
+        # Link source and vendored deps into local GOPATH.
+        ln -fns ../../.. src/%{goipath_moby}
+        # Build using source and vendored deps in local GOPATH.
+        export GOPATH="${PWD}"
+        export GO111MODULE=off
+        export LDFLAGS="-s -w"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.Version=%{version}"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.GitCommit=%{shortcommit_moby}"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.IAmStatic=false"
+        export LDFLAGS+=" -X 'github.com/docker/docker/dockerversion.BuildTime=%{buildtime}'"
+        export DOCKER_BUILDTAGS="seccomp selinux journald"
+        export BUILDTAGS="${DOCKER_BUILDTAGS}"
+        export GOBUILDTAGS="${BUILDTAGS}"
+        go build -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd
+        # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary
+        # mv bundles/dynbinary-daemon/dockerd-%%{version} _build/bin/dockerd
+)
+
+# build cli
+(
+        cd cli-%{version}
+        mkdir -p src/github.com/docker
+        # Link source and vendored deps into local GOPATH.
+        ln -fns ../../.. src/%{goipath_cli}
+        # export DISABLE_WARN_OUTSIDE_CONTAINER=1
+        # Build using source and vendored deps in local GOPATH.
+        export GOPATH="${PWD}"
+        export GO111MODULE=off
+        export LDFLAGS="\
+            -w \
+            -X \"github.com/docker/cli/cli/version.GitCommit=%{shortcommit_cli}\" \
+            -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \
+            -X \"github.com/docker/cli/cli/version.Version=%{version}\" \
+    "
+        export BUILDTAGS="pkcs11"
+        export GOBUILDTAGS="${BUILDTAGS}"
+        go build -o ../_build/bin/docker %{goipath_cli}/cmd/docker
+        # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary
+)
+
+%install
+# install binary
+install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/
+
+# install proxy
+install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/
+
+# install tini
+install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init
+
+# install udev rules
+install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/
+
+%if %{with systemd}
+# add init scripts
+install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/
+
+# for additional args
+install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker
+
+# Install sysusers configuration
+install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf
+%else
+# for additional args
+install -Dpm 755 %{SOURCE100} %{buildroot}%{_initdir}/docker
+install -Dpm 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/docker
+%endif
+
+# add bash completions
+install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/
+
+# add nano files
+install -Dpm 644 contrib/syntax/nano/Dockerfile.nanorc -t %{buildroot}%{_datadir}/nano/
+
+for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
+    cp "cli-%{version}/$cli_file" "cli-$cli_file"
+done
+
+
+%pre
+%if %{with systemd}
+%sysusers_create_compat %{SOURCE5}
+%else
+if ! getent group docker > /dev/null; then
+    groupadd --system docker
+fi
+%endif
+
+%post
+%if %{with systemd}
+if [ ! -L /var/run -a ! -e /var/run/docker ]; then
+  ln -sf /run/docker /var/run/docker
+fi
+%systemd_post docker.service docker.socket
+%else
+if [ $1 -eq 1 ]; then
+  /sbin/chkconfig --add docker
+fi
+%endif
+
+%preun
+%if %{with systemd}
+%systemd_preun docker.service docker.socket
+%else
+if [ $1 -eq 0 -o -x /usr/bin/systemctl ]; then
+  /sbin/chkconfig docker off
+  /sbin/chkconfig --del docker
+fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart docker.service
+%endif
+
+
+%files
+%license LICENSE cli-LICENSE
+%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md
+%doc cli-MAINTAINERS cli-NOTICE cli-README.md
+%config(noreplace) %{_sysconfdir}/sysconfig/docker
+%{_bindir}/docker
+%{_bindir}/dockerd
+%dir %{_libexecdir}/docker/
+%{_libexecdir}/docker/docker-proxy
+%{_libexecdir}/docker/docker-init
+%{_usr}/lib/udev/rules.d/80-docker.rules
+%{_datadir}/bash-completion/completions/docker
+%if %{with man}
+%{_mandir}/man1/docker*.1*
+%{_mandir}/man5/{Dockerfile,docker-config-json}.5*
+%{_mandir}/man8/dockerd.8*
+%endif
+%if %{with systemd}
+%{_unitdir}/docker.service
+%{_unitdir}/docker.socket
+%{_sysusersdir}/moby-engine.conf
+%else
+%{_initdir}/docker
+%endif
+
+%files nano
+%dir %{_datadir}/nano
+%{_datadir}/nano/Dockerfile.nanorc
+
+
+%changelog
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.1-1
+
+* Tue Jul 23 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.0-1
+- new upstream release.
+
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.0.3-2
+- added i686 support.
+
+* Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.0.3-1
+- initial build for Vine Linux.
+
+* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 24.0.5-4
+- Rebuild for golang 1.22.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 LuK1337 <priv.luk@gmail.com> - 24.0.5-1
+- Update moby-engine to 24.0.5
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jan 29 2023 John Ghatas <john@johnghatas.com>
+- Update moby-engine to 23.0.4
+
+* Sun Jan 29 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.23
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Jan 01 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.22
+
+* Wed Dec 14 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 20.10.21-1
+- Update to 20.10.21
+- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta
+
+* Thu Oct 20 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.20-1
+- Update to 20.10.20.
+- Mitigates CVE-2022-39253
+
+* Tue Oct 18 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.19-1
+- Update to 20.10.19.
+
+* Sat Sep 10 2022 Maxwell G <gotmax@e.email> - 20.10.18-1
+- Update to 20.10.18.
+- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4
+
+* Tue Aug 30 2022 Luca BRUNO <lucab@lucabruno.net> - 20.10.17-8
+- Move 'docker' group creation logic to a sysusers.d fragment
+  Resolves: rhbz#1745936
+
+* Fri Aug 05 2022 Maxwell G <gotmax@e.email> - 20.10.17-7
+- Migrate to SPDX license identifiers
+- Generate debuginfo
+- Specfile improvements
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-5
+- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
+  golang
+
+* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 20.10.17-4
+- Only build on %%golang_arches (i.e. where golang is available).
+
+* Sun Jun 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-3
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629.
+
+* Sat Jun 11 2022 Maxwell G <gotmax@e.email> - 20.10.17-2
+- Rebuild for new golang-github-docker-libnetwork
+
+* Fri Jun 10 2022 Maxwell G <gotmax@e.email> - 20.10.17-1
+- Update to 20.10.17. Fixes rhbz#2095714.
+
+* Fri May 13 2022 Maxwell G <gotmax@e.email> - 20.10.16-1
+- Update to 20.10.16.
+
+* Sat May 07 2022 Maxwell G <gotmax@e.email> - 20.10.15-1
+- Update to 20.10.15 (rhbz#2082501).
+- Fix BUILDTAGS (rhbz#2082924).
+- Make non-binary subpackages noarch.
+
+* Mon Apr 11 2022 Maxwell G <gotmax@e.email> - 20.10.14-1
+- Update to 20.10.14. Fixes rhbz#2063052.
+- Mitigate CVE-2022-24769.
+
+* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 20.10.12-3
+- Fixes FTBFS. Closes rhbz#2046748.
+- Use %%gobuild instead of Makefile to build binaries
+- Add explanatory comments.
+- Normalize install commands
+- Make compliant with SourceURL Guidelines
+- Remove no longer necessary `ExcludeArch: ppc64`.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Maxwell G <gotmax@e.email> - 20.10.12-1
+- Update to 20.10.12. Fixes rhbz#2032534.
+- Install zsh completions to the correct directory. Fixes rhbz#2038888.
+
+* Mon Nov 22 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10-11-1
+- Update to upstream 20.10.11 (fixes rhbz#2024384)
+- Mitigates CVE-2021-41190 (fixes rhbz#2024940)
+
+* Fri Oct 29 2021 Maxwell G <gotmax@e.email> - 20.10.10-1
+- Update to 20.10.10 (fixes rhbz#2015385)
+- Update virtual provides
+
+* Fri Oct 08 2021 Maxwell G <gotmax@e.email> - 20.10.9-1
+- Update to 20.10.9 (fixes rhbz#2010508)
+- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199)
+
+* Sun Aug 15 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.8-1
+- Update to upstream 20.10.8 (fixes rhbz#1990148)
+- Fix seccomp support (fixes rhbz#1986092)
+
+* Sun Aug 15 2021 Dusty Mabe <dusty@dustymabe.com> - 20.10.7-3
+- Remove `Requires(post)` on firewalld-filesystem.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jul 16 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.7-1
+- Update to upstream 20.10.7 (fixes rhbz#1967390)
+
+* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-2
+- Add conflict with podman-docker
+
+* Tue Apr 20 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-1
+- Update to upstream 20.10.6 (#1948605)
+- Re-bundle moby dependencies to fix gRPC issues with Swarm
+  (https://github.com/coreos/fedora-coreos-tracker/issues/793)
+
+* Sun Mar 14 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.5-1
+- Update to latest upstream 20.10.5 - fixes #1903426
+- Upstream brings compatibility with cgroups v2 - fixes #1746355
+- Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim)
+- Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680
+- Build dockerd and docker-proxy from unbundled source packages
+- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6)
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 19.03.13-3.ce.git4484c46
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.13-2.ce.git4484c46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.13-1.ce.git4484c46
+- Update to upstream 19.03.13 (#1837641)
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-4.ce.git42e35e6
+- Fix FTBFS: adapt to change to CMake builds (#1864160)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-3.ce.git42e35e6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-2.ce.git42e35e6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-1.ce.git42e35e6
+- Update to upstream 19.03.11 to prevent CVE-2020-13401
+
+* Thu May 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-2.ce.gitafacb8b
+- Configure storage-driver explicitely (fixes #1832301)
+- Add firewalld zone: trust interface docker0, as firewalld now uses nftables
+  by default and docker communicates with iptables (fixes #1817022)
+
+* Mon Mar 16 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-1.ce.gitafacb8b
+- Update to latest upstream release - Docker CE 19.03.8
+- Prune unused BuildRequires
+
+* Sun Mar 8 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-2.ce.git7141c19
+- Add Conflicts with docker-ce-cli and Obsoletes docker-common
+
+* Sat Mar 7 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-1.ce.git7141c19
+- Update to latest upstream release - Docker CE 19.03.7
+- Add Epoch: 2 to Obsoletes for docker and docker-latest
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-3.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-2.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 18 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.8-1.ce.git0dd43dd
+- Update to latest upstream release - Docker CE 18.09.8
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-5.ce.git2d0083d
+- Move docker-init and docker-proxy to /usr/libexec/docker
+- Update moby-engine-nano summary to follow guidelines
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
+- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
+- rebuilt
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
+- Depend on packaged versions "runc" and "containerd" instead of building them.
+
+* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
+- Update docker-ce to commit 2d0083d (version 18.09.7).
+- Update runc to commit 425e105.
+- Update containerd to commit 894b81a (1.2.6).
+- Update docker-proxy to commit e7933d4.
+
+* Tue May 14 2019 David Michael <dm0@redhat.com> - 18.09.6-1.ce.git481bc77
+- Update docker-ce to commit 481bc77 (version 18.09.6).
+- Update docker-proxy to commit 872f0a8.
+- Obsolete and provide the docker and docker-latest packages. (#1700006)
+
+* Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
+- Update docker-ce to commit e8ff056 (version 18.09.5).
+- Update docker-runc to commit 2b18fe1.
+- Update docker-containerd to commit bb71b10 (version 1.2.5).
+- Update docker-proxy to commit 4725f21.
+- Report the correct engine version.
+- Install symlinks to unprefixed runc/containerd program names.
+
+* Thu Mar 28 2019 David Michael <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
+- Conflict with docker-common. (#1693397)
+
+* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
+- Update docker-ce to commit d7080c1 (version 18.06.3).
+
+* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 18.06.2-1.ce.git6d37f41
+- Update docker-ce to commit 6d37f41 (version 18.06.2).
+- Update docker-runc to commit a592beb.
+
+* Mon Feb 11 2019 David Michael <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
+- Apply a runc patch for CVE-2019-5736.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 18.06.1-1.ce.gite68fc7a
+- Update docker-ce to commit e68fc7a (version 18.06.1).
+- Update docker-runc to commit 69663f0.
+- Update docker-containerd to commit 468a545 (version 1.1.2).
+- Update docker-proxy to commit 3ac297b.
+- Backport a fix for mounting named volumes.
+- Create a "docker" group for non-root Docker access.
+- Support systemd socket-activation.
+- Make runc and containerd commit IDs match their expected values.
+- Preserve containerd debuginfo.
+
+* Mon Nov 12 2018 Marcin Skarbek <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
+- add configuration file
+- update service file
+
+* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 18.06.0-1.ce.git0ffa825
+- Resolves: #1539161 - first upload to Fedora
+- built docker-ce commit 0ffa825
+- built docker-runc commit ad0f5255
+- built docker-containerd commit a88b631
+- built docker-proxy commit a79d368
+- built docker-init commit fec3683
+
+* Tue Mar 20 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
+- correct some rpmlint errors
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
+- docker-* symlinks to moby-* (RE: gh PR 34226)
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
+- rename binaries as per upstream gh PR 34226
+
+* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-1
+- initial build
+- built moby commit f5ec1e2
+- built cli commit 4b61f56
+- built docker-runc commit 2d41c047
+- built docker-containerd commit 3addd84
+- built docker-proxy commit 7b2b1fe

+ 119 - 0
r/runc/runc-vl.spec

@@ -0,0 +1,119 @@
+%bcond_with man
+%global with_debug 0
+
+%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project opencontainers
+%global repo runc
+# https://github.com/opencontainers/runc
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global git0 https://github.com/opencontainers/runc
+
+Name: %{repo}
+Version: 1.1.13
+Release: 1%{_dist_release}
+Summary: CLI for running Open Containers
+Group: virtualization
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and MIT
+URL: %{git0}
+Source0: %{git0}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1: ChangeLog.fedora
+BuildRequires: make
+BuildRequires: golang
+BuildRequires: pkgconfig(libseccomp)
+%if %{with man}
+BuildRequires: go-md2man
+%endif
+Provides: oci-runtime
+
+%ifnarch s390x
+#Recommends: criu
+%endif
+
+%description
+The runc command can be used to start containers which are packaged
+in accordance with the Open Container Initiative's specifications,
+and to manage containers running under runc.
+
+
+%debug_package
+
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+sed -i 's/ -trimpath//g' Makefile
+
+cp -f %{SOURCE1} ./
+
+
+%build
+%set_build_flags
+export CGO_CFLAGS=$CFLAGS
+# These extra flags present in $CFLAGS have been skipped for now as they break the build
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g')
+
+%ifarch x86_64
+export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
+%endif
+
+mkdir -p GOPATH
+pushd GOPATH
+    mkdir -p src/%{provider}.%{provider_tld}/%{project}
+    ln -s $(dirs +1 -l) src/%{import_path}
+popd
+
+pushd GOPATH/src/%{import_path}
+export GOPATH=$(pwd)/GOPATH
+
+make BUILDTAGS="apparmor selinux seccomp" all
+
+sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name}
+
+
+%install
+install -d -p %{buildroot}%{_bindir}
+install -p -m 755 %{name} %{buildroot}%{_bindir}
+
+%if %{with man}
+# generate man pages
+man/md2man-all.sh
+
+# install man pages
+#install -d -p %{buildroot}%{_mandir}/man8
+install -p -m 0644 man/man8/*.8 %{buildroot}%{_mandir}/man8/.
+%endif
+# install bash completion
+install -d -p %{buildroot}%{_datadir}/bash-completion/completions
+install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+%files
+%license LICENSE
+%doc MAINTAINERS_GUIDE.md PRINCIPLES.md README.md CONTRIBUTING.md
+%doc ChangeLog.fedora
+%{_bindir}/%{name}
+%if %{with man}
+%{_mandir}/man8/%{name}*
+%endif
+%{_datadir}/bash-completion/completions/%{name}
+
+
+%changelog
+* Sun Jul 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.13-1
+- initial build for Vine Linux.