mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-26 03:50:44 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/openssh: fix musl compile issue

Browse Source 
Building package/openssh 9.9p1 with musl failed during linking because
construct_utmp() was referenced due to "use construct_utmp to
construct btmp records" [1], but not built as utmp is disabled in the
Buildroot package. The fix comes from upstream and ensures the
construct_utmp function actually gets built when USE_BTMP is set [2].

[1] https://anongit.mindrot.org/openssh.git/commit/?id=671c440786a5a66216922f15d0007b60f1e6733f
[2] https://anongit.mindrot.org/openssh.git/commit/?id=76a618d2842c34c16cd21a4efc7230e2f459008d

Fixes:

  http://autobuild.buildroot.net/results/1e651724373f32e45d122d05fa3a10ac88fe29dc/

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fiona Klute (WIWA)
2024-10-28 17:31:37 +01:00
committed by Thomas Petazzoni
parent 81e7806b93
commit 2065fecbf3
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch Normal file
View File

@@ -0,0 +1,35 @@
From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 25 Sep 2024 11:13:05 +1000
Subject: [PATCH] build construct_utmp() when USE_BTMP is set
Fixes compile error on Void Linux/Musl
Upstream: https://anongit.mindrot.org/openssh.git/commit/?id=76a618d2842c34c16cd21a4efc7230e2f459008d
Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
loginrec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/loginrec.c b/loginrec.c
index 45f13dee8b1f..7b1818b86753 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize)
** into account.
**/
-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
+#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
/* build the utmp structure */
void
@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li,
}
# endif
}
-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
+#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */
/**
** utmpx utility functions