$ cat Portability-fixes.patch
From d59918e0b6e49fb68da5f11a9f17826a1de81b12 Mon Sep 17 00:00:00 2001
From:
Date: Mon, 8 Apr 2019 18:12:43 -0500
Subject: [PATCH 3/3] Portability fixes:

- Use fcntl.h for O_RDONLY and friends.
- Only use mallinfo with glibc.

Signed-off-by: Jory Pratt <anarchy@gentoo.org>
---
 lib/mm/memlock.c                 | 2 +-
 libdaemon/server/daemon-server.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index c8e6ef1..81b74fc 100644
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -159,7 +159,7 @@ static void _touch_memory(void *mem, size_t size)

 static void _allocate_memory(void)
 {
-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
 	void *stack_mem;
 	struct rlimit limit;
 	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 3b19883..4a38de9 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -18,6 +18,7 @@
 #include "daemon-server.h"
 #include "daemon-log.h"

+#include <fcntl.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <pthread.h>
--
2.21.0

$ cat enable-mlock-by-default-on-everything-but-GLIBC.patch
From b69ecf32b72c28f59a068d935d66a7b8df73e645 Mon Sep 17 00:00:00 2001
From:
Date: Mon, 8 Apr 2019 18:12:12 -0500
Subject: [PATCH 2/3] enable mlock by default on everything but GLIBC

Signed-off-by: Jory Pratt <anarchy@gentoo.org>
---
 lib/config/defaults.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 9e398d7..347206a 100644
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -55,7 +55,11 @@
 #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
 #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
 #define DEFAULT_PRIORITISE_WRITE_LOCKS 1
+#ifdef __GLIBC__
 #define DEFAULT_USE_MLOCKALL 0
+#else
+#define DEFAULT_USE_MLOCKALL 1
+#endif
 #define DEFAULT_METADATA_READ_ONLY 0
 #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0
 #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]"
--
2.21.0

$ cat fix-stdio-useage.patch
From f176f0c0a7c7b24c98923ba749acca31e314fb64 Mon Sep 17 00:00:00 2001
From:
Date: Mon, 8 Apr 2019 18:11:50 -0500
Subject: [PATCH 1/3] fix stdio useage

Signed-off-by: Jory Pratt <anarchy@gentoo.org>
---
 lib/commands/toolcontext.c | 4 ++--
 tools/lvmcmdline.c         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 25e8b87..8782db5 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1864,7 +1864,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 	/* FIXME Make this configurable? */
 	reset_lvm_errno(1);

-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
 	/* Set in/out stream buffering before glibc */
 	if (set_buffering
 #ifdef SYS_gettid
@@ -2258,7 +2258,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
 	if (cmd->libmem)
 		dm_pool_destroy(cmd->libmem);

-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
 	if (cmd->linebuffer) {
 		/* Reset stream buffering to defaults */
 		if (is_valid_fd(STDIN_FILENO) &&
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index a9c3e41..daad90d 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3110,7 +3110,7 @@ static int _check_standard_fds(void)
 	int err = is_valid_fd(STDERR_FILENO);

 	if (!is_valid_fd(STDIN_FILENO) &&
-	    !(stdin = fopen(_PATH_DEVNULL, "r"))) {
+	    !freopen(_PATH_DEVNULL, "r", stdin)) {
 		if (err)
 			perror("stdin stream open");
 		else
@@ -3120,7 +3120,7 @@ static int _check_standard_fds(void)
 	}

 	if (!is_valid_fd(STDOUT_FILENO) &&
-	    !(stdout = fopen(_PATH_DEVNULL, "w"))) {
+	    !freopen(_PATH_DEVNULL, "w", stdout)) {
 		if (err)
 			perror("stdout stream open");
 		/* else no stdout */
@@ -3128,7 +3128,7 @@ static int _check_standard_fds(void)
 	}

 	if (!is_valid_fd(STDERR_FILENO) &&
-	    !(stderr = fopen(_PATH_DEVNULL, "w"))) {
+	    !freopen(_PATH_DEVNULL, "w", stderr)) {
 		printf("stderr stream open: %s\n",
 		       strerror(errno));
 		return 0;
--
2.21.0