diff --git a/.gitignore b/.gitignore index 6c291a7..6085a61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/1.12.2.tar.gz -SOURCES/netavark-v1.12.2-vendor.tar.gz +SOURCES/netavark-v1.14.0-vendor.tar.gz +SOURCES/v1.14.0.tar.gz diff --git a/.netavark.metadata b/.netavark.metadata index fbe3cce..e8d131c 100644 --- a/.netavark.metadata +++ b/.netavark.metadata @@ -1,2 +1,2 @@ -022b27681576f7a3eee9ecc018acc5e23bc9434b SOURCES/1.12.2.tar.gz -47405a1b6a10461803d4bf40c3330538981ebc58 SOURCES/netavark-v1.12.2-vendor.tar.gz +664be0673a0b8205dd92e1c9f74b0896c093c0f7 SOURCES/netavark-v1.14.0-vendor.tar.gz +2db439db01363f01c10581cfdd9764c3375cb550 SOURCES/v1.14.0.tar.gz diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec index e097e98..3f8443a 100644 --- a/SPECS/netavark.spec +++ b/SPECS/netavark.spec @@ -1,31 +1,72 @@ -# debuginfo doesn't work yet -%global debug_package %{nil} +# Building from fedora dependencies not possible +# Latest upstream rtnetlink frequently required +# sha2, zbus, zvariant are currently out of date + +%global with_debug 1 + +%if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +# Minimum X.Y dep for aardvark-dns +%define major_minor %((v=%{version}; echo ${v%.*})) + +# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+, Fedora 41+ +# and default to iptables on all other environments +# The `rhel` macro is defined on CentOS Stream, RHEL as well as Fedora ELN. +%if (%{defined rhel} && 0%{?rhel} >= 10) || (%{defined fedora} && 0%{?fedora} >= 41) +%define default_fw nftables +%else +%define default_fw iptables +%endif -Epoch: 2 Name: netavark -Version: 1.12.2 +# Set a different Epoch for copr builds +%if %{defined copr_username} +Epoch: 102 +%else +Epoch: 2 +%endif +Version: 1.14.0 Release: 1%{?dist} -License: ASL 2.0 and BSD and MIT -ExclusiveArch: %{rust_arches} -# this is needed for go-md2man -# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures -ExclusiveArch: %{go_arches} -ExcludeArch: i686 +# The `AND` needs to be uppercase in the License for SPDX compatibility +License: Apache-2.0 AND BSD-3-Clause AND MIT +%if %{defined golang_arches_future} +ExclusiveArch: %{golang_arches_future} +%else +ExclusiveArch: aarch64 ppc64le s390x x86_64 +%endif Summary: OCI network stack URL: https://github.com/containers/%{name} -Source0: %{url}/archive/v%{version}/%{version}.tar.gz +# Tarballs fetched from upstream's release page +Source0: %{url}/archive/v%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz BuildRequires: cargo -BuildRequires: /usr/bin/go-md2man -Recommends: aardvark-dns >= 1.0.3 +BuildRequires: %{_bindir}/go-md2man +# aardvark-dns and %%{name} are usually released in sync +Requires: aardvark-dns >= %{epoch}:%{major_minor} Provides: container-network-stack = 2 +%if "%{default_fw}" == "nftables" +Requires: nftables +%else +Requires: iptables +%endif BuildRequires: make -BuildRequires: rust-srpm-macros -BuildRequires: systemd-rpm-macros -BuildRequires: git-core -BuildRequires: protobuf-compiler BuildRequires: protobuf-c -BuildRequires: gcc +BuildRequires: protobuf-compiler +%if %{defined rhel} +# rust-toolset requires the `local` repo enabled on non-koji ELN build environments +BuildRequires: rust-toolset +%else +BuildRequires: rust-packaging +BuildRequires: rust-srpm-macros +%endif +BuildRequires: git-core +BuildRequires: systemd +BuildRequires: systemd-devel %description %{summary} @@ -48,47 +89,68 @@ Its features include: * Support for container DNS resolution via aardvark-dns. %prep -%autosetup -Sgit +%autosetup -Sgit %{name}-%{version} +# Following steps are only required on environments like koji which have no +# network access and thus depend on the vendored tarball. Copr pulls +# dependencies directly from the network. +%if !%{defined copr_username} tar fx %{SOURCE1} -mkdir -p .cargo - -cat >.cargo/config << EOF -[source."git+https://github.com/namib-project/nftables-rs.git?rev=1b0c60b"] -git = "https://github.com/namib-project/nftables-rs.git" -rev = "1b0c60b" -replace-with = "vendored-sources" - -[source.crates-io] -replace-with = "vendored-sources" - -[net] -offline = true - -[source."https://github.com/containers/netavark-dhcp-proxy"] -git = "https://github.com/containers/netavark-dhcp-proxy" -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +%if 0%{?fedora} || 0%{?rhel} >= 10 +%cargo_prep -v vendor +%else +%cargo_prep -V 1 +%endif +%endif %build -%{__make} build +NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build +%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username} +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies +%cargo_vendor_manifest +%endif cd docs -go-md2man -in %{name}.1.md -out %{name}.1 +%{__make} %install %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install +%preun +%systemd_preun %{name}-dhcp-proxy.service +%systemd_preun %{name}-firewalld-reload.service + +%postun +%systemd_postun %{name}-dhcp-proxy.service +%systemd_postun %{name}-firewalld-reload.service + %files %license LICENSE +%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username} +%license LICENSE.dependencies +%license cargo-vendor.txt +%endif %dir %{_libexecdir}/podman -%{_libexecdir}/podman/%{name} -%{_unitdir}/* +%{_libexecdir}/podman/%{name}* %{_mandir}/man1/%{name}.1* +%{_mandir}/man7/%{name}-firewalld.7* +%{_unitdir}/%{name}-dhcp-proxy.service +%{_unitdir}/%{name}-dhcp-proxy.socket +%{_unitdir}/%{name}-firewalld-reload.service %changelog +* Mon Feb 10 2025 Jindrich Novy - 2:1.14.0-1 +- update to https://github.com/containers/netavark/releases/tag/v1.14.0 +- Related: RHEL-60277 + +* Fri Dec 06 2024 Jindrich Novy - 2:1.13.1-1 +- update to https://github.com/containers/netavark/releases/tag/v1.13.1 +- Related: RHEL-60277 + +* Wed Oct 30 2024 Jindrich Novy - 2:1.13.0-1 +- update to https://github.com/containers/netavark/releases/tag/v1.13.0 +- Resolves: RHEL-65326 + * Tue Aug 20 2024 Jindrich Novy - 2:1.12.2-1 - update to https://github.com/containers/netavark/releases/tag/v1.12.2 - Related: RHEL-27608