From 038ce73bcea59d28f91ad76cd23b291eebd86f6e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 5 Apr 2020 09:56:16 +0000
Subject: user/dracut: Update to 050

---
 user/dracut/APKBUILD  |  8 +++++---
 user/dracut/fts.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 user/dracut/fts.patch

(limited to 'user/dracut')

diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index fd0988844..40f60f469 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dracut
-pkgver=048
-pkgrel=4
+pkgver=050
+pkgrel=0
 pkgdesc="Event-driven initramfs infrastructure"
 url="https://dracut.wiki.kernel.org/"
 arch="all"
@@ -13,6 +13,7 @@ makedepends="fts-dev kmod-dev"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
 	$pkgname-crypt::noarch $pkgname-lvm::noarch"
 source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.xz
+	fts.patch
 	header-fix.patch
 	mount-run-without-noexec.patch
 	"
@@ -67,6 +68,7 @@ lvm() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0  dracut-048.tar.xz
+sha512sums="eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850  dracut-050.tar.xz
+ce84e527e441e18494ea9011b4b10cf723ce5981c4717140f43861b6ed3e0f0aa78545be41c111d3338422f2ad158edc8704376c3dca207ae4445c58f54a4574  fts.patch
 988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c  header-fix.patch
 d7aa2b35def975ec2a9620d3e8c94da5fad5be51e81ac913b9f3497b3ca62beefb9d4cf8e4ba3b292f89b936373486d0e3184f65eb1eaed972f38d17424a32b1  mount-run-without-noexec.patch"
diff --git a/user/dracut/fts.patch b/user/dracut/fts.patch
new file mode 100644
index 000000000..f2bbb03b7
--- /dev/null
+++ b/user/dracut/fts.patch
@@ -0,0 +1,30 @@
+From 7f6517b7dc3f3d160ae43de43d1184b137c0c96f Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 5 Apr 2020 04:52:19 -0500
+Subject: [PATCH] configure: Find FTS library with --as-needed
+
+When LDFLAGS contains ``-Wl,--as-needed``, the FTS library will be
+ignored if it is specified before the .c source.
+
+Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
+Fixes: 62f27ee6f145 ("configure: find cflags and libs for fts on musl")
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 3f724ef2..aceec138 100755
+--- a/configure
++++ b/configure
+@@ -85,7 +85,7 @@ EOF
+ 
+ found=no
+ for lib in "-lc" "-lfts"; do
+-	${CC} $CFLAGS -Wl,$lib $LDFLAGS conftest.c >/dev/null 2>&1
++	${CC} $CFLAGS $LDFLAGS conftest.c -Wl,$lib >/dev/null 2>&1
+ 	ret=$?
+ 	if test $ret -eq 0; then
+ 		FTS_LIBS="$lib"
+-- 
+2.25.1
+
-- 
cgit v1.2.3-60-g2f50