Merge branch 'github-pull-47' into for-master

These patches help build make-initrd on musl-based systems (tested on
Gentoo). However, support is not yet complete because musl's `ldconfig`
does not support the `-p` argument:
```
$ ldconfig -p
Unimplemented option: -p
```
As a result, all code that relies on `ldconfig -p` (and likely `ldconfig
-vNX` too) is currently broken.

This PR contains the first commit from the
#46 as both patchsets modify
the same areas of the code, even though they are not directly related.

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

Makefile.in

@@ -57,6 +57,8 @@ dest_data_sbindir := $(dest_runtimedir)/sbin
 dest_data_libdir  := $(dest_runtimedir)/$(libcdir)
 dest_featuredir   := $(dest_execdir)/$(FEATURESDIR)
 
+fts_LIBS := @fts_LIBS@
+
 HAVE_GZIP        := @HAVE_GZIP@
 HAVE_GZIP_LIBS   := @HAVE_GZIP_LIBS@
 HAVE_GZIP_CFLAGS := @HAVE_GZIP_CFLAGS@
@@ -132,7 +134,7 @@ CFLAGS = @CFLAGS@ \
 	-Wno-pointer-arith \
 	-Werror=shadow -Werror=missing-prototypes -Werror=implicit-function-declaration
 
-CPPFLAGS += @CPPFLAGS@ @DEFS@ -I$(CURDIR)
+CPPFLAGS += @CPPFLAGS@ @DEFS@ -I$(CURDIR) -I$(CURDIR)/include
 
 UDEVD		= @UDEVD@
 UDEVADM		= @UDEVADM@

configure.ac

@@ -60,6 +60,16 @@ AC_CHECK_FUNCS([ \
 		strpbrk strrchr strstr strtol strtoul strtoull uname \
 		twalk_r tdestroy updwtmp])
 
+saved_LIBS="$LIBS"
+AC_SEARCH_LIBS([fts_close], [fts])
+LIBS="$saved_LIBS"
+case "$ac_cv_search_fts_close" in
+	no) AC_MSG_FAILURE([failed to find fts_close]) ;;
+	-l*) fts_LIBS="$ac_cv_search_fts_close" ;;
+	*) fts_LIBS= ;;
+esac
+AC_SUBST([fts_LIBS])
+
 AC_MSG_CHECKING([if in-tree build is required])
 AC_ARG_ENABLE(local-build,
 	[AS_HELP_STRING(--enable-local-build,

include/temp_failure_retry.h

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+// Copyright (C) 1991-2025 Free Software Foundation, Inc.
+
+#ifndef _TEMP_FAILURE_RETRY_H
+# define _TEMP_FAILURE_RETRY_H	1
+
+# include <unistd.h>
+
+# ifndef TEMP_FAILURE_RETRY
+/* This implementation of TEMP_FAILURE_RETRY is taken from the glibc code. */
+#  define TEMP_FAILURE_RETRY(expression)				\
+   (__extension__							\
+     ({ long int __result;						\
+        do __result = (long int) (expression);				\
+        while (__result == -1L && errno == EINTR);			\
+        __result; }))
+
+# endif
+#endif

runtime/src/libinitramfs/logging.c

@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <time.h>
 
+#include "temp_failure_retry.h"
 #include "rd/logging.h"
 
 int log_priority = LOG_INFO;

runtime/src/nfsmount/mount.c

@@ -305,8 +305,8 @@ int nfs_mount(const char *pathname, const char *hostname,
 		goto bail;
 	}
 
-	if (bindresvport(sock, 0) == -1) {
-		perror("bindresvport");
+	if (bindanyprivport(sock) == -1) {
+		perror("bindanyprivport");
 		goto bail;
 	}
 

runtime/src/nfsmount/sunrpc.c

@@ -3,6 +3,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <errno.h>
 #include <poll.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -141,6 +142,29 @@ static int rpc_call_udp(struct client *clnt, struct rpc *rpc)
 	return (int) ret;
 }
 
+int bindanyprivport(int sd)
+{
+	struct sockaddr_in addr;
+	memset(&addr, 0, sizeof(addr));
+	addr.sin_family = AF_INET;
+
+#define LOWPORT 512
+#define ENDPORT (IPPORT_RESERVED - 1)
+
+	for (short port = LOWPORT; port <= ENDPORT; ++port) {
+		addr.sin_port = htons(port);
+		if (bind(sd, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
+			return 0;
+		}
+
+		if (errno != EADDRINUSE) {
+			return -1;
+		}
+	}
+
+	return -1;
+}
+
 struct client *tcp_client(uint32_t server, uint16_t port, uint32_t flags)
 {
 	struct client *clnt = malloc(sizeof(*clnt));
@@ -159,8 +183,8 @@ struct client *tcp_client(uint32_t server, uint16_t port, uint32_t flags)
 		goto bail;
 	}
 
-	if ((flags & CLI_RESVPORT) && bindresvport(sock, 0) == -1) {
-		perror("bindresvport");
+	if ((flags & CLI_RESVPORT) && bindanyprivport(sock) == -1) {
+		perror("bindanyprivport");
 		goto bail;
 	}
 
@@ -204,8 +228,8 @@ struct client *udp_client(uint32_t server, uint16_t port, uint32_t flags)
 		goto bail;
 	}
 
-	if ((flags & CLI_RESVPORT) && bindresvport(sock, 0) == -1) {
-		perror("bindresvport");
+	if ((flags & CLI_RESVPORT) && bindanyprivport(sock) == -1) {
+		perror("bindanyprivport");
 		goto bail;
 	} else {
 		struct sockaddr_in me;

runtime/src/nfsmount/sunrpc.h

@@ -99,6 +99,7 @@ struct client {
 
 #define CLI_RESVPORT	00000001
 
+int bindanyprivport(int sd);
 struct client *tcp_client(uint32_t server, uint16_t port, uint32_t flags);
 struct client *udp_client(uint32_t server, uint16_t port, uint32_t flags);
 void client_free(struct client *client);

runtime/src/ueventd/path.c

@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include "temp_failure_retry.h"
 #include "rd/logging.h"
 #include "ueventd.h"
 

runtime/src/ueventd/process.c

@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include "temp_failure_retry.h"
 #include "ueventd.h"
 
 pid_t waitpid_retry(pid_t pid, int *wstatus, int options)

tools/get-libc-dir

@@ -5,4 +5,4 @@ libc="$(
 	ldd "$BASH" |
 		sed -n -e 's|[[:space:]]*libc\.so.*[[:space:]]=>[[:space:]]\(/.*\)[[:space:]](0x.*$|\1|p'
 )"
-printf '%s\n' "${libc%/libc.so*}"
+printf '%s\n' "${libc%/*}"