From: Oskari Rauta <oskari.rauta@gmail.com>
Date: Fri, 16 Feb 2024 07:29:15 +0000 (+0200)
Subject: netavark: update to 1.10.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3222ee145e6c9554374c53be5ce58b3a1a01251;p=feed%2Fpackages.git

netavark: update to 1.10.3

changelogs: https://github.com/containers/netavark/releases

wrapper script and config file removed as they have become obsolete,
firewall driver is now configured in containers.conf

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
---

diff --git a/net/netavark/Makefile b/net/netavark/Makefile
index 84d7092ae3..2296ed9b12 100644
--- a/net/netavark/Makefile
+++ b/net/netavark/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netavark
-PKG_VERSION:=1.9.0
+PKG_VERSION:=1.10.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/containers/netavark/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=9ec50b715ded0a0699134c001656fdd1411e3fb5325d347695c6cb8cc5fcf572
+PKG_HASH:=fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
 PKG_LICENSE:=Apache-2.0
@@ -33,18 +33,12 @@ define Package/netavark/description
   applicable for other OCI container management applications.
 endef
 
-define Package/netavark/conffiles
-/etc/config/netavark
-endef
-
 CARGO_PKG_VARS += \
 	PROTOC=$(STAGING_DIR_HOSTPKG)/bin/protoc
 
 define Package/netavark/install
 	$(INSTALL_DIR) $(1)/etc/config $(1)/usr/lib/podman
-	$(INSTALL_CONF) ./files/netavark-config $(1)/etc/config/netavark
-	$(INSTALL_BIN) ./files/netavark-wrapper $(1)/usr/lib/podman/netavark
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/netavark $(1)/usr/lib/podman/netavark-bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/netavark $(1)/usr/lib/podman
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/netavark-dhcp-proxy-client $(1)/usr/lib/podman/
 endef
 
diff --git a/net/netavark/files/netavark-config b/net/netavark/files/netavark-config
deleted file mode 100644
index c9c3796af6..0000000000
--- a/net/netavark/files/netavark-config
+++ /dev/null
@@ -1,3 +0,0 @@
-
-config firewall
-	option driver 'none'
diff --git a/net/netavark/files/netavark-wrapper b/net/netavark/files/netavark-wrapper
deleted file mode 100755
index d072bb29bf..0000000000
--- a/net/netavark/files/netavark-wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-FW_DRIVER=$(uci -q get 'netavark.@firewall[0].driver')
-[ -z "$FW_DRIVER" ] && FW_DRIVER="none"
-
-NETAVARK_FW="$FW_DRIVER" /usr/lib/podman/netavark-bin $@