systemd: merge branch 'systemd'

In addition, update src/Makefile.am with new paths and move

  src/{dhcp-manager/systemd-dhcp => systemd}/nm-sd-adapt.[ch]

as well.

diff --cc src/Makefile.am
index ebebfa7,d568c00..0008351
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -45,84 -48,6 +45,84 @@@ AM_CPPFLAGS =                               
  # primarily for its side effect of removing duplicates.
  AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d)
  
-       libsystemd-dhcp.la
 +noinst_LTLIBRARIES = \
 +      libNetworkManager.la \
 +      libnm-iface-helper.la \
- # libsystemd-dhcp
++      libsystemd-nm.la
 +
 +######################
- SYSTEMD_DHCP_CFLAGS = \
-       -I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/systemd \
-       -I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/libsystemd-network \
-       -I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/shared \
-       -I$(top_srcdir)/src/dhcp-manager/systemd-dhcp
- 
- libsystemd_dhcp_la_SOURCES = \
-       dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h \
-       dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c \
-       dhcp-manager/systemd-dhcp/src/shared/async.h \
-       dhcp-manager/systemd-dhcp/src/shared/time-util.h \
-       dhcp-manager/systemd-dhcp/src/shared/siphash24.h \
-       dhcp-manager/systemd-dhcp/src/shared/time-util.c \
-       dhcp-manager/systemd-dhcp/src/shared/socket-util.h \
-       dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h \
-       dhcp-manager/systemd-dhcp/src/shared/macro.h \
-       dhcp-manager/systemd-dhcp/src/shared/refcnt.h \
-       dhcp-manager/systemd-dhcp/src/shared/util.c \
-       dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c \
-       dhcp-manager/systemd-dhcp/src/shared/siphash24.c \
-       dhcp-manager/systemd-dhcp/src/shared/util.h \
-       dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h \
-       dhcp-manager/systemd-dhcp/src/shared/list.h \
-       dhcp-manager/systemd-dhcp/src/shared/log.h \
-       dhcp-manager/systemd-dhcp/src/shared/fileio.h \
-       dhcp-manager/systemd-dhcp/src/shared/fileio.c \
-       dhcp-manager/systemd-dhcp/src/shared/path-util.c \
-       dhcp-manager/systemd-dhcp/src/shared/path-util.h \
-       dhcp-manager/systemd-dhcp/src/shared/strv.h \
-       dhcp-manager/systemd-dhcp/src/shared/strv.c \
-       dhcp-manager/systemd-dhcp/src/shared/unaligned.h \
-       dhcp-manager/systemd-dhcp/src/shared/utf8.h \
-       dhcp-manager/systemd-dhcp/src/shared/utf8.c \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h \
-       dhcp-manager/systemd-dhcp/src/systemd/sd-event.h \
-       dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h \
-       dhcp-manager/systemd-dhcp/nm-sd-adapt.h \
-       dhcp-manager/systemd-dhcp/nm-sd-adapt.c
- 
- libsystemd_dhcp_la_CPPFLAGS = \
++# libsystemd-nm
 +######################
 +
-       $(SYSTEMD_DHCP_CFLAGS) \
++SYSTEMD_NM_CFLAGS = \
++      -I$(top_srcdir)/src/systemd/src/systemd \
++      -I$(top_srcdir)/src/systemd/src/libsystemd-network \
++      -I$(top_srcdir)/src/systemd/src/shared \
++      -I$(top_srcdir)/src/systemd
++
++libsystemd_nm_la_SOURCES = \
++      systemd/src/libsystemd/sd-id128/sd-id128.c \
++      systemd/src/libsystemd-network/dhcp-identifier.c \
++      systemd/src/libsystemd-network/dhcp-identifier.h \
++      systemd/src/libsystemd-network/dhcp-network.c \
++      systemd/src/libsystemd-network/dhcp-packet.c \
++      systemd/src/libsystemd-network/dhcp-internal.h \
++      systemd/src/libsystemd-network/dhcp6-network.c \
++      systemd/src/libsystemd-network/dhcp6-lease-internal.h \
++      systemd/src/libsystemd-network/dhcp6-option.c \
++      systemd/src/libsystemd-network/network-internal.c \
++      systemd/src/libsystemd-network/sd-dhcp-lease.c \
++      systemd/src/libsystemd-network/sd-dhcp-client.c \
++      systemd/src/libsystemd-network/dhcp-option.c \
++      systemd/src/libsystemd-network/network-internal.h \
++      systemd/src/libsystemd-network/sd-dhcp6-lease.c \
++      systemd/src/libsystemd-network/dhcp-protocol.h \
++      systemd/src/libsystemd-network/dhcp6-internal.h \
++      systemd/src/libsystemd-network/dhcp6-protocol.h \
++      systemd/src/libsystemd-network/dhcp-lease-internal.h \
++      systemd/src/libsystemd-network/sd-dhcp6-client.c \
++      systemd/src/shared/async.h \
++      systemd/src/shared/time-util.h \
++      systemd/src/shared/siphash24.h \
++      systemd/src/shared/time-util.c \
++      systemd/src/shared/socket-util.h \
++      systemd/src/shared/sparse-endian.h \
++      systemd/src/shared/macro.h \
++      systemd/src/shared/refcnt.h \
++      systemd/src/shared/util.c \
++      systemd/src/shared/in-addr-util.c \
++      systemd/src/shared/siphash24.c \
++      systemd/src/shared/util.h \
++      systemd/src/shared/in-addr-util.h \
++      systemd/src/shared/list.h \
++      systemd/src/shared/log.h \
++      systemd/src/shared/fileio.h \
++      systemd/src/shared/fileio.c \
++      systemd/src/shared/path-util.c \
++      systemd/src/shared/path-util.h \
++      systemd/src/shared/strv.h \
++      systemd/src/shared/strv.c \
++      systemd/src/shared/unaligned.h \
++      systemd/src/shared/utf8.h \
++      systemd/src/shared/utf8.c \
++      systemd/src/systemd/sd-dhcp-lease.h \
++      systemd/src/systemd/sd-dhcp-client.h \
++      systemd/src/systemd/sd-id128.h \
++      systemd/src/systemd/sd-dhcp6-lease.h \
++      systemd/src/systemd/sd-dhcp6-client.h \
++      systemd/src/systemd/sd-event.h \
++      systemd/src/systemd/_sd-common.h \
++      systemd/nm-sd-adapt.h \
++      systemd/nm-sd-adapt.c
++
++libsystemd_nm_la_CPPFLAGS = \
 +      -I$(top_srcdir)/include \
- libsystemd_dhcp_la_LIBADD = \
++      $(SYSTEMD_NM_CFLAGS) \
 +      $(GLIB_CFLAGS)
 +
++libsystemd_nm_la_LIBADD = \
 +      $(GLIB_LIBS)
 +
  ###########################################
  # NetworkManager
  ###########################################
@@@ -400,7 -328,6 +399,7 @@@ AM_CPPFLAGS += 
        $(LIBNDP_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(SYSTEMD_LOGIN_CFLAGS) \
-       $(SYSTEMD_DHCP_CFLAGS) \
++      $(SYSTEMD_NM_CFLAGS) \
        \
        -DBINDIR=\"$(bindir)\" \
        -DDATADIR=\"$(datadir)\" \
@@@ -428,7 -359,6 +427,7 @@@ libNetworkManager_la_SOURCES = 
  
  libNetworkManager_la_LIBADD = \
        $(top_builddir)/libnm-core/libnm-core.la \
-       libsystemd-dhcp.la \
++      libsystemd-nm.la \
        $(DBUS_LIBS) \
        $(GLIB_LIBS) \
        $(GUDEV_LIBS) \
@@@ -444,89 -374,6 +443,89 @@@ endi
  
  NetworkManager_LDFLAGS = -rdynamic
  
-       libsystemd-dhcp.la \
 +######################
 +
 +libnm_iface_helper_la_SOURCES = \
 +      dhcp-manager/nm-dhcp-client.c \
 +      dhcp-manager/nm-dhcp-client.h \
 +      dhcp-manager/nm-dhcp-utils.c \
 +      dhcp-manager/nm-dhcp-utils.h \
 +      dhcp-manager/nm-dhcp-manager.c \
 +      dhcp-manager/nm-dhcp-manager.h \
 +      \
 +      platform/nm-linux-platform.c \
 +      platform/nm-linux-platform.h \
 +      platform/nm-platform.c \
 +      platform/nm-platform.h \
 +      platform/wifi/wifi-utils-nl80211.c \
 +      platform/wifi/wifi-utils-nl80211.h \
 +      platform/wifi/wifi-utils-private.h \
 +      platform/wifi/wifi-utils.c \
 +      platform/wifi/wifi-utils.h \
 +      \
 +      rdisc/nm-fake-rdisc.c \
 +      rdisc/nm-fake-rdisc.h \
 +      rdisc/nm-lndp-rdisc.c \
 +      rdisc/nm-lndp-rdisc.h \
 +      rdisc/nm-rdisc.c \
 +      rdisc/nm-rdisc.h \
 +      \
 +      nm-route-manager.c \
 +      nm-route-manager.h \
 +      \
 +      nm-ip4-config.c \
 +      nm-ip4-config.h \
 +      nm-ip6-config.c \
 +      nm-ip6-config.h \
 +      \
 +      nm-enum-types.c \
 +      nm-enum-types.h \
 +      nm-logging.c \
 +      nm-logging.h \
 +      NetworkManagerUtils.c \
 +      NetworkManagerUtils.h
 +
 +if WITH_WEXT
 +libnm_iface_helper_la_SOURCES += \
 +      platform/wifi/wifi-utils-wext.c \
 +      platform/wifi/wifi-utils-wext.h
 +endif
 +
 +libnm_iface_helper_la_LIBADD = \
 +      $(top_builddir)/libnm-core/libnm-core.la \
-       libsystemd-dhcp.la \
++      libsystemd-nm.la \
 +      $(DBUS_LIBS) \
 +      $(GLIB_LIBS) \
 +      $(GUDEV_LIBS) \
 +      $(LIBNL_LIBS) \
 +      $(LIBNDP_LIBS) \
 +      $(LIBDL) \
 +      $(LIBM)
 +
 +libexec_PROGRAMS = nm-iface-helper
 +
 +nm_iface_helper_SOURCES = \
 +      dhcp-manager/nm-dhcp-systemd.h \
 +      dhcp-manager/nm-dhcp-systemd.c \
 +      nm-iface-helper.c \
 +      main-utils.c \
 +      main-utils.h
 +
 +nm_iface_helper_LDADD = \
 +      $(top_builddir)/libnm-core/libnm-core.la \
++      libsystemd-nm.la \
 +      libnm-iface-helper.la \
 +      $(DBUS_LIBS) \
 +      $(GLIB_LIBS) \
 +      $(GUDEV_LIBS) \
 +      $(LIBNL_LIBS) \
 +      $(LIBNDP_LIBS) \
 +      $(LIBM)
 +
 +nm_iface_helper_LDFLAGS = -rdynamic
 +
 +######################
 +
  dbusservicedir = $(DBUS_SYS_DIR)
  dbusservice_DATA = org.freedesktop.NetworkManager.conf
  

diff --cc src/systemd/nm-sd-adapt.c
index a6d8172,0000000..a6d8172
mode 100644,000000..100644
--- 1/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c
--- /dev/null
+++ b/src/systemd/nm-sd-adapt.c

diff --cc src/systemd/nm-sd-adapt.h
index 845f7fb,0000000..845f7fb
mode 100644,000000..100644
--- 1/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
--- /dev/null
+++ b/src/systemd/nm-sd-adapt.h

diff --cc src/systemd/src/libsystemd-network/dhcp-identifier.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-identifier.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-lease-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-network.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-option.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-packet.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-protocol.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-network.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-option.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-protocol.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/network-internal.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/network-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp-client.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp-lease.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp6-client.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
Simple merge

diff --cc src/systemd/src/libsystemd/sd-id128/sd-id128.c
Simple merge

diff --cc src/systemd/src/shared/async.h
Simple merge

diff --cc src/systemd/src/shared/fileio.c
Simple merge

diff --cc src/systemd/src/shared/fileio.h
Simple merge

diff --cc src/systemd/src/shared/in-addr-util.c
Simple merge

diff --cc src/systemd/src/shared/in-addr-util.h
Simple merge

diff --cc src/systemd/src/shared/list.h
Simple merge

diff --cc src/systemd/src/shared/log.h
Simple merge

diff --cc src/systemd/src/shared/macro.h
Simple merge

diff --cc src/systemd/src/shared/path-util.c
Simple merge

diff --cc src/systemd/src/shared/path-util.h
Simple merge

diff --cc src/systemd/src/shared/refcnt.h
Simple merge

diff --cc src/systemd/src/shared/siphash24.c
Simple merge

diff --cc src/systemd/src/shared/siphash24.h
Simple merge

diff --cc src/systemd/src/shared/socket-util.h
Simple merge

diff --cc src/systemd/src/shared/sparse-endian.h
Simple merge

diff --cc src/systemd/src/shared/strv.c
Simple merge

diff --cc src/systemd/src/shared/strv.h
Simple merge

diff --cc src/systemd/src/shared/time-util.c
Simple merge

diff --cc src/systemd/src/shared/time-util.h
Simple merge

diff --cc src/systemd/src/shared/unaligned.h
Simple merge

diff --cc src/systemd/src/shared/utf8.c
Simple merge

diff --cc src/systemd/src/shared/utf8.h
Simple merge

diff --cc src/systemd/src/shared/util.c
Simple merge

diff --cc src/systemd/src/shared/util.h
Simple merge

diff --cc src/systemd/src/systemd/_sd-common.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp-client.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp-lease.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp6-client.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp6-lease.h
Simple merge

diff --cc src/systemd/src/systemd/sd-event.h
Simple merge

diff --cc src/systemd/src/systemd/sd-id128.h
Simple merge