rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

containers-common-1-34.el9

Browse Source 
- update to netavark and aardvark-dns 1.0.2
- update vendored components
- Related: #2061316

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2022-04-06 10:52:41 +02:00
parent 42f86f132d
commit a35c1d04e8
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
containers-common.spec
View File

@ -4,15 +4,15 @@
# pick the oldest version on c/image, c/common, c/storage vendored in # pick the oldest version on c/image, c/common, c/storage vendored in
# podman/skopeo/podman. # podman/skopeo/podman.
%global skopeo_branch main %global skopeo_branch main
%global image_branch v5.19.1 %global image_branch v5.19.2
%global common_branch v0.47.4 %global common_branch v0.47.5
%global storage_branch v1.38.2 %global storage_branch v1.38.3
%global shortnames_branch main %global shortnames_branch main
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 33%{?dist} Release: 34%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildRequires: /usr/bin/go-md2man BuildRequires: /usr/bin/go-md2man
@ -61,9 +61,9 @@ Source100: update.sh
Source101: update-vendored.sh Source101: update-vendored.sh
Source102: pyxis.sh Source102: pyxis.sh
%global aardvark_dns_version v1.0.1 %global aardvark_dns_version v1.0.2
#%%global aardvark_dns_branch v1.0.1-rhel #%%global aardvark_dns_branch v1.0.1-rhel
%global aardvark_dns_commit0 da6bc98b1b795d8ca4f4c77a7dbe383f5a62c6f5 %global aardvark_dns_commit0 95157458433efebcc72b2a89db0ff39c75ed68dc
%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7}) %global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
%if 0%{?aardvark_dns_branch:1} %if 0%{?aardvark_dns_branch:1}
Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
@ -72,9 +72,9 @@ Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_com
%endif %endif
Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
%global netavark_version v1.0.1 %global netavark_version v1.0.2
#%%global netavark_branch v1.0.1-rhel #%%global netavark_branch v1.0.1-rhel
%global netavark_commit0 5810f9fec619ddf3c95737f9ba26c67f43a6c88c %global netavark_commit0 9f877350086fffaf7978d9da062aba353a782d92
%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7}) %global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
%if 0%{?netavark_branch:1} %if 0%{?netavark_branch:1}
Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
@ -93,7 +93,7 @@ separately.
%package -n aardvark-dns %package -n aardvark-dns
Version: 1.0.1 Version: 1.0.1
Release: 33%{?dist} Release: 34%{?dist}
URL: https://github.com/containers/aardvark-dns URL: https://github.com/containers/aardvark-dns
Summary: Authoritative DNS server for A/AAAA container records Summary: Authoritative DNS server for A/AAAA container records
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -113,7 +113,7 @@ Read more about configuration in `src/backend/mod.rs`.
%package -n netavark %package -n netavark
Version: 1.0.1 Version: 1.0.1
Release: 33%{?dist} Release: 34%{?dist}
URL: https://github.com/containers/netavark URL: https://github.com/containers/netavark
Summary: OCI network stack Summary: OCI network stack
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -300,6 +300,11 @@ EOF
%{_mandir}/man1/netavark.1* %{_mandir}/man1/netavark.1*
%changelog %changelog
* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
- update to netavark and aardvark-dns 1.0.2
- update vendored components
- Related: #2061316
* Mon Mar 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33 * Mon Mar 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
- allow consuming aardvark-dns and netavark from upstream branches - allow consuming aardvark-dns and netavark from upstream branches
- Related: #2061316 - Related: #2061316

3
shortnames.conf
View File

@ -10,11 +10,12 @@
"skopeo" = "quay.io/skopeo/stable" "skopeo" = "quay.io/skopeo/stable"
"buildah" = "quay.io/buildah/stable" "buildah" = "quay.io/buildah/stable"
"podman" = "quay.io/podman/stable" "podman" = "quay.io/podman/stable"
"hello" = "quay.io/podman/hello"
"hello-world" = "quay.io/podman/hello"
# docker # docker
"alpine" = "docker.io/library/alpine" "alpine" = "docker.io/library/alpine"
"docker" = "docker.io/library/docker" "docker" = "docker.io/library/docker"
"registry" = "docker.io/library/registry" "registry" = "docker.io/library/registry"
"hello-world" = "docker.io/library/hello-world"
"swarm" = "docker.io/library/swarm" "swarm" = "docker.io/library/swarm"
# Fedora # Fedora
"fedora-minimal" = "registry.fedoraproject.org/fedora-minimal" "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"

8
sources
View File

@ -1,4 +1,4 @@
SHA512 (aardvark-dns-v1.0.1-da6bc98.tar.gz) = 78bfebe7de49e2da9a709544c19738951d28f2767972200286d175e1a3bd6826535c5e662a897626a2de4243ca3217b21065c8c3bf034321461c98dfa05d21de SHA512 (aardvark-dns-v1.0.2-9515745.tar.gz) = a66a796cea3a5f271f8f6f4cf9acc99d5c5662cb134f8d4f355734ad21f60ef693e1938e4d478ba0f477a73b3eada07069403c154d38ec9b6f21d1bd05eda1bc
SHA512 (aardvark-dns-v1.0.1-vendor.tar.gz) = ea36b6e2cc477d72caff30f93555c91292df848ca5b4b1d46eec56732ac662fa33d25eec1574026941f93ccbccab43cd051d86b5635f7f5af8ea3b117a55680b SHA512 (aardvark-dns-v1.0.2-vendor.tar.gz) = 41c59c9f20c4ddf3d1e0ff7176f77344f0862a808d01d855310d757c94b83660c9bf532c2c8cfa416b7c9f1694bdf1699d6efefdde784f25feb345a6270132c6
SHA512 (netavark-v1.0.1-5810f9f.tar.gz) = 1af6c8bde330580a456f9935ef451c55cc883195e5610d95f828c1ea2e18e5497e4e3c66f73371c87249c8c0d0d9b0b20b047b0760e955fa677d334e5e906a5d SHA512 (netavark-v1.0.2-9f87735.tar.gz) = fa13f07a765deebd9ab6a096f5e6e0fcae022641b954904259f7ff486a25812b1b336325a470de34d8e72ecbdac4594898259b028a8efff4a3bdc28f1939eac6
SHA512 (netavark-v1.0.1-vendor.tar.gz) = 5b19fb5f17708a281b3b3de062cf2d266ff0bcc4034135b13f988e4b9bf181295c7260f00a10f93f29fd1f6bf75e5109586af6758de6c23e39bd201eb4e0fdd6 SHA512 (netavark-v1.0.2-vendor.tar.gz) = 174b4c6fc3f394c79fb681bfd0e4be2f8b1102eb657c9abaabad572e894a36a2e4bac4385b6a5fc0872b37cbe5503a739c166a73571ee9f3ccfabb01ad48b1ef