Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1284000
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netavark?expand=0&rev=20

_service

@@ -3,7 +3,7 @@
     <param name="url">https://github.com/containers/netavark.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
-    <param name="revision">v1.12.1</param>
+    <param name="revision">v1.14.1</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containers/netavark.git</param>
-              <param name="changesrevision">a4e1359ee7fa036db2712f495d4afc95c63a32d8</param></service></servicedata>
+              <param name="changesrevision">8711e83883b5b3f683d84d847cdd196cb9550352</param></service></servicedata>

netavark-1.11.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c6331985314dc0d61a9dba6c4555831388dbff4b8f0cb413d1bdeb06cb1585f
-size 168986

netavark-1.12.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0717c3bb7bcbe5fe4e05d83cbc19829527d2098569c4e59dd3fc19384dab952e
-size 169915

netavark-iptables.conf

@@ -0,0 +1,4 @@
+# A rootless user has no permsissions to load kernel modules.
+# If iptables is using nftables as a backend this might not be needed.
+ip_tables
+ip6_tables

netavark-nftables.conf

@@ -0,0 +1,2 @@
+# A rootless user has no permsissions to load kernel modules.
+nf_tables

netavark.changes

@@ -1,3 +1,173 @@
+-------------------------------------------------------------------
+Wed Mar 19 05:31:40 UTC 2025 - madhankumar.chellamuthu@suse.com
+
+- Update to version 1.14.1:
+  * Release v1.14.1
+  * Release notes for v1.14.0
+  * Fix detect of Firewalld's StrictForwardPorts property
+  * test/001-basic: Make commit test optional
+  * cirrus: do not build debug bins
+  * Makefile: do not rebuild if nothing changed
+  * Makefile: uninstall netavark-firewalld-reload.service
+  * docs/Makefile: several fixes
+  * Makefile: build docs by default
+  * Makefile: do not build twice
+
+-------------------------------------------------------------------
+Fri Feb 14 02:30:40 UTC 2025 - Danish Prakash <danish.prakash@suse.com>
+
+- Remove netavark-1.14.0.obscpio checked-in mistakenly.
+- Use recommended way to require latest rust—require cargo.
+
+-------------------------------------------------------------------
+Tue Feb 11 06:40:12 UTC 2025 - madhankumar.chellamuthu@suse.com
+
+- Update to version 1.14.0:
+  * Release v1.14.0
+  * release notes for v1.14.0
+  * update release notes from v1.13.1
+  * run cargo update
+  * Finalize firewalld port forwarding support
+  * chore(deps): update rust crate once_cell to 1.20.3
+  * fix(deps): update rust crate rand to 0.9.0
+  * Add handling for firewalld's StrictForwardPorts setting
+  * fix lint issues wirh rust 1.84
+  * chore(deps): update dependency containers/automation_images to v20250131
+  * chore(deps): update rust crate tempfile to 3.16.0
+  * rename macvlan_dhcp.rs to dhcp.rs
+  * bridge: only allow dhcp with unmanaged mode
+  * bridge: support DHCP ipam driver
+  * fix(deps): update rust crate ipnet to 2.11.0
+  * fix(deps): update rust crate serde_json to 1.0.136
+  * fix(deps): update rust crate log to 0.4.24
+  * bridge: add vlan support
+  * fix(deps): update rust crate tokio to 1.43.0
+  * fix(deps): update rust crate serde_json to 1.0.135
+  * New VM Images
+  * fix(deps): update rust crate clap to ~4.5.23
+  * chore(deps): update rust crate tempfile to 3.15.0
+  * fix(deps): update rust crate nispor to 1.2.22
+  * fix(deps): update rust crate serde_json to 1.0.134
+  * fix(deps): update rust crate env_logger to 0.11.6
+  * Add container hostname to DHCP requests and use container id as client id
+  * fix(deps): update rust crate mozim to 0.2.5
+  * generate protobuf in OUT_DIR
+  * fix(deps): update rust crate tower to 0.5.2
+  * Cargo.lock: bump some versions
+  * run cargo update
+  * cargo: set rust-version
+  * fix new rust 1.83 lint errors
+  * OWNERS: remove edsantiago
+  * setup: on av errors cleanup again
+  * nftables: add daddr match to port forward jump rule
+  * network: bridge: don't change forwarding sysctl for internal bridges
+  * network: bridge: add support for unmanaged mode
+  * test-dhcp: remove deprecated ifconfig/brctl commands
+  * fix new rust 1.82 lint errors
+  * update ci images
+  * fix(deps): update rust crate serde_json to 1.0.133
+  * network: bridge: add support for host_interface_name option
+  * network: add support for network-specific options
+  * fix(deps): update rust crate ipnet to 2.10.1
+  * chore(deps): update rust crate tempfile to 3.14.0
+  * fix(deps): update rust crate tokio to 1.41.1
+  * fix(deps): update rust crate anyhow to 1.0.93
+  * fix(deps): update rust crate url to 2.5.3
+  * [skip-ci] RPM: cleanup changelog conditionals
+  * fix(deps): update rust crate anyhow to 1.0.92
+  * Bump to 1.14.0-dev
+
+-------------------------------------------------------------------
+Tue Dec 10 06:53:58 UTC 2024 - madhankumar.chellamuthu@suse.com
+
+- Update to version 1.13.1:
+  * Release v1.13.1
+  * Release notes for v1.13.1
+  * setup: on av errors cleanup again
+  * nftables: add daddr match to port forward jump rule
+
+-------------------------------------------------------------------
+Wed Nov 27 19:17:10 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
+
+- Fix source definition for netavark-iptables.conf and netavark-nftables.conf
+
+-------------------------------------------------------------------
+Fri Nov  1 09:58:34 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
+
+- Set default firewall driver based on the project configuration (bsc#1231424)
+  * Require correct dependencies
+  * Add netavark-iptables.conf and netavark-nftables.conf
+
+-------------------------------------------------------------------
+Wed Oct 30 02:02:34 UTC 2024 - danish.prakash@suse.com
+
+- Update to version 1.13.0:
+  * Release v1.13.0
+  * Updates release notes for v1.13.0
+  * run cargo update
+  * fix(deps): update rust crate hyper-util to 0.1.10
+  * [skip-ci] Packit: Remove epel targets
+  * fix(deps): update rust crate nftables to 0.5.0
+  * fix(deps): update rust crate anyhow to 1.0.91
+  * fix(deps): update rust crate tokio to 1.41.0
+  * fix(deps): update rust crate anyhow to 1.0.90
+  * Updated to zbus4
+  * chore(deps): update dependency containers/automation_images to v20241010
+  * test-dhcp: fix NOP test
+  * fix new lint errors with rust 1.81
+  * fix(deps): update rust crate clap to ~4.5.20
+  * contrib/container_images: remove no longer used images
+  * cirrus: check for msrv build
+  * add new rust image to check for MSRV
+  * define a MSRV policy
+  * [skip-ci] Packit: constrain koji and bodhi to the fedora package
+  * chore(deps): update rust crate once_cell to 1.20.2
+  * fix(deps): update rust-futures monorepo to 0.3.31
+  * OWNERS file audit and update
+  * update tonic and prost dependencies
+  * update tower to v0.5.1
+  * fix(deps): update rust crate sysctl to 0.6.0
+  * fix(deps): update rust crate netlink-packet-route to 0.21.0
+  * chore(deps): update rust crate tempfile to 3.13.0
+  * chore(deps): update rust crate once_cell to 1.20.1
+  * fix(deps): update rust crate nispor to 1.2.21
+  * fix(deps): update rust crate anyhow to 1.0.89
+  * nftables: add dns dnat rule first
+  * iptables: add dns dnat rule first
+  * fix(deps): update rust crate anyhow to 1.0.88
+  * nft: remove port forwarding rules correctly
+  * fix(deps): update rust crate tokio-stream to 0.1.16
+  * nft: do not parse localhost string ip
+  * nft: use append() over push() where possible
+  * Packit: add sidetag to release with aardvark-dns
+  * fix(deps): update rust crate tokio to 1.40.0
+  * fix(deps): update rust crate libc to 0.2.157
+  * fix(deps): update rust crate tokio to 1.39.3
+  * fix(deps): update rust crate libc to 0.2.156
+  * aardvark: on start failure delete entries again
+  * iptables: make dns rules cover tcp as well
+  * nftables: make dns rules cover tcp as well
+  * fix(deps): update rust crate serde_json to 1.0.123
+  * remove superfluous formatters from debug stmt
+  * chore(deps): update rust crate tempfile to 3.12.0
+  * fix new rust 1.80 lint issues
+  * silence new rust 1.80 warnings
+  * chore(deps): update rust crate tempfile to 3.11.0
+  * fix(deps): update rust crate serde_json to 1.0.122
+  * Bumping main back to v1.13.0-dev for development
+
+-------------------------------------------------------------------
+Tue Sep 10 15:51:16 UTC 2024 - danish.prakash@suse.com
+
+- Update to version 1.12.2:
+  * Release v1.12.2
+  * Release notes for 1.12.2
+  * fix new rust 1.80 lint issues
+  * silence new rust 1.80 warnings
+  * aardvark: on start failure delete entries again
+  * iptables: make dns rules cover tcp as well
+  * nftables: make dns rules cover tcp as well
+
 -------------------------------------------------------------------
 Wed Aug 07 06:36:53 UTC 2024 - danish.prakash@suse.com
 
@@ -19,7 +189,7 @@ Wed Aug 07 06:36:53 UTC 2024 - danish.prakash@suse.com
   * fix(deps): update rust crate tokio to 1.39.1
   * fix(deps): update rust crate env_logger to 0.11.4
   * fix(deps): update rust crate tokio to 1.38.1
-  * update mozim to 0.2.4
+  * update mozim to 0.2.4 (bsc#1236567)
   * fix(deps): update rust crate serde_json to 1.0.120
   * netavark: dhcp_proxy: use dns servers from dhcp lease
   * fix(deps): update rust crate serde_json to 1.0.119

netavark.obsinfo

@@ -0,0 +1,4 @@
+name: netavark
+version: 1.14.1
+mtime: 1742234486
+commit: 8711e83883b5b3f683d84d847cdd196cb9550352

netavark.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package netavark
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,21 +19,23 @@
 %define major_minor %((v=%{version}; echo ${v%.*}))
 
 Name:           netavark
-Version:        1.12.1
+Version:        1.14.1
 Release:        0
 Summary:        Container network stack
 License:        Apache-2.0
 URL:            https://github.com/containers/%{name}
 Source0:        %{name}-%{version}.tar.gz
 Source1:        vendor.tar.gz
+Source2:        netavark-iptables.conf
+Source3:        netavark-nftables.conf
+BuildRequires:  cargo
 BuildRequires:  cargo-packaging
 BuildRequires:  go-md2man
 BuildRequires:  protobuf-devel
-BuildRequires:  rust+cargo >= 1.66
 BuildRequires:  systemd-rpm-macros
 # aardvark-dns and %%{name} are usually released in sync
 Requires:       aardvark-dns >= %{major_minor}
-# Provides: container-network-stack = 2
+Requires:       %{?default_firewall_backend}
 
 %description
 Netavark is a rust based network stack for containers. It is being
@@ -56,24 +58,30 @@ Its features include:
 %autosetup -a1
 
 %build
-cargo build --release
+NETAVARK_DEFAULT_FW=%{?default_firewall_backend} cargo build --release
 mkdir -p bin
 cp target/release/%{name} bin/
 
 cd docs
 go-md2man -in %{name}.1.md -out %{name}.1
+go-md2man -in %{name}-firewalld.7.md -out %{name}-firewalld.7
 
 %install
 %make_install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBEXECDIR=%{_libexecdir}
 
+install -D -m 0644 ${RPM_SOURCE_DIR}/netavark-%{default_firewall_backend}.conf %{buildroot}%{_prefix}/lib/modules-load.d/netavark-%{default_firewall_backend}.conf
+
 %files
 %license LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}
+%{_mandir}/man7/%{name}-firewalld.7%{?ext_man}
 %{_unitdir}/%{name}-dhcp-proxy.service
 %{_unitdir}/%{name}-dhcp-proxy.socket
 %{_unitdir}/%{name}-firewalld-reload.service
+%dir %{_prefix}/lib/modules-load.d
+%{_prefix}/lib/modules-load.d/netavark-%{?default_firewall_backend}.conf
 
 %pre
 %service_add_pre %{name}-dhcp-proxy.service %{name}-dhcp-proxy.socket %{name}-firewalld-reload.service