From 2be3ce343e48db5fe9b7910707b13e233816dd48 Mon Sep 17 00:00:00 2001
From: xdavidwu <xdavidwuph@gmail.com>
Date: Wed, 22 Jun 2022 22:33:38 +0800
Subject: [PATCH] systemd: add another musl fix

---
 systemd/0001-Add-sys-file.h-for-LOCK_.patch | 78 +++++++++++++++++++++
 systemd/APKBUILD                            |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 systemd/0001-Add-sys-file.h-for-LOCK_.patch

diff --git a/systemd/0001-Add-sys-file.h-for-LOCK_.patch b/systemd/0001-Add-sys-file.h-for-LOCK_.patch
new file mode 100644
index 0000000..a3e148e
--- /dev/null
+++ b/systemd/0001-Add-sys-file.h-for-LOCK_.patch
@@ -0,0 +1,78 @@
+From c193380a08f5adea1fd514e0a20abd1d7b50d08c Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pavel.zhukov@huawei.com>
+Date: Mon, 20 Jun 2022 11:24:52 +0200
+Subject: [PATCH] Add sys/file.h for LOCK_
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23790]
+
+Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
+
+---
+ src/core/namespace.c       | 1 +
+ src/dissect/dissect.c      | 1 +
+ src/shared/dissect-image.c | 2 ++
+ src/sysext/sysext.c        | 1 +
+ src/test/test-loop-block.c | 1 +
+ 5 files changed, 6 insertions(+)
+
+diff --git a/src/core/namespace.c b/src/core/namespace.c
+index 926aa96174..39f9e21c93 100644
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -7,6 +7,7 @@
+ #include <sys/mount.h>
+ #include <unistd.h>
+ #include <linux/fs.h>
++#include <sys/file.h>
+ 
+ #include "alloc-util.h"
+ #include "base-filesystem.h"
+diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
+index bd94a755db..a0d2a6f287 100644
+--- a/src/dissect/dissect.c
++++ b/src/dissect/dissect.c
+@@ -6,6 +6,7 @@
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+ #include <sys/mount.h>
++#include <sys/file.h>
+ 
+ #include "architecture.h"
+ #include "chase-symlinks.h"
+diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
+index 1ab88839aa..a9e3fe4b44 100644
+--- a/src/shared/dissect-image.c
++++ b/src/shared/dissect-image.c
+@@ -4,6 +4,8 @@
+ #include <valgrind/memcheck.h>
+ #endif
+ 
++#include <sys/file.h>
++
+ #include <linux/blkpg.h>
+ #include <linux/dm-ioctl.h>
+ #include <linux/loop.h>
+diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
+index 364af195e0..85686c0fab 100644
+--- a/src/sysext/sysext.c
++++ b/src/sysext/sysext.c
+@@ -5,6 +5,7 @@
+ #include <linux/loop.h>
+ #include <sys/mount.h>
+ #include <unistd.h>
++#include <sys/file.h>
+ 
+ #include "capability-util.h"
+ #include "chase-symlinks.h"
+diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
+index d1793222f0..6886c4cd31 100644
+--- a/src/test/test-loop-block.c
++++ b/src/test/test-loop-block.c
+@@ -3,6 +3,7 @@
+ #include <fcntl.h>
+ #include <linux/loop.h>
+ #include <pthread.h>
++#include <sys/file.h>
+ 
+ #include "alloc-util.h"
+ #include "dissect-image.h"
diff --git a/systemd/APKBUILD b/systemd/APKBUILD
index 4b16d9a..f368d2c 100644
--- a/systemd/APKBUILD
+++ b/systemd/APKBUILD
@@ -15,6 +15,7 @@ checkdepends=""
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
 source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archive/refs/tags/v$pkgver.tar.gz
+	0001-Add-sys-file.h-for-LOCK_.patch
 	0001-shared-utmp-wtmp-fix-build-without-utmp.patch
 	0001-Adjust-for-musl-headers.patch
 	0001-pass-correct-parameters-to-getdents64.patch
@@ -141,6 +142,7 @@ package() {
 
 sha512sums="
 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c  systemd-251.2.tar.gz
+05b77c89c9314b40c44d882d36af25f99b42aed997f09d0f5307249bb7c36adfd2f770d1570b0019138dea6f23a2ea483fa66d4e3ba4e9a6622cd406d85b8ad4  0001-Add-sys-file.h-for-LOCK_.patch
 d44497bc2884f387ad1e9529c8b953d45a3f953895331c4dfb54c4b31823b6703c03fd9ca03c06dc435339681ab3924a13a74ac32df38c555df5a1ca72179fe6  0001-shared-utmp-wtmp-fix-build-without-utmp.patch
 f076304ea23382099c6b96b2f839f5e5b1e5847af3165f2a468fd5f9db605aa12a0a92ed565cefce58a9323eb8b9cac3a823cd2f55523b913bb8fb4fc6d84dff  0001-Adjust-for-musl-headers.patch
 ac874fd9352460005d0a4b5aec04b92943d7a16621946e240eff56e74fc4b15924179889950d8c4b94f541ad7df6d2b670d5a407e2e52b05b3ea2c2464bc4efb  0001-pass-correct-parameters-to-getdents64.patch
-- 
2.43.0