From 9d9c0b2d3585a2164efae99cbf8ddb9cf0921c4f Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Sat, 1 Jun 2024 20:01:47 +0000
Subject: [PATCH] import netavark-1.11.0-1.el10
---
.netavark.metadata | 4 +-
SPECS/netavark.spec | 201 +++++++++++++++++++++++++++++++++++++++++---
2 files changed, 190 insertions(+), 15 deletions(-)
diff --git a/.netavark.metadata b/.netavark.metadata
index 177e03d..3d6bd1c 100644
--- a/.netavark.metadata
+++ b/.netavark.metadata
@@ -1,2 +1,2 @@
-e8bcbfa09015c0dcd1ea48705c862425437f1b0c600d943bc0ea43bd530f6839 SOURCES/netavark-v1.10.3-vendor.tar.gz
-fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7 SOURCES/v1.10.3.tar.gz
+24500ccc9d0cd3bfaa63915b5a95e445d11e2fb66e222e9d5acc30af5f439703 SOURCES/netavark-v1.11.0-vendor.tar.gz
+5b96e5a00a41a550d716f1e5c180df6e0ee5b0ce20961827ef17aff3d6a92f9c SOURCES/v1.11.0.tar.gz
diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec
index 333a965..33957b3 100644
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@@ -1,15 +1,17 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.3)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+ release_number = 1;
+ base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+ print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
# Building from fedora dependencies not possible
# Latest upstream rtnetlink frequently required
# sha2, zbus, zvariant are currently out of date
-# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL
-# does. So we set it separately here and skip rust-packaging dependency for RHEL.
-# Buildability without EPEL is essential for packit builds.
-# ELN doesn't need this.
-%if %{defined rhel} && 0%{?rhel} < 10
-%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo
-%endif
-
%global with_debug 1
%if 0%{?with_debug}
@@ -22,6 +24,15 @@
# 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+
+# 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
+%define default_fw nftables
+%else
+%define default_fw iptables
+%endif
+
Name: netavark
# Set a different Epoch for copr builds
%if %{defined copr_username}
@@ -29,7 +40,7 @@ Epoch: 102
%else
Epoch: 0
%endif
-Version: 1.10.3
+Version: 1.11.0
Release: %autorelease
# The `AND` needs to be uppercase in the License for SPDX compatibility
License: Apache-2.0 AND BSD-3-Clause AND MIT
@@ -46,8 +57,7 @@ Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
BuildRequires: cargo
BuildRequires: %{_bindir}/go-md2man
# aardvark-dns and %%{name} are usually released in sync
-Recommends: aardvark-dns >= %{epoch}:%{major_minor}
-Requires: (aardvark-dns >= %{epoch}:%{major_minor} if fedora-release-identity-server)
+Requires: aardvark-dns >= %{epoch}:%{major_minor}
Provides: container-network-stack = 2
BuildRequires: make
BuildRequires: protobuf-c
@@ -102,7 +112,7 @@ EOF
%endif
%build
-%{__make} CARGO="%{__cargo}" build
+NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
cd docs
%{__make}
@@ -128,4 +138,169 @@ cd docs
%{_unitdir}/%{name}-firewalld-reload.service
%changelog
-%autochangelog
+## START: Generated by rpmautospec
+* 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
--
GitLab