From 5f38b943b2835adb8d0cf1d64da134c5c1dfc0dc Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 3 Jul 2024 15:18:16 -0700
Subject: [PATCH] systemd/abuild: update -systemd split func patch (MR 5563)

Build abuild from upstream source and only apply the systemd split func
patch. The patch was also adjusted to use -systemd instead of -service
for subpackages
---
 .../0001-abuild-add-systemd-splitfunc.patch   | 66 +++++++++++++++++++
 extra-repos/systemd/abuild/APKBUILD           | 14 ++--
 2 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 extra-repos/systemd/abuild/0001-abuild-add-systemd-splitfunc.patch

diff --git a/extra-repos/systemd/abuild/0001-abuild-add-systemd-splitfunc.patch b/extra-repos/systemd/abuild/0001-abuild-add-systemd-splitfunc.patch
new file mode 100644
index 000000000..2c8958029
--- /dev/null
+++ b/extra-repos/systemd/abuild/0001-abuild-add-systemd-splitfunc.patch
@@ -0,0 +1,66 @@
+From 0bda547b2d7694ab40e0237ea6ae8a25a237ee50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Thu, 11 Apr 2024 13:57:26 +0200
+Subject: [PATCH 1/2] abuild: add systemd splitfunc
+
+Co-authored-by: Caleb Connolly <caleb@postmarketos.org>
+---
+ abuild.in | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/abuild.in b/abuild.in
+index 36317d6..74e47f1 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -815,6 +815,11 @@ postcheck() {
+ 			&& ! is_openrc_pkg "$name"; then
+ 		warning "Found OpenRC directory (/etc/conf.d or /etc/init.d) but name doesn't end with -openrc"
+ 	fi
++	# look for /usr/lib/systemd
++	if [ -e "$dir"/usr/lib/systemd ] \
++			&& ! is_systemd_pkg "$name"; then
++		warning "Found systemd directory (/usr/lib/systemd) but it's not in a systemd package"
++	fi
+ 	# look for /usr/share/doc
+ 	if [ -e "$dir"/usr/share/doc ] \
+ 			&& ! is_doc_pkg "$name"; then
+@@ -1371,6 +1376,11 @@ is_openrc_pkg() {
+ 	test "${1%-openrc}" != "$1"
+ }
+ 
++# returns true if this is the -systemd package
++is_systemd_pkg() {
++	test "${1%-systemd}" != "$1" || test "systemd" == "$1"
++}
++
+ # returns true if this is the -bash-completion package
+ is_bashcomp_pkg() {
+ 	test "${1%-bash-completion}" != "$1"
+@@ -2143,6 +2153,24 @@ openrc() {
+ 	default_openrc
+ }
+ 
++# predefined splitfunc systemd
++default_systemd() {
++	depends="$depends_systemd"
++	pkgdesc="$pkgdesc (systemd files)"
++	install_if="systemd ${subpkgname%-systemd}=$pkgver-r$pkgrel"
++
++	if [ -d lib/systemd ]; then
++		error "Detected /lib/systemd dir, should be installed to /usr/lib/systemd"
++		return 1
++	fi
++
++	amove usr/lib/systemd
++}
++
++systemd() {
++	default_systemd
++}
++
+ default_devhelp() {
+ 	depends=""
+ 	pkgdesc="$pkgname - devhelp files"
+-- 
+2.45.2
+
diff --git a/extra-repos/systemd/abuild/APKBUILD b/extra-repos/systemd/abuild/APKBUILD
index 28c21ee94..58988abad 100644
--- a/extra-repos/systemd/abuild/APKBUILD
+++ b/extra-repos/systemd/abuild/APKBUILD
@@ -3,9 +3,7 @@
 pkgname=abuild
 pkgver=99993.12.0
 _pkgver=3.12.0
-_commit="d45c6dbee9171fa9dc25b2d6b298469619fbedb6"
-_ver=${_pkgver%_git*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -24,8 +22,11 @@ subpackages="
 	"
 options="suid !check" # tests are SLOW in qemu
 pkggroups="abuild"
-source="https://gitlab.com/calebccff/abuild/-/archive/$_commit/abuild-$_commit.tar.gz"
-builddir="$srcdir"/abuild-"$_commit"
+source="
+	https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$_pkgver/abuild-$_pkgver.tar.gz
+	0001-abuild-add-systemd-splitfunc.patch
+	"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
 	make VERSION="$_pkgver-r$pkgrel"
@@ -99,5 +100,6 @@ _rootbld() {
 }
 
 sha512sums="
-3959c47c8ada26a23f647b4af4258e6ff1a8c7b6b4821cafe655da953933f12fed8c5753a8ec2cde6abd1e3e9b67dccaa74acc0633827d581d532905af9fb1e4  abuild-d45c6dbee9171fa9dc25b2d6b298469619fbedb6.tar.gz
+00fac67aa96a83f33406dde60bd9526bfa5fdff690b84dbe867b6ed197f147b2afafcdfbda900c005e00a64a42bcb98ca425ffc8bf2158b9540cbb67d935577d  abuild-3.12.0.tar.gz
+52cc5857b3c93bd4595de1d06c3c600b88871c68f7a1ea51e10d720ddd9c8fb7f0f63cd2f4fe280c0d9adaf607de8b858f4add3e46b1a5a28cc6c711359f6c60  0001-abuild-add-systemd-splitfunc.patch
 "