From e126f3e804c35480c4f075777430419d6ece23da Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 23 Sep 2018 10:10:27 +0200
Subject: New upstream version 1.12.4

---
 src/systemd/sd-adapt/env-util.h    |  3 +++
 src/systemd/sd-adapt/libudev.h     |  5 +++++
 src/systemd/sd-adapt/nm-sd-adapt.h | 13 +++++++++++++
 src/systemd/sd-adapt/sd-device.h   |  3 ---
 src/systemd/sd-adapt/udev-util.h   |  3 +++
 src/systemd/sd-adapt/udev.h        |  6 ++++++
 6 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/systemd/sd-adapt/env-util.h
 create mode 100644 src/systemd/sd-adapt/libudev.h
 delete mode 100644 src/systemd/sd-adapt/sd-device.h
 create mode 100644 src/systemd/sd-adapt/udev-util.h
 create mode 100644 src/systemd/sd-adapt/udev.h

(limited to 'src/systemd/sd-adapt')

diff --git a/src/systemd/sd-adapt/env-util.h b/src/systemd/sd-adapt/env-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/systemd/sd-adapt/env-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/systemd/sd-adapt/libudev.h b/src/systemd/sd-adapt/libudev.h
new file mode 100644
index 00000000..8c49f075
--- /dev/null
+++ b/src/systemd/sd-adapt/libudev.h
@@ -0,0 +1,5 @@
+#pragma once
+
+/* dummy header */
+
+struct udev_device;
diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
index e163eeda..380cbc60 100644
--- a/src/systemd/sd-adapt/nm-sd-adapt.h
+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
@@ -26,6 +26,10 @@
 #include <sys/resource.h>
 #include <time.h>
 
+#ifndef CLOCK_BOOTTIME
+#define CLOCK_BOOTTIME 7
+#endif
+
 #if defined(HAVE_DECL_REALLOCARRAY) && HAVE_DECL_REALLOCARRAY == 1
 #define HAVE_REALLOCARRAY 1
 #else
@@ -176,6 +180,15 @@ sd_notify (int unset_environment, const char *state)
 #define MAX_HANDLE_SZ 128
 #endif
 
+/*
+ * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
+ * CLOCK_BOOTTIME even though the kernel supports it, so provide a
+ * local definition
+ */
+#ifndef CLOCK_BOOTTIME
+#define CLOCK_BOOTTIME 7
+#endif
+
 #include "sd-id128.h"
 #include "sparse-endian.h"
 #include "async.h"
diff --git a/src/systemd/sd-adapt/sd-device.h b/src/systemd/sd-adapt/sd-device.h
deleted file mode 100644
index 637892c2..00000000
--- a/src/systemd/sd-adapt/sd-device.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-/* dummy header */
diff --git a/src/systemd/sd-adapt/udev-util.h b/src/systemd/sd-adapt/udev-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/systemd/sd-adapt/udev-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/systemd/sd-adapt/udev.h b/src/systemd/sd-adapt/udev.h
new file mode 100644
index 00000000..419abcbf
--- /dev/null
+++ b/src/systemd/sd-adapt/udev.h
@@ -0,0 +1,6 @@
+#pragma once
+
+/* dummy header */
+
+#include "libudev.h"
+#include "strv.h"
-- 
cgit 1.3.0-6-gf8a5