4 changed files with 90 additions and 203 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/netavark-v1.14.0-vendor.tar.gz
-SOURCES/v1.14.0.tar.gz
+SOURCES/1.1.0.tar.gz
+SOURCES/netavark-v1.1.0-vendor.tar.gz
--- a/.netavark.metadata
+++ b/.netavark.metadata
@ -1,2 +1,2 @@
-664be0673a0b8205dd92e1c9f74b0896c093c0f7 SOURCES/netavark-v1.14.0-vendor.tar.gz
-2db439db01363f01c10581cfdd9764c3375cb550 SOURCES/v1.14.0.tar.gz
+5f22fd74fc25d71335f8ca5cd5aa74c383d30576 SOURCES/1.1.0.tar.gz
+63dcfdcb2b5917a213f89469aa4e643f92230410 SOURCES/netavark-v1.1.0-vendor.tar.gz
--- a/SOURCES/netavark.1
+++ b/SOURCES/netavark.1
@ -0,0 +1,51 @@
+.nh
+.TH netavark(1)
+.SH NAME
+.PP
+netavark - Configure a given network namespace for use by a container
+
+.SH SYNOPSIS
+.PP
+\fBnetavark\fP [\fIoptions\fP] \fIcommand\fP \fInetwork namespace path\fP
+
+.SH DESCRIPTION
+.PP
+Netavark configures a network namespace according to a configuration read from STDIN. The configuration is JSON formatted.
+
+.SH GLOBAL OPTIONS
+.SS \fB--file\fP, \fB-f\fP
+.PP
+Instead of reading from STDIN, read the configuration to be applied from the given file. \fB-f -\fP may also be used to flag reading from STDIN.
+
+.SH COMMANDS
+.SS netavark setup
+.PP
+The setup command configures the given network namespace with the given configuration, creating any interfaces and firewall rules necessary.
+
+.SS netavark teardown
+.PP
+The teardown command is the inverse of the setup command, undoing any configuration applied. Some interfaces may not be deleted (bridge interfaces, for example, will not be removed).
+
+.SS CONFIGURATION FORMAT
+.PP
+The configuration accepted is the same for both setup and teardown. It is JSON formatted.
+
+.PP
+Format is https://github.com/containers/podman/blob/cd7b48198c38c5028540e85dc72dd3406f4318f0/libpod/network/types/network.go#L164-L173 but we will also send a Networks array including all the network definitions (https://github.com/containers/podman/blob/cd7b48198c38c5028540e85dc72dd3406f4318f0/libpod/network/types/network.go#L32-L62)
+TODO: Transcribe configuration into here in a nice tabular format
+
+.SH EXAMPLE
+.PP
+netavark setup /run/user/1000/podman/netns/d11d1f9c499d
+
+.PP
+netavark -f /run/podman/828b0508ae64.conf teardown /run/podman/netns/828b0508ae64
+
+.SH SEE ALSO
+.PP
+podman(1)
+
+.SH HISTORY
+.PP
+September 2021, Originally compiled by Matt Heon mheon@redhat.com
+\[la]mailto:mheon@redhat.com\[ra]
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@ -1,72 +1,23 @@
-# 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
+# debuginfo doesn't work yet
 %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
-
-Name: netavark
-# Set a different Epoch for copr builds
-%if %{defined copr_username}
-Epoch: 102
-%else
 Epoch: 2
-%endif
-Version: 1.14.0
-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
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-%endif
+Name: netavark
+Version: 1.1.0
+Release: 6%{?dist}
+License: ASL 2.0 and BSD and MIT
+ExclusiveArch: %{rust_arches}
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
-# Tarballs fetched from upstream's release page
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/v%{version}/%{version}.tar.gz
 Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
+Source2: netavark.1
 BuildRequires: cargo
-BuildRequires: %{_bindir}/go-md2man
-# aardvark-dns and %%{name} are usually released in sync
-Requires: aardvark-dns >=  %{epoch}:%{major_minor}
+Recommends: aardvark-dns >= 1.0.3
 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: systemd
-BuildRequires: systemd-devel

 %description
 %{summary}
@ -89,168 +40,53 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.

 %prep
-%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}
+%autosetup -Sgit
 tar fx %{SOURCE1}
-%if 0%{?fedora} || 0%{?rhel} >= 10
-%cargo_prep -v vendor
-%else
-%cargo_prep -V 1
-%endif
-%endif
+mkdir -p .cargo
+
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF

 %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
+%{__make} build

 cd docs
-%{__make}
+cp %{SOURCE2} .

 %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}*
+%{_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 <jnovy@redhat.com> - 2:1.14.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.14.0
- Related: RHEL-60277
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
+- bump Epoch to preserve upgrade path
+- Related: #2061390

-* Fri Dec 06 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.13.1-1
- update to https://github.com/containers/netavark/releases/tag/v1.13.1
- Related: RHEL-60277
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-5
+- remove dependency on md2man
+- Related: #2061390

-* Wed Oct 30 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.13.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.13.0
- Resolves: RHEL-65326
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-4
+- fix arches
+- Related: #2061390

-* Tue Aug 20 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.2-1
- update to https://github.com/containers/netavark/releases/tag/v1.12.2
- Related: RHEL-27608
-
-* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.1-1
- update to https://github.com/containers/netavark/releases/tag/v1.12.1
- Related: RHEL-27608
-
-* Mon Jun 03 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.11.0
- Related: RHEL-27608
-
-* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.3-1
- update to https://github.com/containers/netavark/releases/tag/v1.10.3
- Related: RHEL-2112
-
-* Thu Feb 01 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.2-1
- update to https://github.com/containers/netavark/releases/tag/v1.10.2
- Related: RHEL-2112
-
-* Thu Jan 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.1-1
- update to https://github.com/containers/netavark/releases/tag/v1.10.1
- Related: RHEL-2112
-
-* Thu Jan 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-2
- Fix build of 1.10.0 - thanks to Lokesh Mandvekar
- Related: Jira:RHEL-2112
-
-* Wed Jan 24 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.10.0
- Related: RHEL-2112
-
-* Tue Dec 05 2023 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.0-1
- require systemd srpm macros
- Related: Jira:RHEL-16291
-
-* Fri Oct 06 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-3
- require systemd srpm macros
- Related: Jira:RHEL-2112
-
-* Mon Oct 02 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-2
- fix directory for systemd units
- Related: Jira:RHEL-2112
-
-* Fri Sep 29 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.8.0
- Related: Jira:RHEL-2112
-
-* 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
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-3
 - 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
+- Related: #2061390

 * Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-2
- fix deps to go-md2man
- Related: #2061316
+- require /usr/bin/go-md2man directly

 * Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-1
 - initial import
- Related: #2061316
+- Related: #2061390