From 9ddc0e0cb017362c436a708d145b89d156ba5d09 Mon Sep 17 00:00:00 2001
From: SzczurekYT <szczurek@szczurek.yt>
Date: Wed, 6 Aug 2025 18:31:04 +0200
Subject: [PATCH] modem/qcom-diag: update and make consistent with systemd

- Update diag-router to include two new commits made this year
- Use linux-msm repo (the andersson one is now a redirect to it)
- Make diag-router start before rmtfs on OpenRC like on Systemd
- Add myself as a maintainer, to replace Jami Kettunen, who resigned
from this role

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6887
---
 modem/qcom-diag/APKBUILD          | 14 +++++++-------
 modem/qcom-diag/diag-router.initd |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modem/qcom-diag/APKBUILD b/modem/qcom-diag/APKBUILD
index 77fd05b4b..1ceaf9fdb 100644
--- a/modem/qcom-diag/APKBUILD
+++ b/modem/qcom-diag/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer: SzczurekYT <szczurek@szczurek.yt>
 pkgname=qcom-diag
-pkgver=0_git20210330
+pkgver=0_git20250324
 pkgrel=0
-_commit="d06e599d197790c9e84ac41a51bf124a69768c4f"
+_commit="29277ef0bcbe22468a3836b796dc525ba6df87f3"
 pkgdesc="Routing of diagnostics related messages between host and various subsystems"
-url="https://github.com/andersson/diag"
+url="https://github.com/linux-msm/diag"
 arch="all"
 license="BSD-3-Clause"
 makedepends="linux-headers musl-dev eudev-dev qrtr-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="
-	diag-$_commit.tar.gz::https://github.com/andersson/diag/archive/$_commit.tar.gz
+	diag-$_commit.tar.gz::https://github.com/linux-msm/diag/archive/$_commit.tar.gz
 	diag-router.initd
 "
 builddir="$srcdir/diag-$_commit"
@@ -27,6 +27,6 @@ package() {
 }
 
 sha512sums="
-140a8284406c155faf24d2a46fd185cfd7704915d04ce994cf9f641c26a8c1391160fc213c6d553a978d0d3df27288b03e0694917482e0244a50b4bc7ec6fb46  diag-d06e599d197790c9e84ac41a51bf124a69768c4f.tar.gz
-793411a2b404c51e0a0d734487f60a9a57754ef226e0f6c73a4656c4b96f19859214bf34d81317a05d902ec8b59ad07dbb03378e9542d87b8d3e4d147266e8a5  diag-router.initd
+19987ed217edc783fcf215b61d969d4d77c3b018db63b70543f925134100345000b434a340cec1b2494da54b66c3b39874924b174d0b4ed8fffe716b6046f6fb  diag-29277ef0bcbe22468a3836b796dc525ba6df87f3.tar.gz
+8417f0280e11a2f3855a3178da9de837202a5219eb7653779699ee7ede7f63a888bce8ff47340a5338e3a010d0c1589e5b8d5fcb627abb990d2697a9137c6606  diag-router.initd
 "
diff --git a/modem/qcom-diag/diag-router.initd b/modem/qcom-diag/diag-router.initd
index 8be5fddff..2ab0136e1 100644
--- a/modem/qcom-diag/diag-router.initd
+++ b/modem/qcom-diag/diag-router.initd
@@ -1,5 +1,12 @@
 #!/sbin/openrc-run
 supervisor=supervise-daemon
+
 name="DIAG"
 description="Qualcomm DIAG router"
+
 command="/usr/bin/diag-router"
+
+depend() {
+	before rmtfs
+}
+