Merge updates from master

This commit is contained in:
Repository mirror & CI 2021-08-04 16:21:48 +00:00
commit 1c87551692
No known key found for this signature in database
GPG Key ID: 7C2AC09CD98F2EDF
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From 6becc82e262205f8a23bf9fe1127af57286826ee Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 2 Aug 2021 11:51:44 -0400
Subject: [PATCH] libsubid: fix build with libcrack
Fixes a link failure:
../libsubid/.libs/libsubid.so: undefined reference to `FascistCheck'
Bug: https://bugs.gentoo.org/806124
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
libsubid/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
index 8bba02ab..bfc982ef 100644
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -11,6 +11,7 @@ MISCLIBS = \
$(LIBAUDIT) \
$(LIBSELINUX) \
$(LIBSEMANAGE) \
+ $(LIBCRACK) \
$(LIBCRYPT_NOPAM) \
$(LIBSKEY) \
$(LIBMD) \

View File

@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
"${FILESDIR}/${P}-libsubid_pam_linking.patch"
"${FILESDIR}/${P}-libsubid_oot_build.patch"
"${FILESDIR}/shadow-4.9-libcrack.patch"
)
src_prepare() {