From b5c094f158663618480eb5c937a79b5fb0c5a155 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 31 May 2024 22:22:14 +0000
Subject: [PATCH] netavark: update to 1.12.2 and fix cross-compile build

---
 .../addon-depends/podman/netavark/package.mk   | 18 ++++++++++++++++--
 .../patches/netavark-0001-no-docs.patch        |  8 ++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/addons/addon-depends/podman/netavark/package.mk b/packages/addons/addon-depends/podman/netavark/package.mk
index 3f3bc30ca4..dfead87817 100644
--- a/packages/addons/addon-depends/podman/netavark/package.mk
+++ b/packages/addons/addon-depends/podman/netavark/package.mk
@@ -2,10 +2,24 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="netavark"
-PKG_VERSION="1.10.3"
-PKG_SHA256="fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7"
+PKG_VERSION="1.12.2"
+PKG_SHA256="d1e5a7e65b825724fd084b0162084d9b61db8cda1dad26de8a07be1bd6891dbc"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/containers/netavark"
 PKG_URL="https://github.com/containers/netavark/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cargo:host protobuf:host"
 PKG_LONGDESC="Container network stack"
+PKG_TOOLCHAIN="manual"
+
+make_target() {
+  cargo build \
+    --target ${TARGET_NAME} \
+    --release \
+    --locked \
+    --all-features
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}
+  cp ${PKG_BUILD}/.${TARGET_NAME}/target/${TARGET_NAME}/release/netavark ${INSTALL}
+}
diff --git a/packages/addons/addon-depends/podman/netavark/patches/netavark-0001-no-docs.patch b/packages/addons/addon-depends/podman/netavark/patches/netavark-0001-no-docs.patch
index 4257c35490..3e470d0545 100644
--- a/packages/addons/addon-depends/podman/netavark/patches/netavark-0001-no-docs.patch
+++ b/packages/addons/addon-depends/podman/netavark/patches/netavark-0001-no-docs.patch
@@ -1,9 +1,9 @@
---- a/Makefile	2023-02-05 14:03:46.260848926 +0000
-+++ b/Makefile	2023-02-05 14:03:51.737539552 +0000
-@@ -73,7 +73,6 @@
+--- a/Makefile	2024-05-30 14:20:33.000000000 +0000
++++ b/Makefile	2024-06-01 01:36:21.083916685 +0000
+@@ -96,7 +96,6 @@
  .PHONY: install
  install: $(NV_UNIT_FILES)
- 	install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)/$(LIBEXECPODMAN)/netavark
+ 	install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)$(LIBEXECPODMAN)/netavark
 -	$(MAKE) -C docs install
  	install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}
  	install ${SELINUXOPT} -m 644 contrib/systemd/system/netavark-dhcp-proxy.socket ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.socket