4 changed files with 74 additions and 83 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/netavark-1.5.1-8a6d81c.tar.gz
-SOURCES/netavark-v1.5.1-vendor.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 @@
-1801a1263234f932aec8ccd7e1aac72ca233d7c5 SOURCES/netavark-1.5.1-8a6d81c.tar.gz
-23424f386f3968ddf6e3f29ae65320f71b7bf45a SOURCES/netavark-v1.5.1-vendor.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,38 +1,23 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}

-#%%global branch v1.5.0-rhel
-%global commit0 8a6d81c51b2a130a3c93d94587df81053e208e05
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Epoch: 2
 Name: netavark
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 6%{?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
-%else
-Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
-%endif
+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: /usr/bin/go-md2man
 Recommends: aardvark-dns >= 1.0.3
 Provides: container-network-stack = 2
 BuildRequires: make
 BuildRequires: rust-srpm-macros
 BuildRequires: git-core
-BuildRequires: protobuf-compiler
-BuildRequires: protobuf-c
-BuildRequires: gcc

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

 %prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-%else
-%autosetup -Sgit -n %{name}-%{commit0}
-%endif
+%autosetup -Sgit
 tar fx %{SOURCE1}
 mkdir -p .cargo

@ -67,13 +48,6 @@ 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
@ -82,7 +56,7 @@ EOF
 %{__make} build

 cd docs
-go-md2man -in %{name}.1.md -out %{name}.1
+cp %{SOURCE2} .

 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
@ -94,59 +68,25 @@ go-md2man -in %{name}.1.md -out %{name}.1
 %{_mandir}/man1/%{name}.1*

 %changelog
-* Wed Jun 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.1-2
- update to 1.5.1 bugfix release
- Resolves: #2211542
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
+- bump Epoch to preserve upgrade path
+- Related: #2061390

-* Wed Jun 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-4
- update to the latest content of https://github.com/containers/netavark/tree/v1.5.0-rhel
-  (https://github.com/containers/netavark/commit/8a6d81c)
- Resolves: #2211542
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-5
+- remove dependency on md2man
+- Related: #2061390

-* Thu Apr 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-3
- fix --dns-add command is not functioning
- Resolves: #2182898
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-4
+- fix arches
+- Related: #2061390

-* 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