3 changed files with 286 additions and 111 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/netavark-v1.7.0-vendor.tar.gz
-SOURCES/v1.7.0-rhel-4335c93.tar.gz
+SOURCES/netavark-v1.12.2-vendor.tar.gz
+SOURCES/v1.12.2.tar.gz
--- a/.netavark.metadata
+++ b/.netavark.metadata
@ -1,2 +1,2 @@
-48f77690b2123394dd2c2ff95231b7a4733b27ab SOURCES/netavark-v1.7.0-vendor.tar.gz
-738f3e70198bd76da27fe9506943effd8b7a61a5 SOURCES/v1.7.0-rhel-4335c93.tar.gz
+47405a1b6a10461803d4bf40c3330538981ebc58 SOURCES/netavark-v1.12.2-vendor.tar.gz
+022b27681576f7a3eee9ecc018acc5e23bc9434b SOURCES/v1.12.2.tar.gz
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@ -1,38 +1,77 @@
-# debuginfo doesn't work yet
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.5)
+## RPMAUTOSPEC: autochangelog
+## END: Set by rpmautospec
+
+# 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

-%global branch v1.7.0-rhel
-%global commit0 4335c93224d9667f62e9ba382d9eae314a19c706
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+# 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.7.0
-Release: 2%{?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
-Summary: OCI network stack
-URL: https://github.com/containers/%{name}
-%if 0%{?branch:1}
-Source0: https://github.com/containers/%{name}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+# Set a different Epoch for copr builds
+%if %{defined copr_username}
+Epoch: 102
+%else
+Epoch: 2
+%endif
+Version: 1.12.2
+Release: 1%{?dist}
+# 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
-Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+ExclusiveArch: aarch64 ppc64le s390x x86_64
 %endif
+Summary: OCI network stack
+URL: https://github.com/containers/%{name}
+# 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: protobuf-c
+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: protobuf-compiler
-BuildRequires: protobuf-c
-BuildRequires: gcc
+BuildRequires: systemd
+BuildRequires: systemd-devel

 %description
 %{summary}
@ -55,103 +94,239 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.

 %prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%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}
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%cargo_prep -v vendor
 %else
-%autosetup -Sgit -n %{name}-%{commit0}
+%cargo_prep -V 1
+%endif
 %endif
-tar fx %{SOURCE1}
-mkdir -p .cargo
-
-cat >.cargo/config << EOF
-[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

 %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}
-/usr/lib/systemd/system/*
+%{_libexecdir}/podman/%{name}*
 %{_mandir}/man1/%{name}.1*
+%{_unitdir}/%{name}-dhcp-proxy.service
+%{_unitdir}/%{name}-dhcp-proxy.socket
+%{_unitdir}/%{name}-firewalld-reload.service

 %changelog
-* Wed Nov 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-2
- update to the latest content of https://github.com/containers/netavark/tree/v1.7.0-rhel
-  (https://github.com/containers/netavark/commit/4335c93)
- Resolves: RHEL-16300
-
-* Mon Jul 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.7.0
- Related: #2176063
-
-* Mon Jun 12 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-2
- rebuild
- Resolves: #2188340
-
-* Wed Apr 12 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.6.0
- Related: #2176063
-
-* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
- fix build - thank to Paul Holzinger
- Related: #2124478
-
-* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.5.0
- Related: #2124478
-
-* Thu Dec 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.4.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.4.0
- Related: #2124478
-
-* Wed Nov 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.3.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.3.0
- Related: #2124478
-
-* Tue Oct 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.2.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.2.0
- Related: #2124478
-
-* Fri Aug 05 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
- add gating.yaml
- Related: #2061316
-
-* Fri Aug 05 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-5
- properly disable i686
- Related: #2061316
-
-* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
- manually exclude i686 as build still fails
- Related: #2061316
-
-* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-3
- set Epoch to preserve update path and build for go arches only
- Related: #2061316
-
-* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-2
- fix deps to go-md2man
- Related: #2061316
-
-* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-1
- initial import
- Related: #2061316
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1.12.2-1
+- Rebuilt for MSVSphere 10
+
+## START: Generated by rpmautospec
+* Tue Aug 20 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.2-1
+- Update to 1.12.2 upstream release
+
+* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.1-1
+- Update to 1.12.1 upstream release
+
+* Fri Jul 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-2
+- Remove autorelease - Related: RHEL-32374
+
+* Tue Jul 09 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
+- Bump package Epoch to preserve upgrade path. Resolves: RHEL-32374
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0:1.11.0-3
+- Bump release for June 2024 mass rebuild
+
+* Tue Jun 04 2024 Jindrich Novy <jnovy@redhat.com> - 0:1.11.0-2
+- Add gating.yaml, Related: RHEL-39410
+
+* Fri May 31 2024 Jindrich Novy <jnovy@redhat.com> - 0:1.11.0-1
+- Update to 1.11.0 upstream release
+
+* Mon Apr 22 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.3-1
+- Bump Epoch to preserve upgrade path from RHEL9 Resolves: RHEL-30634
+
+* Sat Feb 10 2024 Packit <hello@packit.dev> - 0:1.10.3-1
+- [packit] 1.10.3 upstream release
+
+* Wed Jan 31 2024 Packit <hello@packit.dev> - 0:1.10.2-1
+- [packit] 1.10.2 upstream release
+
+* Mon Jan 29 2024 Lokesh Mandvekar <lsm5@redhat.com> - 1.10.1-5
+- remove min version on av
+
+* Mon Jan 29 2024 Lokesh Mandvekar <lsm5@redhat.com> - 1.10.1-4
+- remove commented lines
+
+* Mon Jan 29 2024 Lokesh Mandvekar <lsm5@redhat.com> - 1.10.1-3
+- depend on available version of av
+
+* Sat Jan 27 2024 Adam Williamson <awilliam@redhat.com> - 1.10.1-2
+- Fix broken dep on aardvark-dns 1.10.1 (does not exist)
+
+* Thu Jan 25 2024 Packit <hello@packit.dev> - 1.10.1-1
+- [packit] 1.10.1 upstream release
+
+* Thu Jan 25 2024 Lokesh Mandvekar <lsm5@redhat.com> - 1.10.0-2
+- fix cargo config
+
+* Thu Jan 25 2024 Packit <hello@packit.dev> - 1.10.0-1
+- [packit] 1.10.0 upstream release
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Nov 27 2023 Packit <hello@packit.dev> - 1.9.0-1
+- [packit] 1.9.0 upstream release
+
+* Thu Sep 28 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.8.0-2
+- update sources
+
+* Wed Sep 27 2023 Packit <hello@packit.dev> - 1.8.0-1
+- [packit] 1.8.0 upstream release
+
+* Tue Aug 22 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.0-3
+- spdx compatible license
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 29 2023 Packit <hello@packit.dev> - 1.7.0-1
+- [packit] 1.7.0 upstream release
+
+* Tue May 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.6.0-3
+- Use rust-toolset in RHEL builds
+
+* Wed Apr 12 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.6.0-2
+- BR: systemd[-devel]
+
+* Wed Apr 12 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.6.0-1
+- bump to v1.6.0
+
+* Tue Apr 11 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-7
+- add dhcp-proxy unitfiles for upcoming v1.6
+
+* Mon Mar 06 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-6
+- exclusivearch: golang_arches_future
+
+* Mon Mar 06 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-5
+- migrated to SPDX license
+
+* Wed Feb 08 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-4
+- Resolves: #2167217 - enable debuginfo
+
+* Wed Feb 08 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-3
+- Discontinue i686
+
+* Thu Feb 02 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-2
+- rebuild for github 404 on koji
+
+* Thu Feb 02 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-1
+- bump to v1.5.0
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Dec 12 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.4.0-1
+- auto bump to v1.4.0
+
+* Wed Nov 23 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-2
+- Make md2man usage conditional on golang_arches
+
+* Tue Nov 15 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.3.0-1
+- auto bump to v1.3.0
+
+* Fri Oct 07 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-7
+- Revert "auto bump to v1.2.0"
+
+* Fri Oct 07 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.0-6
+- auto bump to v1.2.0
+
+* Thu Oct 06 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-5
+- make aardvark-dns hard requires on fedora-server
+
+* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-4
+- adjust macros for correct version
+
+* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-3
+- get rid of debbuild to comply with fedora guidelines
+
+* Mon Oct 03 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-2
+- bump lookaside cache files
+
+* Wed Sep 28 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.0-1
+- auto bump to v1.2.0
+
+* Wed Aug 17 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-3
+- use easier tag macros to make both fedora and debbuild happy
+
+* Tue Aug 16 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-2
+- Fix debbuild maintainer issue
+
+* Thu Jul 28 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.1.0-1
+- auto bump to v1.1.0
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri May 27 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.3-4
+- build deb packages using debbuild
+
+* Fri May 06 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.3-3
+- add release tag info to aardvark dependency
+
+* Fri May 06 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.3-2
+- bump to v1.0.3
+
+* Thu May 05 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.0.3-1
+- auto bump to v1.0.3
+
+* Wed Mar 23 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.2-1
+- bump to v1.0.2
+
+* Fri Feb 25 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.1-1
+- bump to v1.0.1, use upstream provided separate vendor tarball
+
+* Wed Feb 16 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-1
+- bump to v1.0.0
+
+* Fri Feb 11 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc2-1
+- bump to v1.0.0-rc2
+
+* Thu Feb 10 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc1-3
+- aardvark-dns should be a weak-dep
+
+* Wed Feb 02 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc1-2
+- Provides: container-network-stack = 2
+
+* Tue Feb 01 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc1-1
+- Resolves: #2048794 - initial build
+## END: Generated by rpmautospec