import netavark-1.5.0-2.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/netavark-v1.1.0-vendor.tar.gz
+SOURCES/1.5.0.tar.gz
-SOURCES/v1.1.0-rhel-e868e02.tar.gz
+SOURCES/netavark-v1.5.0-vendor.tar.gz

.netavark.metadata

@@ -1,2 +1,2 @@
-715b18551c34835b47e0861a09a2baa8d3aa23dd SOURCES/netavark-v1.1.0-vendor.tar.gz
+beb751742ed33f7748cef4babd55fa4805314089 SOURCES/1.5.0.tar.gz
-99af68089204eb3e5ba6fc93722137799454733f SOURCES/v1.1.0-rhel-e868e02.tar.gz
+dd7b20c3e2138a665742dac7219de3365cb7ef44 SOURCES/netavark-v1.5.0-vendor.tar.gz

SOURCES/netavark.1

@@ -1,51 +0,0 @@
-.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]

SPECS/netavark.spec

@@ -1,32 +1,30 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
-%global netavark_version v1.1.0
-%global netavark_branch v1.1.0-rhel
-%global netavark_commit0 e868e02552bd1be28d8eb6a193f2e92b0e0643bf
-%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
-
 Epoch: 2
 Name: netavark
-Version: 1.1.0
+Version: 1.5.0
-Release: 7%{?dist}
+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%{?netavark_branch:1}
+Source0: %{url}/archive/v%{version}/%{version}.tar.gz
-Source0: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
+Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
-%else
-Source0: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
-%endif
-Source1: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_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}
@@ -49,13 +47,7 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.
 
 %prep
-tar fx %{SOURCE0}
+%autosetup -Sgit
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -63,45 +55,52 @@ 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
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-%__scm_setup_git -q
 %{__make} build
 
 cd docs
-cp %{SOURCE2} .
+go-md2man -in %{name}.1.md -out %{name}.1
 
 %install
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
 %files
-%if 0%{?netavark_branch:1}
+%license LICENSE
-%license containers-netavark-%{netavark_shortcommit0}/LICENSE
-%else
-%license netavark-%{netavark_commit0}/LICENSE
-%endif
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Thu Oct 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-7
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
-- fix "Two aardvark-dns instances trying to use the same port
+- fix build - thank to Paul Holzinger
-  on the same interface"
+- Related: #2124478
-- Resolves: #2136306
+
+* 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