9 changed files with 9 additions and 113 deletions
--- a/2
+++ b/2
@ -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.13.1</param>
+    <param name="revision">v1.12.1</param>
    <param name="match-tag">*</param>
    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
    <param name="versionrewrite-replacement">\1</param>
--- a/2
+++ b/2
@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                <param name="url">https://github.com/containers/netavark.git</param>
-              <param name="changesrevision">0935a20455c3e6292a29b2a7b1a4030716b96be5</param></service></servicedata>
+              <param name="changesrevision">a4e1359ee7fa036db2712f495d4afc95c63a32d8</param></service></servicedata>
--- a/netavark-1.12.1.tar.gz
+++ b/netavark-1.12.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0717c3bb7bcbe5fe4e05d83cbc19829527d2098569c4e59dd3fc19384dab952e
+size 169915
--- a/netavark-1.13.1.tar.gz
+++ b/netavark-1.13.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:094fd8818b654649955d1f1e4dbd0836faa1e7a017f552f5bf13e51aa47c2551
-size 170488
--- a/netavark-iptables.conf
+++ b/netavark-iptables.conf
@ -1,4 +0,0 @@
-# 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
--- a/netavark-nftables.conf
+++ b/netavark-nftables.conf
@ -1,2 +0,0 @@
-# A rootless user has no permsissions to load kernel modules.
-nf_tables
--- a/netavark.changes
+++ b/netavark.changes
@ -1,94 +1,3 @@
-------------------------------------------------------------------
-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

--- a/netavark.spec
+++ b/netavark.spec
@ -19,15 +19,13 @@
 %define major_minor %((v=%{version}; echo ${v%.*}))

 Name:           netavark
-Version:        1.13.1
+Version:        1.12.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-packaging
 BuildRequires:  go-md2man
 BuildRequires:  protobuf-devel
@ -36,7 +34,6 @@ 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
@ -59,7 +56,7 @@ Its features include:
 %autosetup -a1

 %build
-NETAVARK_DEFAULT_FW=%{?default_firewall_backend} cargo build --release
+cargo build --release
 mkdir -p bin
 cp target/release/%{name} bin/

@ -69,8 +66,6 @@ go-md2man -in %{name}.1.md -out %{name}.1
 %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
@ -79,8 +74,6 @@ install -D -m 0644 ${RPM_SOURCE_DIR}/netavark-%{default_firewall_backend}.conf %
 %{_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
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ced02529027e9f2dc077711e6747efc74ef89e0bee55010722d3629a6a51ac6
-size 37231011
+oid sha256:29d323de6615e4f005e26a8340f757512248525185a4b1bef12b5321980d5322
+size 45892590