New upstream version 1.32.2

10 files changed, 137 insertions, 0 deletions

diff --git a/src/libnm-systemd-core/sd-adapt-core/condition.h b/src/libnm-systemd-core/sd-adapt-core/condition.h
new file mode 100644
index 00000000..d3a6812a
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/condition.h
@@ -0,0 +1,5 @@
+#pragma once
+
+/* dummy header */
+
+typedef struct _sd_adapt_Condition Condition;
diff --git a/src/libnm-systemd-core/sd-adapt-core/conf-parser.h b/src/libnm-systemd-core/sd-adapt-core/conf-parser.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/conf-parser.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/device-util.h b/src/libnm-systemd-core/sd-adapt-core/device-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/device-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/khash.h b/src/libnm-systemd-core/sd-adapt-core/khash.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/khash.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/network-util.h b/src/libnm-systemd-core/sd-adapt-core/network-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/network-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
new file mode 100644
index 00000000..e4d2d2e1
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2014 - 2016 Red Hat, Inc.
+ */
+
+#include "libnm-systemd-core/nm-default-systemd-core.h"
+
+#include "nm-sd-adapt-core.h"
+
+#include "fd-util.h"
+
+/*****************************************************************************/
+
+int
+asynchronous_close(int fd)
+{
+    safe_close(fd);
+    return -1;
+}
+
+/*****************************************************************************/
diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
new file mode 100644
index 00000000..4aae34b8
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
@@ -0,0 +1,90 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2014 - 2018 Red Hat, Inc.
+ */
+
+#ifndef __NM_SD_ADAPT_CORE_H__
+#define __NM_SD_ADAPT_CORE_H__
+
+#include "libnm-systemd-core/nm-default-systemd-core.h"
+
+#include <stdbool.h>
+#include <sys/resource.h>
+#include <time.h>
+
+#undef NETWORKMANAGER_COMPILATION
+#include "libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h"
+#undef NETWORKMANAGER_COMPILATION
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD
+
+#ifndef HAVE_SYS_AUXV_H
+    #define HAVE_SYS_AUXV_H 0
+#endif
+
+/*****************************************************************************
+ * The remainder of the header is only enabled when building the systemd code
+ * itself.
+ *****************************************************************************/
+
+#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD
+
+    #include <netinet/in.h>
+    #include <string.h>
+    #include <stdio.h>
+    #include <errno.h>
+    #include <elf.h>
+    #ifdef HAVE_SYS_AUXV_H
+        #include <sys/auxv.h>
+    #endif
+    #include <unistd.h>
+    #include <sys/syscall.h>
+    #include <sys/ioctl.h>
+
+    /* Missing in Linux 3.2.0, in Ubuntu 12.04 */
+    #ifndef BPF_XOR
+        #define BPF_XOR 0xa0
+    #endif
+
+    #ifndef ETHERTYPE_LLDP
+        #define ETHERTYPE_LLDP 0x88cc
+    #endif
+
+    #ifndef HAVE_SECURE_GETENV
+        #ifdef HAVE___SECURE_GETENV
+            #define secure_getenv __secure_getenv
+        #else
+            #error neither secure_getenv nor __secure_getenv is available
+        #endif
+    #endif
+
+    #include "libnm-base/nm-base.h"
+
+/*****************************************************************************/
+
+static inline int
+sd_notify(int unset_environment, const char *state)
+{
+    return 0;
+}
+
+    /* Can't include both net/if.h and linux/if.h; so have to define this here */
+    #ifndef IF_NAMESIZE
+        #define IF_NAMESIZE 16
+    #endif
+
+    #ifndef IFNAMSIZ
+        #define IFNAMSIZ IF_NAMESIZE
+    #endif
+
+    #ifndef MAX_HANDLE_SZ
+        #define MAX_HANDLE_SZ 128
+    #endif
+
+    #include "sd-id128.h"
+    #include "sparse-endian.h"
+    #include "async.h"
+    #include "util.h"
+
+#endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */
+
+#endif /* __NM_SD_ADAPT_CORE_H__ */
diff --git a/src/libnm-systemd-core/sd-adapt-core/sd-daemon.h b/src/libnm-systemd-core/sd-adapt-core/sd-daemon.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/sd-daemon.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/sd-device.h b/src/libnm-systemd-core/sd-adapt-core/sd-device.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/sd-device.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/udev-util.h b/src/libnm-systemd-core/sd-adapt-core/udev-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/libnm-systemd-core/sd-adapt-core/udev-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */