tmpfiles: add 'a' type to set ACLs

[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am

index 58e5ce6c547152814758b9aa5d9d78c9628224b1..440ba888a0afd228868bff2b77c2f5bf0a02b7a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  AM_MAKEFLAGS = --no-print-directory
  AUTOMAKE_OPTIONS = color-tests parallel-tests
  
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
+
  SUBDIRS = . po
  
  # remove targets if the command fails
@@ -36,16 +39,16 @@ SUBDIRS = . po
  .PRECIOUS: $(TEST_SUITE_LOG) Makefile
  
  LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=2
  LIBUDEV_AGE=6
  
  LIBGUDEV_CURRENT=2
  LIBGUDEV_REVISION=0
  LIBGUDEV_AGE=2
  
-LIBSYSTEMD_CURRENT=4
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=4
+LIBSYSTEMD_CURRENT=5
+LIBSYSTEMD_REVISION=1
+LIBSYSTEMD_AGE=5
  
  # The following four libraries only exist for compatibility reasons,
  # their version info should not be bumped anymore
@@ -71,7 +74,6 @@ dbussessionservicedir=@dbussessionservicedir@
  dbussystemservicedir=@dbussystemservicedir@
  pamlibdir=@pamlibdir@
  pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
  pkgconfiglibdir=$(libdir)/pkgconfig
  polkitpolicydir=$(datadir)/polkit-1/actions
  bashcompletiondir=@bashcompletiondir@
@@ -82,6 +84,7 @@ sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
  varlogdir=$(localstatedir)/log
  systemdstatedir=$(localstatedir)/lib/systemd
  catalogstatedir=$(systemdstatedir)/catalog
+xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
  
  # Our own, non-special dirs
  pkgsysconfdir=$(sysconfdir)/systemd
@@ -140,10 +143,13 @@ nodist_pkgsysconf_DATA =
  dist_pkgdata_DATA =
  dist_dbuspolicy_DATA =
  dist_dbussystemservice_DATA =
+dist_systemunit_DATA_busnames =
  check_PROGRAMS =
  check_DATA =
  tests=
  manual_tests =
+TEST_EXTENSIONS = .py
+PY_LOG_COMPILER = $(PYTHON)
  if ENABLE_TESTS
  noinst_PROGRAMS = $(manual_tests) $(tests)
  TESTS = $(tests)
@@ -213,6 +219,7 @@ AM_CPPFLAGS = \
         -I $(top_srcdir)/src/libsystemd/sd-event \
         -I $(top_srcdir)/src/libsystemd/sd-rtnl \
         -I $(top_srcdir)/src/libsystemd/sd-network \
+       -I $(top_srcdir)/src/libsystemd/sd-hwdb \
         -I $(top_srcdir)/src/libsystemd-network \
         -I $(top_srcdir)/src/libsystemd-terminal \
         $(OUR_CPPFLAGS)
@@ -246,6 +253,7 @@ SOCKETS_TARGET_WANTS =
  BUSNAMES_TARGET_WANTS =
  TIMERS_TARGET_WANTS =
  USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
  USER_BUSNAMES_TARGET_WANTS =
  
  SYSTEM_UNIT_ALIASES =
@@ -263,10 +271,13 @@ install-target-wants-hook:
         what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
         what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
         what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
         what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
         what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
         what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+       what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
+
+install-busnames-target-wants-hook:
+       what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
         what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
  
  define add-wants
@@ -316,6 +327,11 @@ INSTALL_EXEC_HOOKS += \
         install-aliases-hook \
         install-touch-usr-hook
  
+if ENABLE_KDBUS
+INSTALL_EXEC_HOOKS += \
+       install-busnames-target-wants-hook
+endif
+
  # ------------------------------------------------------------------------------
  AM_V_M4 = $(AM_V_M4_$(V))
  AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
@@ -354,6 +370,7 @@ bin_PROGRAMS = \
         systemd-delta \
         systemd-analyze \
         systemd-run \
+       systemd-stdio-bridge \
         systemd-path
  
  dist_bin_SCRIPTS = \
@@ -367,12 +384,12 @@ rootlibexec_PROGRAMS = \
         systemd \
         systemd-cgroups-agent \
         systemd-initctl \
-       systemd-update-utmp \
         systemd-shutdownd \
         systemd-shutdown \
         systemd-remount-fs \
         systemd-reply-password \
         systemd-fsck \
+       systemd-machine-id-commit \
         systemd-ac-power \
         systemd-sysctl \
         systemd-sleep \
@@ -380,6 +397,11 @@ rootlibexec_PROGRAMS = \
         systemd-socket-proxyd \
         systemd-update-done
  
+if HAVE_UTMP
+rootlibexec_PROGRAMS += \
+       systemd-update-utmp
+endif
+
  systemgenerator_PROGRAMS = \
         systemd-getty-generator \
         systemd-fstab-generator \
@@ -451,7 +473,6 @@ dist_systemunit_DATA = \
         units/network-online.target \
         units/nss-lookup.target \
         units/nss-user-lookup.target \
-       units/hybrid-sleep.target \
         units/poweroff.target \
         units/reboot.target \
         units/rescue.target \
@@ -463,7 +484,6 @@ dist_systemunit_DATA = \
         units/sigpwr.target \
         units/sleep.target \
         units/sockets.target \
-       units/busnames.target \
         units/timers.target \
         units/paths.target \
         units/suspend.target \
@@ -489,7 +509,16 @@ dist_systemunit_DATA = \
         units/systemd-udevd-control.socket \
         units/systemd-udevd-kernel.socket \
         units/system-update.target \
-       units/initrd-switch-root.target
+       units/initrd-switch-root.target \
+       units/machines.target
+
+if ENABLE_KDBUS
+dist_systemunit_DATA += \
+       $(dist_systemunit_DATA_busnames)
+endif
+
+dist_systemunit_DATA_busnames += \
+       units/busnames.target
  
  nodist_systemunit_DATA = \
         units/getty@.service \
@@ -500,15 +529,12 @@ nodist_systemunit_DATA = \
         units/systemd-initctl.service \
         units/systemd-shutdownd.service \
         units/systemd-remount-fs.service \
-       units/systemd-update-utmp.service \
-       units/systemd-update-utmp-runlevel.service \
         units/systemd-ask-password-wall.service \
         units/systemd-ask-password-console.service \
         units/systemd-sysctl.service \
         units/emergency.service \
         units/rescue.service \
         units/user@.service \
-       units/systemd-hybrid-sleep.service \
         units/systemd-suspend.service \
         units/systemd-halt.service \
         units/systemd-poweroff.service \
@@ -516,10 +542,11 @@ nodist_systemunit_DATA = \
         units/systemd-kexec.service \
         units/systemd-fsck@.service \
         units/systemd-fsck-root.service \
+       units/systemd-machine-id-commit.service \
         units/systemd-udevd.service \
         units/systemd-udev-trigger.service \
         units/systemd-udev-settle.service \
-       units/systemd-udev-hwdb-update.service \
+       units/systemd-hwdb-update.service \
         units/debug-shell.service \
         units/initrd-parse-etc.service \
         units/initrd-cleanup.service \
@@ -528,6 +555,12 @@ nodist_systemunit_DATA = \
         units/systemd-nspawn@.service \
         units/systemd-update-done.service
  
+if HAVE_UTMP
+nodist_systemunit_DATA += \
+       units/systemd-update-utmp.service \
+       units/systemd-update-utmp-runlevel.service
+endif
+
  dist_userunit_DATA = \
         units/user/basic.target \
         units/user/default.target \
@@ -562,9 +595,9 @@ EXTRA_DIST += \
         units/user/systemd-exit.service.in \
         units/systemd-fsck@.service.in \
         units/systemd-fsck-root.service.in \
-       units/user@.service.in \
+       units/systemd-machine-id-commit.service.in \
+       units/user@.service.m4.in \
         units/debug-shell.service.in \
-       units/systemd-hybrid-sleep.service.in \
         units/systemd-suspend.service.in \
         units/quotaon.service.in \
         units/initrd-parse-etc.service.in \
@@ -689,7 +722,8 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE
  EXTRA_DIST += \
         man/systemd.index.xml \
         man/index.html \
-       man/systemd.directives.xml
+       man/systemd.directives.xml \
+       man/glib-event-glue.c
  
  CLEANFILES += \
         man/systemd.index.xml \
@@ -706,7 +740,6 @@ EXTRA_DIST += \
         $(man_MANS) \
         tools/make-man-index.py \
         tools/make-directive-index.py \
-       tools/make-man-rules.py \
         tools/xml_helper.py
  
  # ------------------------------------------------------------------------------
@@ -714,20 +747,21 @@ noinst_LTLIBRARIES += \
         libsystemd-shared.la
  
  libsystemd_shared_la_SOURCES = \
+       src/shared/capability.c \
+       src/shared/capability.h \
         src/shared/linux/auto_dev-ioctl.h \
-       src/shared/linux/fanotify.h \
         src/shared/ioprio.h \
         src/shared/missing.h \
         src/shared/initreq.h \
         src/shared/securebits.h \
         src/shared/special.h \
         src/shared/list.h \
+       src/shared/unaligned.h \
         src/shared/macro.h \
         src/shared/def.h \
         src/shared/sparse-endian.h \
         src/shared/refcnt.h \
         src/shared/udev-util.h \
-       src/shared/bus-errors.h \
         src/shared/device-nodes.c \
         src/shared/device-nodes.h \
         src/shared/util.c \
@@ -738,17 +772,20 @@ libsystemd_shared_la_SOURCES = \
         src/shared/architecture.h \
         src/shared/efivars.c \
         src/shared/efivars.h \
+       src/shared/fstab-util.c \
+       src/shared/fstab-util.h \
         src/shared/path-util.c \
         src/shared/path-util.h \
         src/shared/time-util.c \
         src/shared/time-util.h \
         src/shared/locale-util.c \
         src/shared/locale-util.h \
+       src/shared/mempool.c \
+       src/shared/mempool.h \
         src/shared/hashmap.c \
         src/shared/hashmap.h \
         src/shared/siphash24.c \
         src/shared/siphash24.h \
-       src/shared/set.c \
         src/shared/set.h \
         src/shared/fdset.c \
         src/shared/fdset.h \
@@ -782,6 +819,7 @@ libsystemd_shared_la_SOURCES = \
         src/shared/socket-util.h \
         src/shared/in-addr-util.c \
         src/shared/in-addr-util.h \
+       src/shared/ether-addr-util.h \
         src/shared/conf-files.c \
         src/shared/conf-files.h \
         src/shared/cgroup-util.c \
@@ -790,7 +828,6 @@ libsystemd_shared_la_SOURCES = \
         src/shared/cgroup-show.h \
         src/shared/unit-name.c \
         src/shared/unit-name.h \
-       src/shared/utmp-wtmp.c \
         src/shared/utmp-wtmp.h \
         src/shared/watchdog.c \
         src/shared/watchdog.h \
@@ -831,12 +868,14 @@ libsystemd_shared_la_SOURCES = \
         src/shared/af-list.h \
         src/shared/arphrd-list.c \
         src/shared/arphrd-list.h \
+       src/shared/cap-list.c \
+       src/shared/cap-list.h \
         src/shared/audit.c \
         src/shared/audit.h \
         src/shared/xml.c \
         src/shared/xml.h \
-       src/shared/condition-util.c \
-       src/shared/condition-util.h \
+       src/shared/json.c \
+       src/shared/json.h \
         src/shared/bus-label.c \
         src/shared/bus-label.h \
         src/shared/gpt.h \
@@ -852,17 +891,25 @@ libsystemd_shared_la_SOURCES = \
         src/shared/pty.h \
         src/shared/async.c \
         src/shared/async.h \
-       src/shared/copy.c \
-       src/shared/copy.h \
         src/shared/base-filesystem.c \
         src/shared/base-filesystem.h \
-       src/shared/memfd.c \
-       src/shared/memfd.h \
+       src/shared/memfd-util.c \
+       src/shared/memfd-util.h \
         src/shared/uid-range.c \
         src/shared/uid-range.h \
-       src/shared/switch-root.h \
-       src/shared/switch-root.c \
-       src/shared/nss-util.h
+       src/shared/nss-util.h \
+       src/shared/verbs.c \
+       src/shared/verbs.h \
+       src/shared/sigbus.c \
+       src/shared/sigbus.h \
+       src/shared/build.h \
+       src/shared/import-util.c \
+       src/shared/import-util.h
+
+if HAVE_UTMP
+libsystemd_shared_la_SOURCES += \
+       src/shared/utmp-wtmp.c
+endif
  
  nodist_libsystemd_shared_la_SOURCES = \
         src/shared/errno-from-name.h \
@@ -870,13 +917,20 @@ nodist_libsystemd_shared_la_SOURCES = \
         src/shared/af-from-name.h \
         src/shared/af-to-name.h \
         src/shared/arphrd-from-name.h \
-       src/shared/arphrd-to-name.h
+       src/shared/arphrd-to-name.h \
+       src/shared/cap-from-name.h \
+       src/shared/cap-to-name.h
  
  libsystemd_shared_la_CFLAGS = \
         $(AM_CFLAGS) \
+       $(CAP_CFLAGS) \
         $(SECCOMP_CFLAGS) \
         -pthread
  
+libsystemd_shared_la_LIBADD = \
+       $(CAP_LIBS) \
+       -lm
+
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
         libsystemd-units.la
@@ -904,14 +958,25 @@ libsystemd_label_la_SOURCES = \
         src/shared/mkdir-label.c \
         src/shared/ask-password-api.c \
         src/shared/ask-password-api.h \
+       src/shared/switch-root.h \
+       src/shared/switch-root.c \
         src/shared/fileio-label.c \
         src/shared/fileio-label.h \
         src/shared/dev-setup.c \
         src/shared/dev-setup.h \
         src/shared/dropin.c \
         src/shared/dropin.h \
+       src/shared/condition.c \
+       src/shared/condition.h \
         src/shared/generator.h \
-       src/shared/generator.c
+       src/shared/generator.c \
+       src/shared/btrfs-util.c \
+       src/shared/btrfs-util.h \
+       src/shared/btrfs-ctree.h \
+       src/shared/machine-image.c \
+       src/shared/machine-image.h \
+       src/shared/copy.c \
+       src/shared/copy.h
  
  libsystemd_label_la_CFLAGS = \
         $(AM_CFLAGS) \
@@ -922,6 +987,24 @@ libsystemd_label_la_LIBADD = \
  
  # -----------------------------------------------------------------------------
  
+if HAVE_LIBIPTC
+noinst_LTLIBRARIES += \
+       libsystemd-fw.la
+
+libsystemd_fw_la_SOURCES = \
+       src/shared/fw-util.h \
+       src/shared/fw-util.c
+
+libsystemd_fw_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBIPTC_CFLAGS)
+
+libsystemd_fw_la_LIBADD = \
+       $(LIBIPTC_LIBS)
+endif
+
+# -----------------------------------------------------------------------------
+
  if ENABLE_LDCONFIG
  dist_systemunit_DATA += \
         units/ldconfig.service
@@ -956,21 +1039,6 @@ libsystemd_logs_la_SOURCES = \
         src/shared/logs-show.c \
         src/shared/logs-show.h
  
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-capability.la
-
-libsystemd_capability_la_SOURCES = \
-       src/shared/capability.c \
-       src/shared/capability.h
-
-libsystemd_capability_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
-
-libsystemd_capability_la_LIBADD = \
-       $(CAP_LIBS)
-
  # ------------------------------------------------------------------------------
  if HAVE_ACL
  noinst_LTLIBRARIES += \
@@ -1011,6 +1079,10 @@ libsystemd_core_la_SOURCES = \
         src/core/socket.h \
         src/core/busname.c \
         src/core/busname.h \
+       src/core/bus-endpoint.c \
+       src/core/bus-endpoint.h \
+       src/core/bus-policy.c \
+       src/core/bus-policy.h \
         src/core/target.c \
         src/core/target.h \
         src/core/snapshot.c \
@@ -1095,14 +1167,12 @@ libsystemd_core_la_SOURCES = \
         src/core/machine-id-setup.h \
         src/core/mount-setup.c \
         src/core/mount-setup.h \
+       src/core/kmod-setup.c \
+       src/core/kmod-setup.h \
         src/core/loopback-setup.h \
         src/core/loopback-setup.c \
-       src/core/condition.c \
-       src/core/condition.h \
         src/core/namespace.c \
         src/core/namespace.h \
-       src/core/build.h \
-       src/core/sysfs-show.h \
         src/core/killall.h \
         src/core/killall.c \
         src/core/audit-fd.c \
@@ -1112,12 +1182,6 @@ libsystemd_core_la_SOURCES = \
         src/core/failure-action.c \
         src/core/failure-action.h
  
-if HAVE_KMOD
-libsystemd_core_la_SOURCES += \
-       src/core/kmod-setup.c \
-       src/core/kmod-setup.h
-endif
-
  nodist_libsystemd_core_la_SOURCES = \
         src/core/load-fragment-gperf.c \
         src/core/load-fragment-gperf-nulstr.c
@@ -1126,14 +1190,13 @@ libsystemd_core_la_CFLAGS = \
         $(AM_CFLAGS) \
         $(PAM_CFLAGS) \
         $(AUDIT_CFLAGS) \
-       $(CAP_CFLAGS) \
         $(KMOD_CFLAGS) \
         $(APPARMOR_CFLAGS) \
         $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS) \
         -pthread
  
  libsystemd_core_la_LIBADD = \
-       libsystemd-capability.la \
         libsystemd-units.la \
         libsystemd-label.la \
         libudev-internal.la \
@@ -1141,10 +1204,10 @@ libsystemd_core_la_LIBADD = \
         libsystemd-internal.la \
         $(PAM_LIBS) \
         $(AUDIT_LIBS) \
-       $(CAP_LIBS) \
         $(KMOD_LIBS) \
         $(APPARMOR_LIBS) \
-       $(SECCOMP_LIBS)
+       $(SECCOMP_LIBS) \
+       $(MOUNT_LIBS)
  
  if HAVE_SECCOMP
  libsystemd_core_la_LIBADD += \
@@ -1168,8 +1231,10 @@ CLEANFILES += \
         src/shared/af-from-name.gperf \
         src/shared/arphrd-list.txt \
         src/shared/arphrd-from-name.gperf \
-       src/shared/dns_type-list.txt \
-       src/shared/dns_type-from-name.gperf
+       src/shared/cap-list.txt \
+       src/shared/cap-from-name.gperf \
+       src/resolve/dns_type-list.txt \
+       src/resolve/dns_type-from-name.gperf
  
  BUILT_SOURCES += \
         src/shared/errno-from-name.h \
@@ -1178,6 +1243,8 @@ BUILT_SOURCES += \
         src/shared/af-to-name.h \
         src/shared/arphrd-from-name.h \
         src/shared/arphrd-to-name.h \
+       src/shared/cap-from-name.h \
+       src/shared/cap-to-name.h \
         src/resolve/dns_type-from-name.h \
         src/resolve/dns_type-to-name.h
  
@@ -1203,6 +1270,7 @@ src/shared/af-list.txt:
  src/shared/af-to-name.h: src/shared/af-list.txt
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
  
+
  src/shared/arphrd-list.txt:
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
@@ -1214,6 +1282,20 @@ src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
  
  
+src/shared/cap-list.txt:
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+
+src/shared/cap-to-name.h: src/shared/cap-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
+
+src/shared/cap-from-name.gperf: src/shared/cap-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+
+src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
+
+
  src/resolve/dns_type-list.txt: src/resolve/dns-type.h
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
@@ -1249,7 +1331,7 @@ dist_dbussystemservice_DATA += \
  polkitpolicy_in_in_files += \
         src/core/org.freedesktop.systemd1.policy.in.in
  
-pkgconfigdata_DATA = \
+pkgconfiglib_DATA += \
         src/core/systemd.pc
  
  nodist_rpmmacros_DATA = \
@@ -1274,7 +1356,13 @@ manual_tests += \
         test-install \
         test-watchdog \
         test-log \
-       test-ipcrm
+       test-ipcrm \
+       test-btrfs
+
+if HAVE_LIBIPTC
+manual_tests += \
+       test-fw-util
+endif
  
  if HAVE_KMOD
  manual_tests += \
@@ -1288,6 +1376,7 @@ tests += \
         test-env-replace \
         test-strbuf \
         test-strv \
+       test-path \
         test-path-util \
         test-strxcpyx \
         test-unit-name \
@@ -1295,6 +1384,7 @@ tests += \
         test-utf8 \
         test-ellipsize \
         test-util \
+       test-path-lookup \
         test-ring \
         test-barrier \
         test-pty \
@@ -1307,14 +1397,18 @@ tests += \
         test-calendarspec \
         test-strip-tab-ansi \
         test-cgroup-util \
+       test-fstab-util \
         test-prioq \
         test-fileio \
         test-time \
         test-hashmap \
+       test-set \
         test-list \
+       test-unaligned \
         test-tables \
         test-device-nodes \
         test-xml \
+       test-json \
         test-architecture \
         test-socket-util \
         test-fdset \
@@ -1322,8 +1416,15 @@ tests += \
         test-capability \
         test-async \
         test-ratelimit \
-       test-condition-util \
-       test-uid-range
+       test-condition \
+       test-uid-range \
+       test-bus-policy \
+       test-locale-util \
+       test-execute \
+       test-copy \
+       test-cap-list \
+       test-sigbus \
+       test-verbs
  
  EXTRA_DIST += \
         test/a.service \
@@ -1355,7 +1456,51 @@ EXTRA_DIST += \
         test/sysinit.target \
         test/testsuite.target \
         test/timers.target \
-       test/unstoppable.service
+       test/unstoppable.service \
+       test/path-changed.service \
+       test/path-directorynotempty.service \
+       test/path-existsglob.service \
+       test/path-exists.service \
+       test/path-makedirectory.service \
+       test/path-modified.service \
+       test/path-mycustomunit.service \
+       test/path-service.service \
+       test/path-changed.path \
+       test/path-directorynotempty.path \
+       test/path-existsglob.path \
+       test/path-exists.path \
+       test/path-makedirectory.path \
+       test/path-modified.path \
+       test/path-unit.path \
+       test/exec-environment-empty.service \
+       test/exec-environment-multiple.service \
+       test/exec-environment.service \
+       test/exec-group.service \
+       test/exec-ignoresigpipe-no.service \
+       test/exec-ignoresigpipe-yes.service \
+       test/exec-personality-x86-64.service \
+       test/exec-personality-x86.service \
+       test/exec-privatedevices-no.service \
+       test/exec-privatedevices-yes.service \
+       test/exec-privatetmp-no.service \
+       test/exec-privatetmp-yes.service \
+       test/exec-systemcallerrornumber.service \
+       test/exec-systemcallfilter-failing2.service \
+       test/exec-systemcallfilter-failing.service \
+       test/exec-systemcallfilter-not-failing2.service \
+       test/exec-systemcallfilter-not-failing.service \
+       test/exec-user.service \
+       test/exec-workingdirectory.service \
+       test/exec-umask-0177.service \
+       test/exec-umask-default.service \
+       test/bus-policy/hello.conf \
+       test/bus-policy/methods.conf \
+       test/bus-policy/ownerships.conf \
+       test/bus-policy/signals.conf \
+       test/bus-policy/check-own-rules.conf \
+       test/bus-policy/many-rules.conf \
+       test/bus-policy/test.conf
+
  
  EXTRA_DIST += \
         src/test/test-helper.h
@@ -1453,8 +1598,7 @@ test_capability_SOURCES = \
         src/test/test-capability.c
  
  test_capability_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-capability.la
+       libsystemd-shared.la
  
  test_async_SOURCES = \
         src/test/test-async.c
@@ -1462,19 +1606,45 @@ test_async_SOURCES = \
  test_async_LDADD = \
         libsystemd-shared.la
  
-test_condition_util_SOURCES = \
-       src/test/test-condition-util.c
+test_locale_util_SOURCES = \
+       src/test/test-locale-util.c
  
-test_condition_util_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+test_locale_util_LDADD = \
+       libsystemd-shared.la
+
+test_copy_SOURCES = \
+       src/test/test-copy.c
  
+test_copy_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+test_sigbus_SOURCES = \
+       src/test/test-sigbus.c
+
+test_sigbus_LDADD = \
+       libsystemd-shared.la
+
+test_condition_SOURCES = \
+       src/test/test-condition.c
+
+test_condition_LDADD = \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_fdset_SOURCES = \
         src/test/test-fdset.c
  
  test_fdset_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
+test_fstab_util_SOURCES = \
+       src/test/test-fstab-util.c
+
+test_fstab_util_LDADD = \
+       libsystemd-shared.la
  
  test_ratelimit_SOURCES = \
         src/test/test-ratelimit.c
@@ -1486,31 +1656,45 @@ test_util_SOURCES = \
         src/test/test-util.c
  
  test_util_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_path_lookup_SOURCES = \
+       src/test/test-path-lookup.c
+
+test_path_lookup_LDADD = \
+       -lm \
+       libsystemd-units.la \
+       libsystemd-shared.la
  
  test_uid_range_SOURCES = \
         src/test/test-uid-range.c
  
  test_uid_range_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_cap_list_SOURCES = \
+       src/test/test-cap-list.c
+
+test_cap_list_LDADD = \
+       libsystemd-shared.la
  
  test_socket_util_SOURCES = \
         src/test/test-socket-util.c
  
  test_socket_util_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_ring_SOURCES = \
         src/test/test-ring.c
  
  test_ring_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_barrier_SOURCES = \
         src/test/test-barrier.c
  
  test_barrier_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_pty_SOURCES = \
         src/test/test-pty.c
@@ -1527,14 +1711,45 @@ test_tmpfiles_LDADD = \
  test_namespace_SOURCES = \
         src/test/test-namespace.c
  
+test_verbs_SOURCES = \
+       src/test/test-verbs.c
+
+test_verbs_LDADD = \
+       libsystemd-shared.la
+
  test_namespace_LDADD = \
         libsystemd-core.la
  
+CLEANFILES += \
+       src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+       src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+                          { if (!match($$0, "^#include"))          \
+                                gsub(/hashmap/, "ordered_hashmap"); \
+                            gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+                            gsub(/Hashmap/, "OrderedHashmap");      \
+                            print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+       src/test/test-hashmap-ordered.c
+
  test_hashmap_SOURCES = \
-       src/test/test-hashmap.c
+       src/test/test-hashmap.c \
+       src/test/test-hashmap-plain.c
  
  test_hashmap_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_set_SOURCES = \
+       src/test/test-set.c
+
+test_set_LDADD = \
+       libsystemd-shared.la
  
  test_xml_SOURCES = \
         src/test/test-xml.c
@@ -1542,17 +1757,29 @@ test_xml_SOURCES = \
  test_xml_LDADD = \
         libsystemd-shared.la
  
+test_json_SOURCES = \
+       src/test/test-json.c
+
+test_json_LDADD = \
+       libsystemd-shared.la
+
  test_list_SOURCES = \
         src/test/test-list.c
  
  test_list_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_unaligned_LDADD = \
+       libsystemd-shared.la
+
+test_unaligned_SOURCES = \
+       src/test/test-unaligned.c
  
  test_tables_SOURCES = \
         src/test/test-tables.c \
         src/shared/test-tables.h \
-       src/bus-proxyd/bus-policy.c \
-       src/bus-proxyd/bus-policy.h \
+       src/bus-proxyd/bus-xml-policy.c \
+       src/bus-proxyd/bus-xml-policy.h \
         src/journal/journald-server.c \
         src/journal/journald-server.h
  
@@ -1576,19 +1803,19 @@ test_prioq_SOURCES = \
         src/test/test-prioq.c
  
  test_prioq_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_fileio_SOURCES = \
         src/test/test-fileio.c
  
  test_fileio_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_time_SOURCES = \
         src/test/test-time.c
  
  test_time_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_architecture_SOURCES = \
         src/test/test-architecture.c
@@ -1600,7 +1827,7 @@ test_log_SOURCES = \
         src/test/test-log.c
  
  test_log_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_ipcrm_SOURCES = \
         src/test/test-ipcrm.c
@@ -1609,6 +1836,27 @@ test_ipcrm_LDADD = \
         libsystemd-shared.la \
         -lrt
  
+test_btrfs_SOURCES = \
+       src/test/test-btrfs.c
+
+test_btrfs_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+if HAVE_LIBIPTC
+test_fw_util_SOURCES = \
+       src/test/test-fw-util.c
+
+test_fw_util_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBIPTC_CFLAGS)
+
+test_fw_util_LDADD = \
+       libsystemd-fw.la \
+       libsystemd-shared.la \
+       $(LIBIPTC_LIBS)
+endif
+
  test_rtnl_manual_SOURCES = \
         src/test/test-rtnl-manual.c
  
@@ -1625,13 +1873,13 @@ test_ellipsize_SOURCES = \
         src/test/test-ellipsize.c
  
  test_ellipsize_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_date_SOURCES = \
         src/test/test-date.c
  
  test_date_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
  
  test_sleep_SOURCES = \
         src/test/test-sleep.c
@@ -1676,8 +1924,7 @@ test_cgroup_mask_SOURCES = \
         src/test/test-cgroup-mask.c
  
  test_cgroup_mask_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
  
  test_cgroup_mask_CFLAGS = \
         $(AM_CFLAGS) \
@@ -1721,6 +1968,24 @@ test_path_util_SOURCES = \
  test_path_util_LDADD = \
         libsystemd-shared.la
  
+test_path_SOURCES = \
+       src/test/test-path.c
+
+test_path_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_path_LDADD = \
+       libsystemd-core.la
+
+test_execute_SOURCES = \
+       src/test/test-execute.c
+
+test_execute_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_execute_LDADD = \
+       libsystemd-core.la
+
  test_strxcpyx_SOURCES = \
         src/test/test-strxcpyx.c
  
@@ -1746,8 +2011,7 @@ test_sched_prio_SOURCES = \
         src/test/test-sched-prio.c
  
  test_sched_prio_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
  
  test_sched_prio_CFLAGS = \
         $(AM_CFLAGS) \
@@ -1763,6 +2027,14 @@ test_conf_files_SOURCES = \
  test_conf_files_LDADD = \
         libsystemd-shared.la
  
+test_bus_policy_SOURCES = \
+       src/bus-proxyd/test-bus-xml-policy.c
+
+test_bus_policy_LDADD = \
+       libsystemd-proxy.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
  # ------------------------------------------------------------------------------
  ## .PHONY so it always rebuilds it
  .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -1787,7 +2059,8 @@ lcov-report:
         $(MKDIR_P) $(coverage_dir)
         lcov $(coverage_opts) --compat-libtool --capture --no-external \
                 | sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
-       genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info
+       lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+       genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
         @echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
  
  # lcov doesn't work properly with vpath builds, make sure that bad
@@ -1917,10 +2190,14 @@ systemd_tmpfiles_SOURCES = \
  systemd_tmpfiles_LDADD = \
         libsystemd-units.la \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libsystemd-shared.la
  
+if HAVE_ACL
+systemd_tmpfiles_LDADD += \
+       libsystemd-acl.la
+endif
+
  rootbin_PROGRAMS += \
         systemd-tmpfiles
  
@@ -1938,7 +2215,6 @@ nodist_tmpfiles_DATA = \
  dist_tmpfiles_DATA = \
         tmpfiles.d/systemd.conf \
         tmpfiles.d/systemd-nologin.conf \
-       tmpfiles.d/systemd-remote.conf \
         tmpfiles.d/tmp.conf \
         tmpfiles.d/x11.conf \
         tmpfiles.d/var.conf
@@ -1980,7 +2256,6 @@ systemd_sysusers_SOURCES = \
  systemd_sysusers_LDADD = \
         libsystemd-units.la \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libsystemd-shared.la
  
@@ -1994,8 +2269,7 @@ SYSINIT_TARGET_WANTS += \
         systemd-sysusers.service
  
  dist_sysusers_DATA = \
-       sysusers.d/systemd.conf \
-       sysusers.d/systemd-remote.conf
+       sysusers.d/systemd.conf
  
  nodist_sysusers_DATA = \
         sysusers.d/basic.conf
@@ -2015,9 +2289,11 @@ endif
  dist_factory_etc_DATA = \
         factory/etc/nsswitch.conf
  
+if HAVE_PAM
  dist_factory_pam_DATA = \
         factory/etc/pam.d/system-auth \
         factory/etc/pam.d/other
+endif
  
  # ------------------------------------------------------------------------------
  if ENABLE_FIRSTBOOT
@@ -2027,7 +2303,6 @@ systemd_firstboot_SOURCES = \
  systemd_firstboot_LDADD = \
         libsystemd-units.la \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libsystemd-shared.la \
         -lcrypt
@@ -2079,6 +2354,20 @@ systemd_fsck_LDADD = \
         libudev-internal.la \
         libsystemd-shared.la
  
+# ------------------------------------------------------------------------------
+systemd_machine_id_commit_SOURCES = \
+       src/machine-id-commit/machine-id-commit.c \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
+
+systemd_machine_id_commit_LDADD = \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+SYSINIT_TARGET_WANTS += \
+       systemd-machine-id-commit.service
+
  # ------------------------------------------------------------------------------
  systemd_ac_power_SOURCES = \
         src/ac-power/ac-power.c
@@ -2140,36 +2429,38 @@ systemd_system_update_generator_LDADD = \
  # ------------------------------------------------------------------------------
  if ENABLE_HIBERNATE
  systemgenerator_PROGRAMS += \
-        systemd-hibernate-resume-generator
+       systemd-hibernate-resume-generator
  
  rootlibexec_PROGRAMS += \
-        systemd-hibernate-resume
+       systemd-hibernate-resume
  
  systemd_hibernate_resume_SOURCES = \
-        src/hibernate-resume/hibernate-resume.c
+       src/hibernate-resume/hibernate-resume.c
  
  systemd_hibernate_resume_LDADD = \
-        libsystemd-internal.la \
-        libsystemd-shared.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  systemd_hibernate_resume_generator_SOURCES = \
-       src/resume-generator/resume-generator.c
+       src/hibernate-resume/hibernate-resume-generator.c
  
  systemd_hibernate_resume_generator_LDADD = \
         libsystemd-label.la \
         libsystemd-shared.la
  
  EXTRA_DIST += \
-        units/systemd-hibernate.service.in \
-        units/systemd-hibernate-resume@.service.in
+       units/systemd-hibernate.service.in \
+       units/systemd-hibernate-resume@.service.in \
+       units/systemd-hybrid-sleep.service.in
  
  dist_systemunit_DATA += \
-        units/hibernate.target
+       units/hibernate.target \
+       units/hybrid-sleep.target
  
  nodist_systemunit_DATA += \
-        units/systemd-hibernate.service \
-        units/systemd-hibernate-resume@.service
-
+       units/systemd-hibernate.service \
+       units/systemd-hibernate-resume@.service \
+       units/systemd-hybrid-sleep.service
  endif
  
  # ------------------------------------------------------------------------------
@@ -2238,8 +2529,8 @@ systemd_dbus1_generator_SOURCES = \
  
  systemd_dbus1_generator_LDADD = \
         libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  dbus1-generator-install-hook:
         $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
@@ -2249,6 +2540,9 @@ dbus1-generator-install-hook:
  dbus1-generator-uninstall-hook:
         rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
  
+dist_xinitrc_SCRIPTS = \
+       xorg/50-systemd-user.sh
+
  INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
  UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
  endif
@@ -2309,8 +2603,7 @@ systemctl_LDADD = \
  
  # ------------------------------------------------------------------------------
  systemd_notify_SOURCES = \
-       src/notify/notify.c \
-       src/readahead/sd-readahead.c
+       src/notify/notify.c
  
  systemd_notify_LDADD = \
         libsystemd-internal.la \
@@ -2369,7 +2662,6 @@ systemd_nspawn_CFLAGS = \
  
  systemd_nspawn_LDADD = \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libudev-internal.la \
         libsystemd-shared.la \
@@ -2381,52 +2673,89 @@ systemd_nspawn_LDADD += \
         $(SECCOMP_LIBS)
  endif
  
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+       libsystemd-fw.la
+endif
+
  # ------------------------------------------------------------------------------
  systemd_run_SOURCES = \
         src/run/run.c
  
  systemd_run_LDADD = \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-proxy.la
+
+libsystemd_proxy_la_SOURCES = \
+       src/bus-proxyd/bus-xml-policy.c \
+       src/bus-proxyd/bus-xml-policy.h \
+       src/bus-proxyd/driver.c \
+       src/bus-proxyd/driver.h \
+       src/bus-proxyd/proxy.c \
+       src/bus-proxyd/proxy.h \
+       src/bus-proxyd/synthesize.c \
+       src/bus-proxyd/synthesize.h
+
+libsystemd_proxy_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
+libsystemd_proxy_la_LIBADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
  systemd_bus_proxyd_SOURCES = \
-       src/bus-proxyd/bus-proxyd.c \
-       src/bus-proxyd/bus-policy.c \
-       src/bus-proxyd/bus-policy.h
+       src/bus-proxyd/bus-proxyd.c
+
+systemd_bus_proxyd_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
  
  systemd_bus_proxyd_LDADD = \
-       libsystemd-capability.la \
+       libsystemd-proxy.la \
         libsystemd-internal.la \
         libsystemd-shared.la
  
-bus-proxyd-install-hook:
-       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
-       $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
-       $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+systemd_stdio_bridge_SOURCES = \
+       src/bus-proxyd/stdio-bridge.c
  
-bus-proxyd-uninstall-hook:
-       rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
-
-INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
-UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+systemd_stdio_bridge_LDADD = \
+       libsystemd-proxy.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  if ENABLE_KDBUS
  nodist_systemunit_DATA += \
-       units/systemd-bus-proxyd@.service
+       units/systemd-bus-proxyd.service
  
  dist_systemunit_DATA += \
         units/systemd-bus-proxyd.socket
  
+nodist_userunit_DATA += \
+       units/user/systemd-bus-proxyd.service
+
  dist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.socket \
-       units/user/systemd-bus-proxyd@.service
+       units/user/systemd-bus-proxyd.socket
  endif
  
  EXTRA_DIST += \
-       units/systemd-bus-proxyd@.service.in
+       units/systemd-bus-proxyd.service.m4.in \
+       units/user/systemd-bus-proxyd.service.in
+
+CLEANFILES += \
+       units/systemd-bus-proxyd.service.m4
+
+if HAVE_SMACK
+bus-proxyd-set-cap-hook:
+       -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
+
+INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
+endif
  
  # ------------------------------------------------------------------------------
  systemd_tty_ask_password_agent_SOURCES = \
@@ -2450,11 +2779,14 @@ libsystemd_internal_la_SOURCES = \
         src/systemd/sd-daemon.h \
         src/systemd/sd-path.h \
         src/systemd/sd-network.h \
+       src/systemd/sd-hwdb.h \
         src/libsystemd/sd-bus/sd-bus.c \
         src/libsystemd/sd-bus/bus-control.c \
         src/libsystemd/sd-bus/bus-control.h \
         src/libsystemd/sd-bus/bus-error.c \
         src/libsystemd/sd-bus/bus-error.h \
+       src/libsystemd/sd-bus/bus-common-errors.h \
+       src/libsystemd/sd-bus/bus-common-errors.c \
         src/libsystemd/sd-bus/bus-internal.c \
         src/libsystemd/sd-bus/bus-internal.h \
         src/libsystemd/sd-bus/bus-socket.c \
@@ -2508,11 +2840,13 @@ libsystemd_internal_la_SOURCES = \
         src/libsystemd/sd-path/sd-path.c \
         src/libsystemd/sd-network/sd-network.c \
         src/libsystemd/sd-network/network-util.h \
-       src/libsystemd/sd-network/network-util.c
+       src/libsystemd/sd-network/network-util.c \
+       src/libsystemd/sd-hwdb/sd-hwdb.c \
+       src/libsystemd/sd-hwdb/hwdb-util.h \
+       src/libsystemd/sd-hwdb/hwdb-internal.h
  
  nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
  
  libsystemd_internal_la_CFLAGS = \
         $(AM_CFLAGS) \
@@ -2540,23 +2874,17 @@ libsystemd_dump_la_SOURCES = \
         src/libsystemd/sd-bus/bus-dump.c \
         src/libsystemd/sd-bus/bus-dump.h
  
-libsystemd_dump_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
-
  noinst_LTLIBRARIES += \
         libsystemd-dump.la
  
  EXTRA_DIST += \
         src/libsystemd/libsystemd.sym.m4 \
         src/libsystemd/libsystemd.pc.in \
-       src/libsystemd/sd-bus/bus-error-mapping.gperf \
         src/libsystemd/sd-bus/DIFFERENCES \
         src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
  
  CLEANFILES += \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
  
  BUILT_SOURCES += \
         src/libsystemd/libsystemd.sym
@@ -2635,6 +2963,7 @@ tests += \
         test-bus-gvariant \
         test-event \
         test-rtnl \
+       test-local-addresses \
         test-resolve
  
  bin_PROGRAMS += \
@@ -2644,26 +2973,23 @@ test_bus_marshal_SOURCES = \
         src/libsystemd/sd-bus/test-bus-marshal.c
  
  test_bus_marshal_LDADD = \
+       libsystemd-dump.la \
         libsystemd-internal.la \
         libsystemd-shared.la \
-       libsystemd-dump.la \
-       libsystemd-capability.la \
         $(GLIB_LIBS) \
-       $(DBUS_LIBS) \
-       $(CAP_LIBS)
+       $(DBUS_LIBS)
  
  test_bus_marshal_CFLAGS = \
         $(AM_CFLAGS) \
         $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(CAP_CFLAGS)
+       $(DBUS_CFLAGS)
  
  test_bus_signature_SOURCES = \
         src/libsystemd/sd-bus/test-bus-signature.c
  
  test_bus_signature_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_bus_chat_SOURCES = \
         src/libsystemd/sd-bus/test-bus-chat.c
@@ -2703,15 +3029,12 @@ test_bus_objects_SOURCES = \
  
  test_bus_objects_CFLAGS = \
         $(AM_CFLAGS) \
-       $(CAP_CFLAGS) \
         -pthread
  
  test_bus_objects_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_bus_error_SOURCES = \
         src/libsystemd/sd-bus/test-bus-error.c
@@ -2724,26 +3047,22 @@ test_bus_gvariant_SOURCES = \
         src/libsystemd/sd-bus/test-bus-gvariant.c
  
  test_bus_gvariant_LDADD = \
+       libsystemd-dump.la \
         libsystemd-internal.la \
         libsystemd-shared.la \
-       libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(GLIB_LIBS) \
-       $(CAP_LIBS)
+       $(GLIB_LIBS)
  
  test_bus_gvariant_CFLAGS = \
         $(AM_CFLAGS) \
         $(GLIB_CFLAGS)
-       $(CAP_CFLAGS)
  
  test_bus_creds_SOURCES = \
         src/libsystemd/sd-bus/test-bus-creds.c
  
  test_bus_creds_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         libsystemd-dump.la \
-       libsystemd-capability.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_bus_match_SOURCES = \
         src/libsystemd/sd-bus/test-bus-match.c
@@ -2756,15 +3075,9 @@ test_bus_kernel_SOURCES = \
         src/libsystemd/sd-bus/test-bus-kernel.c
  
  test_bus_kernel_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-test_bus_kernel_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_bus_kernel_bloom_SOURCES = \
         src/libsystemd/sd-bus/test-bus-kernel-bloom.c
@@ -2784,15 +3097,9 @@ test_bus_zero_copy_SOURCES = \
         src/libsystemd/sd-bus/test-bus-zero-copy.c
  
  test_bus_zero_copy_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-test_bus_zero_copy_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  test_bus_introspect_SOURCES = \
         src/libsystemd/sd-bus/test-bus-introspect.c
@@ -2815,6 +3122,13 @@ test_rtnl_LDADD = \
         libsystemd-internal.la \
         libsystemd-shared.la
  
+test_local_addresses_SOURCES = \
+       src/libsystemd/sd-rtnl/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
  test_resolve_SOURCES = \
         src/libsystemd/sd-resolve/test-resolve.c
  
@@ -2828,18 +3142,14 @@ test_resolve_CFLAGS = \
         -pthread
  
  busctl_SOURCES = \
-       src/libsystemd/sd-bus/busctl.c
+       src/libsystemd/sd-bus/busctl.c \
+       src/libsystemd/sd-bus/busctl-introspect.c \
+       src/libsystemd/sd-bus/busctl-introspect.h
  
  busctl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-busctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
@@ -2857,6 +3167,8 @@ libsystemd_network_la_SOURCES = \
         src/systemd/sd-icmp6-nd.h \
         src/systemd/sd-dhcp6-client.h \
         src/systemd/sd-dhcp6-lease.h \
+       src/systemd/sd-pppoe.h \
+       src/systemd/sd-lldp.h \
         src/libsystemd-network/sd-dhcp-client.c \
         src/libsystemd-network/sd-dhcp-server.c \
         src/libsystemd-network/dhcp-network.c \
@@ -2871,6 +3183,7 @@ libsystemd_network_la_SOURCES = \
         src/libsystemd-network/ipv4ll-network.c \
         src/libsystemd-network/ipv4ll-packet.c \
         src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/sd-pppoe.c \
         src/libsystemd-network/network-internal.c \
         src/libsystemd-network/network-internal.h \
         src/libsystemd-network/sd-icmp6-nd.c \
@@ -2880,7 +3193,20 @@ libsystemd_network_la_SOURCES = \
         src/libsystemd-network/dhcp6-network.c \
         src/libsystemd-network/dhcp6-option.c \
         src/libsystemd-network/dhcp6-lease-internal.h \
-       src/libsystemd-network/sd-dhcp6-lease.c
+       src/libsystemd-network/sd-dhcp6-lease.c \
+       src/libsystemd-network/dhcp-identifier.h \
+       src/libsystemd-network/dhcp-identifier.c \
+       src/libsystemd-network/lldp.h \
+       src/libsystemd-network/lldp-tlv.h \
+       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/lldp-network.h \
+       src/libsystemd-network/lldp-network.c \
+       src/libsystemd-network/lldp-port.h \
+       src/libsystemd-network/lldp-port.c \
+       src/libsystemd-network/lldp-internal.h \
+       src/libsystemd-network/lldp-internal.c \
+       src/libsystemd-network/lldp-util.h \
+       src/libsystemd-network/sd-lldp.c
  
  libsystemd_network_la_LIBADD = \
         libudev-internal.la \
@@ -2930,11 +3256,21 @@ test_ipv4ll_LDADD = \
         libsystemd-internal.la \
         libsystemd-shared.la
  
+test_pppoe_SOURCES = \
+       src/systemd/sd-pppoe.h \
+       src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+       libsystemd-network.la \
+       libsystemd-shared.la
+
  test_icmp6_rs_SOURCES = \
         src/systemd/sd-dhcp6-client.h \
         src/systemd/sd-icmp6-nd.h \
         src/libsystemd-network/dhcp6-internal.h \
-       src/libsystemd-network/test-icmp6-rs.c
+       src/libsystemd-network/test-icmp6-rs.c \
+       src/libsystemd-network/dhcp-identifier.h \
+       src/libsystemd-network/dhcp-identifier.c
  
  test_icmp6_rs_LDADD = \
         libsystemd-network.la \
@@ -2944,46 +3280,78 @@ test_icmp6_rs_LDADD = \
  test_dhcp6_client_SOURCES = \
         src/systemd/sd-dhcp6-client.h \
         src/libsystemd-network/dhcp6-internal.h \
-       src/libsystemd-network/test-dhcp6-client.c
+       src/libsystemd-network/test-dhcp6-client.c \
+       src/libsystemd-network/dhcp-identifier.h \
+       src/libsystemd-network/dhcp-identifier.c
  
  test_dhcp6_client_LDADD = \
         libsystemd-network.la \
         libsystemd-internal.la \
         libsystemd-shared.la
  
+test_lldp_SOURCES = \
+       src/libsystemd-network/lldp.h \
+       src/libsystemd-network/lldp-tlv.h \
+       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/test-lldp.c
+
+test_lldp_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
  tests += \
         test-dhcp-option \
         test-dhcp-client \
         test-dhcp-server \
         test-ipv4ll \
         test-icmp6-rs \
-       test-dhcp6-client
+       test-dhcp6-client \
+       test-lldp
+
+manual_tests += \
+       test-pppoe
  
  # ------------------------------------------------------------------------------
  if ENABLE_TERMINAL
  noinst_LTLIBRARIES += \
         libsystemd-terminal.la
  
+rootlibexec_PROGRAMS += \
+       systemd-consoled
+
  noinst_PROGRAMS += \
         systemd-evcat \
+       systemd-modeset \
         systemd-subterm
  
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
         src/libsystemd-terminal/unifont-glyph-array.bin
  
+nodist_userunit_DATA += \
+       units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+       systemd-consoled.service
+
  tests += \
         test-term-page \
         test-term-parser \
         test-unifont
  endif
  
+EXTRA_DIST += \
+       units/user/systemd-consoled.service.in
+
  libsystemd_terminal_la_CFLAGS = \
         $(AM_CFLAGS) \
         $(TERMINAL_CFLAGS)
  
  libsystemd_terminal_la_SOURCES = \
+       src/libsystemd-terminal/grdev.h \
+       src/libsystemd-terminal/grdev-internal.h \
+       src/libsystemd-terminal/grdev.c \
+       src/libsystemd-terminal/grdev-drm.c \
         src/libsystemd-terminal/idev.h \
         src/libsystemd-terminal/idev-internal.h \
         src/libsystemd-terminal/idev.c \
@@ -2992,13 +3360,15 @@ libsystemd_terminal_la_SOURCES = \
         src/libsystemd-terminal/sysview.h \
         src/libsystemd-terminal/sysview-internal.h \
         src/libsystemd-terminal/sysview.c \
+       src/libsystemd-terminal/term.h \
         src/libsystemd-terminal/term-internal.h \
         src/libsystemd-terminal/term-charset.c \
         src/libsystemd-terminal/term-page.c \
         src/libsystemd-terminal/term-parser.c \
         src/libsystemd-terminal/term-screen.c \
         src/libsystemd-terminal/term-wcwidth.c \
-       src/libsystemd-terminal/unifont-internal.h \
+       src/libsystemd-terminal/unifont.h \
+       src/libsystemd-terminal/unifont-def.h \
         src/libsystemd-terminal/unifont.c
  
  libsystemd_terminal_la_LIBADD = \
@@ -3007,6 +3377,25 @@ libsystemd_terminal_la_LIBADD = \
         libsystemd-shared.la \
         $(TERMINAL_LIBS)
  
+systemd_consoled_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+       src/console/consoled.h \
+       src/console/consoled.c \
+       src/console/consoled-display.c \
+       src/console/consoled-manager.c \
+       src/console/consoled-session.c \
+       src/console/consoled-terminal.c \
+       src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
  systemd_evcat_CFLAGS = \
         $(AM_CFLAGS) \
         $(TERMINAL_CFLAGS)
@@ -3020,6 +3409,19 @@ systemd_evcat_LDADD = \
         libsystemd-shared.la \
         $(TERMINAL_LIBS)
  
+systemd_modeset_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_modeset_SOURCES = \
+       src/libsystemd-terminal/modeset.c
+
+systemd_modeset_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
  systemd_subterm_SOURCES = \
         src/libsystemd-terminal/subterm.c
  
@@ -3085,7 +3487,6 @@ libudev_la_SOURCES =\
         src/libudev/libudev-enumerate.c \
         src/libudev/libudev-monitor.c \
         src/libudev/libudev-queue.c \
-       src/libudev/libudev-hwdb-def.h \
         src/libudev/libudev-hwdb.c
  
  libudev_la_CFLAGS = \
@@ -3144,8 +3545,7 @@ libudev_internal_la_CFLAGS = \
  
  # ------------------------------------------------------------------------------
  INSTALL_DIRS += \
-       $(sysconfdir)/udev/rules.d \
-       $(sysconfdir)/udev/hwdb.d
+       $(sysconfdir)/udev/rules.d
  
  dist_network_DATA = \
         network/99-default.link \
@@ -3157,6 +3557,7 @@ dist_udevrules_DATA += \
         rules/50-udev-default.rules \
         rules/60-drm.rules \
         rules/60-keyboard.rules \
+       rules/70-mouse.rules \
         rules/60-persistent-storage-tape.rules \
         rules/60-persistent-serial.rules \
         rules/60-persistent-input.rules \
@@ -3172,19 +3573,6 @@ dist_udevrules_DATA += \
  nodist_udevrules_DATA += \
         rules/99-systemd.rules
  
-dist_udevhwdb_DATA = \
-       hwdb/20-pci-vendor-model.hwdb \
-       hwdb/20-pci-classes.hwdb \
-       hwdb/20-usb-vendor-model.hwdb \
-       hwdb/20-usb-classes.hwdb \
-       hwdb/20-sdio-vendor-model.hwdb \
-       hwdb/20-sdio-classes.hwdb \
-       hwdb/20-bluetooth-vendor-product.hwdb \
-       hwdb/20-acpi-vendor.hwdb \
-       hwdb/20-OUI.hwdb \
-       hwdb/20-net-ifname.hwdb \
-       hwdb/60-keyboard.hwdb
-
  udevconfdir = $(sysconfdir)/udev
  dist_udevconf_DATA = \
         src/udev/udev.conf
@@ -3204,14 +3592,12 @@ CLEANFILES += \
  EXTRA_DIST += \
         units/systemd-udevd.service.in \
         units/systemd-udev-trigger.service.in \
-       units/systemd-udev-settle.service.in \
-       units/systemd-udev-hwdb-update.service.in
+       units/systemd-udev-settle.service.in
  
  CLEANFILES += \
         units/systemd-udevd.service \
         units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service \
-       units/systemd-udev-hwdb-update.service
+       units/systemd-udev-settle.service
  
  SOCKETS_TARGET_WANTS += \
         systemd-udevd-control.socket \
@@ -3219,8 +3605,7 @@ SOCKETS_TARGET_WANTS += \
  
  SYSINIT_TARGET_WANTS += \
         systemd-udevd.service \
-       systemd-udev-trigger.service \
-       systemd-udev-hwdb-update.service
+       systemd-udev-trigger.service
  
  rootbin_PROGRAMS += \
         udevadm
@@ -3334,26 +3719,76 @@ udevadm_SOURCES = \
         src/udev/udevadm-settle.c \
         src/udev/udevadm-trigger.c \
         src/udev/udevadm-test.c \
-       src/udev/udevadm-test-builtin.c
+       src/udev/udevadm-test-builtin.c \
+       src/udev/udevadm-util.c \
+       src/udev/udevadm-util.h
  
  udevadm_LDADD = \
         libudev-core.la
  
+# ------------------------------------------------------------------------------
+if ENABLE_HWDB
+INSTALL_DIRS += \
+       $(sysconfdir)/udev/hwdb.d
+
+systemd_hwdb_SOURCES = \
+       src/libsystemd/sd-hwdb/hwdb-internal.h \
+       src/hwdb/hwdb.c
+
+systemd_hwdb_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la \
+       libudev-internal.la
+
+rootbin_PROGRAMS += \
+       systemd-hwdb
+
+dist_udevhwdb_DATA = \
+       hwdb/20-pci-vendor-model.hwdb \
+       hwdb/20-pci-classes.hwdb \
+       hwdb/20-usb-vendor-model.hwdb \
+       hwdb/20-usb-classes.hwdb \
+       hwdb/20-sdio-vendor-model.hwdb \
+       hwdb/20-sdio-classes.hwdb \
+       hwdb/20-bluetooth-vendor-product.hwdb \
+       hwdb/20-acpi-vendor.hwdb \
+       hwdb/20-OUI.hwdb \
+       hwdb/20-net-ifname.hwdb \
+       hwdb/60-keyboard.hwdb \
+       hwdb/70-mouse.hwdb
+
+EXTRA_DIST += \
+       units/systemd-hwdb-update.service.in
+
+CLEANFILES += \
+       units/systemd-hwdb-update.service
+
+SYSINIT_TARGET_WANTS += \
+       systemd-hwdb-update.service
+
  # Update hwdb on installation. Do not bother if installing
  # in DESTDIR, since this is likely for packaging purposes.
  hwdb-update-hook:
-       -test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update
+       -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update
  
  INSTALL_DATA_HOOKS += \
         hwdb-update-hook
  
  hwdb-remove-hook:
         -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
  
  # ------------------------------------------------------------------------------
  TESTS += \
         test/udev-test.pl \
-       test/rules-test.sh
+       $(NULL)
+
+if HAVE_PYTHON
+TESTS += \
+       test/rule-syntax-check.py \
+       test/sysv-generator-test.py \
+       $(NULL)
+endif
  
  manual_tests += \
         test-libudev \
@@ -3365,13 +3800,14 @@ test_libudev_SOURCES = \
  test_libudev_LDADD = \
         libsystemd-label.la \
         libudev-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
  
  test_udev_SOURCES = \
         src/test/test-udev.c
  
  test_udev_LDADD = \
-       libudev-core.la \
+       libudev-core.la  \
         $(BLKID_LIBS) \
         $(KMOD_LIBS) \
         $(SELINUX_LIBS)
@@ -3396,8 +3832,10 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
  EXTRA_DIST += \
         test/sys.tar.xz \
         test/udev-test.pl \
-       test/rules-test.sh \
-       test/rule-syntax-check.py
+       test/rule-syntax-check.py \
+       test/sysv-generator-test.py \
+       $(NULL)
+
  
  # ------------------------------------------------------------------------------
  ata_id_SOURCES = \
@@ -3457,7 +3895,8 @@ v4l_id_SOURCES = \
         src/udev/v4l_id/v4l_id.c
  
  v4l_id_LDADD = \
-       libudev-internal.la
+       libudev-internal.la \
+       libsystemd-shared.la
  
  udevlibexec_PROGRAMS += \
         v4l_id
@@ -3470,7 +3909,7 @@ accelerometer_SOURCES = \
         src/udev/accelerometer/accelerometer.c
  
  accelerometer_LDADD = \
-       libudev-internal.la -lm \
+       libudev-internal.la \
         libsystemd-shared.la
  
  udevlibexec_PROGRAMS += \
@@ -3706,6 +4145,16 @@ systemd_journal_remote_CFLAGS = \
  systemd_journal_remote_LDADD += \
         $(MICROHTTPD_LIBS)
  
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+       sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+       tmpfiles.d/systemd-remote.conf
+endif
+
  if HAVE_GNUTLS
  systemd_journal_remote_LDADD += \
         $(GNUTLS_LIBS)
@@ -3753,7 +4202,6 @@ systemd_journal_upload_CFLAGS = \
         $(LIBCURL_CFLAGS)
  
  systemd_journal_upload_LDADD = \
-       libsystemd-core.la \
         libsystemd-internal.la \
         libsystemd-journal-internal.la \
         libsystemd-shared.la \
@@ -3910,6 +4358,8 @@ libsystemd_journal_core_la_SOURCES = \
         src/journal/journald-wall.h \
         src/journal/journald-native.c \
         src/journal/journald-native.h \
+       src/journal/journald-audit.c \
+       src/journal/journald-audit.h \
         src/journal/journald-rate-limit.c \
         src/journal/journald-rate-limit.h \
         src/journal/journal-internal.h
@@ -3920,7 +4370,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
  libsystemd_journal_core_la_LIBADD = \
         libsystemd-journal-internal.la \
         libudev-internal.la \
-       libsystemd-capability.la \
         libsystemd-label.la \
         libsystemd-internal.la \
         libsystemd-shared.la
@@ -4007,16 +4456,15 @@ libsystemd_journal_internal_la_SOURCES = \
         src/journal/catalog.c \
         src/journal/catalog.h \
         src/journal/mmap-cache.c \
-       src/journal/mmap-cache.h
+       src/journal/mmap-cache.h \
+       src/journal/compress.c
  
  # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
  libsystemd_journal_internal_la_CFLAGS = \
         $(AM_CFLAGS)
  
-libsystemd_journal_internal_la_LIBADD =
-
-libsystemd_journal_internal_la_SOURCES += \
-       src/journal/compress.c
+libsystemd_journal_internal_la_LIBADD = \
+       libsystemd-label.la
  
  if HAVE_XZ
  libsystemd_journal_internal_la_CFLAGS += \
@@ -4061,7 +4509,8 @@ bin_PROGRAMS += \
  
  dist_systemunit_DATA += \
         units/systemd-journald.socket \
-       units/systemd-journald-dev-log.socket
+       units/systemd-journald-dev-log.socket \
+       units/systemd-journald-audit.socket
  
  nodist_systemunit_DATA += \
         units/systemd-journald.service \
@@ -4073,13 +4522,16 @@ dist_pkgsysconf_DATA += \
  
  dist_catalog_DATA = \
         catalog/systemd.fr.catalog \
-       catalog/systemd.ru.catalog \
         catalog/systemd.it.catalog \
+       catalog/systemd.pl.catalog \
+       catalog/systemd.pt_BR.catalog \
+       catalog/systemd.ru.catalog \
         catalog/systemd.catalog
  
  SOCKETS_TARGET_WANTS += \
         systemd-journald.socket \
-       systemd-journald-dev-log.socket
+       systemd-journald-dev-log.socket \
+       systemd-journald-audit.socket
  
  SYSINIT_TARGET_WANTS += \
         systemd-journald.service \
@@ -4270,63 +4722,19 @@ rootlibexec_PROGRAMS += \
  nodist_systemunit_DATA += \
         units/systemd-vconsole-setup.service
  
+nodist_udevrules_DATA += \
+       src/vconsole/90-vconsole.rules
+
  SYSINIT_TARGET_WANTS += \
         systemd-vconsole-setup.service
-endif
-
-EXTRA_DIST += \
-       units/systemd-vconsole-setup.service.in
-
-# ------------------------------------------------------------------------------
-if ENABLE_READAHEAD
-systemd_readahead_SOURCES = \
-       src/readahead/readahead.c \
-       src/readahead/readahead-collect.c \
-       src/readahead/readahead-replay.c \
-       src/readahead/readahead-analyze.c \
-       src/readahead/readahead-common.c \
-       src/readahead/readahead-common.h
-
-systemd_readahead_LDADD = \
-       libsystemd-internal.la \
-       libudev-internal.la \
-       libsystemd-shared.la
-
-dist_doc_DATA += \
-       src/readahead/sd-readahead.c \
-       src/systemd/sd-readahead.h
-
-rootlibexec_PROGRAMS += \
-       systemd-readahead
-
-dist_systemunit_DATA += \
-       units/systemd-readahead-drop.service \
-       units/systemd-readahead-done.timer
-
-nodist_systemunit_DATA += \
-       units/systemd-readahead-collect.service \
-       units/systemd-readahead-replay.service \
-       units/systemd-readahead-done.service
-
-manual_tests += \
-       test-ssd
-
-test_ssd_SOURCES = \
-       src/readahead/test-ssd.c \
-       src/readahead/readahead-common.c \
-       src/readahead/readahead-common.h
-
-test_ssd_LDADD = \
-       libsystemd-internal.la \
-       libudev-internal.la \
-       libsystemd-shared.la
  
+CLEANFILES += \
+       src/vconsole/90-vconsole.rules
  endif
  
  EXTRA_DIST += \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in
+       src/vconsole/90-vconsole.rules.in \
+       units/systemd-vconsole-setup.service.in
  
  # ------------------------------------------------------------------------------
  if ENABLE_BOOTCHART
@@ -4347,6 +4755,15 @@ rootlibexec_PROGRAMS += \
  
  dist_pkgsysconf_DATA += \
         src/bootchart/bootchart.conf
+
+nodist_systemunit_DATA += \
+       units/systemd-bootchart.service
+
+EXTRA_DIST += \
+       units/systemd-bootchart.service.in
+
+CLEANFILES += \
+       units/systemd-bootchart.service
  endif
  
  # ------------------------------------------------------------------------------
@@ -4486,7 +4903,7 @@ rootlibexec_PROGRAMS += \
  nodist_systemunit_DATA += \
         units/systemd-hostnamed.service
  
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.hostname1.busname
  
  dist_dbuspolicy_DATA += \
@@ -4529,13 +4946,11 @@ EXTRA_DIST += \
         units/systemd-hostnamed.service.in
  
  # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.systemd1.busname
  
  BUSNAMES_TARGET_WANTS += \
         org.freedesktop.systemd1.busname
-endif
  
  # ------------------------------------------------------------------------------
  if ENABLE_LOCALED
@@ -4545,12 +4960,17 @@ systemd_localed_SOURCES = \
  systemd_localed_LDADD = \
         libsystemd-label.la \
         libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(XKBCOMMON_LIBS)
+
+systemd_localed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XKBCOMMON_CFLAGS)
  
  nodist_systemunit_DATA += \
         units/systemd-localed.service
  
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.locale1.busname
  
  rootlibexec_PROGRAMS += \
@@ -4625,7 +5045,7 @@ dist_dbuspolicy_DATA += \
  nodist_systemunit_DATA += \
         units/systemd-timedated.service
  
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.timedate1.busname
  
  polkitpolicy_files += \
@@ -4684,10 +5104,8 @@ systemd_timesyncd_LDADD = \
         libsystemd-resolve.la \
         libsystemd-network.la \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
-       libsystemd-shared.la \
-       -lm
+       libsystemd-shared.la
  
  rootlibexec_PROGRAMS += \
         systemd-timesyncd
@@ -4747,10 +5165,13 @@ rootlibexec_PROGRAMS += \
         systemd-machined
  
  libsystemd_machine_core_la_SOURCES = \
-       src/machine/machined-dbus.c \
         src/machine/machine.c \
         src/machine/machine.h \
-       src/machine/machine-dbus.c
+       src/machine/machined-dbus.c \
+       src/machine/machine-dbus.c \
+       src/machine/machine-dbus.h \
+       src/machine/image-dbus.c \
+       src/machine/image-dbus.h
  
  libsystemd_machine_core_la_LIBADD = \
         libsystemd-label.la \
@@ -4766,6 +5187,8 @@ machinectl_SOURCES = \
  
  machinectl_LDADD = \
         libsystemd-internal.la \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
         libsystemd-shared.la
  
  rootbin_PROGRAMS += \
@@ -4787,7 +5210,9 @@ nodist_systemunit_DATA += \
         units/systemd-machined.service
  
  dist_systemunit_DATA += \
-       units/machine.slice \
+       units/machine.slice
+
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.machine1.busname
  
  dist_dbussystemservice_DATA += \
@@ -4796,6 +5221,12 @@ dist_dbussystemservice_DATA += \
  dist_dbuspolicy_DATA += \
         src/machine/org.freedesktop.machine1.conf
  
+polkitpolicy_files += \
+       src/machine/org.freedesktop.machine1.policy
+
+polkitpolicy_in_files += \
+       src/machine/org.freedesktop.machine1.policy.in
+
  dist_zshcompletion_DATA += \
         shell-completion/zsh/_machinectl \
         shell-completion/zsh/_sd_machines
@@ -4828,6 +5259,128 @@ libnss_mymachines_la_LIBADD = \
  
  lib_LTLIBRARIES += \
         libnss_mymachines.la
+
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_IMPORTD
+
+if HAVE_LIBCURL
+if HAVE_XZ
+if HAVE_ZLIB
+if HAVE_BZIP2
+if HAVE_GCRYPT
+
+rootlibexec_PROGRAMS += \
+       systemd-importd \
+       systemd-import
+
+systemd_importd_SOURCES = \
+       src/import/importd.c \
+       src/import/importd.h
+
+systemd_importd_CFLAGS = \
+       $(AM_CFLAGS) \
+       -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+       -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+       -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+
+systemd_importd_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+systemd_import_SOURCES = \
+       src/import/import.c \
+       src/import/import-raw.c \
+       src/import/import-raw.h \
+       src/import/import-tar.c \
+       src/import/import-tar.h \
+       src/import/import-dkr.c \
+       src/import/import-dkr.h \
+       src/import/import-job.c \
+       src/import/import-job.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
+       src/import/curl-util.c \
+       src/import/curl-util.h \
+       src/import/aufs-util.c \
+       src/import/aufs-util.h \
+       src/import/qcow2-util.c \
+       src/import/qcow2-util.h
+
+systemd_import_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBCURL_CFLAGS) \
+       $(XZ_CFLAGS) \
+       $(ZLIB_CFLAGS) \
+       $(GCRYPT_CFLAGS) \
+       -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+       -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+
+systemd_import_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(LIBCURL_LIBS) \
+       $(XZ_LIBS) \
+       $(ZLIB_LIBS) \
+       -lbz2 \
+       $(GCRYPT_LIBS)
+
+dist_rootlibexec_DATA = \
+       src/import/import-pubring.gpg
+
+nodist_systemunit_DATA += \
+       units/systemd-importd.service
+
+EXTRA_DIST += \
+       units/systemd-importd.service.in
+
+dist_systemunit_DATA_busnames += \
+       units/org.freedesktop.import1.busname
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.import1.busname
+
+SYSTEM_UNIT_ALIASES += \
+       systemd-importd.service dbus-org.freedesktop.import1.service
+
+dist_dbussystemservice_DATA += \
+       src/import/org.freedesktop.import1.service
+
+dist_dbuspolicy_DATA += \
+       src/import/org.freedesktop.import1.conf
+
+polkitpolicy_files += \
+       src/import/org.freedesktop.import1.policy
+
+polkitpolicy_in_files += \
+       src/import/org.freedesktop.import1.policy.in
+
+manual_tests += \
+       test-qcow2
+
+test_qcow2_SOURCES = \
+       src/import/test-qcow2.c \
+       src/import/qcow2-util.c \
+       src/import/qcow2-util.h
+
+test_qcow2_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ZLIB_CFLAGS)
+
+test_qcow2_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(ZLIB_LIBS)
+
+endif
+endif
+endif
+endif
+endif
+
  endif
  
  # ------------------------------------------------------------------------------
@@ -4883,12 +5436,10 @@ CLEANFILES += \
         src/resolve/resolved-gperf.c
  
  systemd_resolved_LDADD = \
-       libsystemd-capability.la \
         libsystemd-network.la \
         libsystemd-label.la \
         libsystemd-internal.la \
         libsystemd-shared.la \
-       -lm \
         $(LIBIDN_LIBS)
  
  rootlibexec_PROGRAMS += \
@@ -4897,7 +5448,7 @@ rootlibexec_PROGRAMS += \
  nodist_systemunit_DATA += \
         units/systemd-resolved.service
  
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.resolve1.busname
  
  dist_dbuspolicy_DATA += \
@@ -4936,7 +5487,6 @@ test_dns_domain_SOURCES = \
         src/resolve/test-dns-domain.c
  
  test_dns_domain_LDADD = \
-       libsystemd-capability.la \
         libsystemd-network.la \
         libsystemd-label.la \
         libsystemd-internal.la \
@@ -4957,8 +5507,8 @@ libnss_resolve_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
  
  libnss_resolve_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
  
  lib_LTLIBRARIES += \
         libnss_resolve.la
@@ -4983,7 +5533,6 @@ systemd_resolve_host_SOURCES = \
  systemd_resolve_host_LDADD = \
         libsystemd-internal.la \
         libsystemd-shared.la \
-       -lm \
         $(LIBIDN_LIBS)
  
  rootlibexec_PROGRAMS += \
@@ -5000,8 +5549,12 @@ systemd_networkd_SOURCES = \
         src/network/networkd.c
  
  systemd_networkd_LDADD = \
-       libsystemd-networkd-core.la \
-       libsystemd-capability.la
+       libsystemd-networkd-core.la
+
+if HAVE_LIBIPTC
+systemd_networkd_LDADD += \
+       libsystemd-fw.la
+endif
  
  noinst_LTLIBRARIES += \
         libsystemd-networkd-core.la
@@ -5019,6 +5572,7 @@ libsystemd_networkd_core_la_SOURCES = \
         src/network/networkd-netdev-vxlan.h \
         src/network/networkd-netdev-vlan.h \
         src/network/networkd-netdev-macvlan.h \
+       src/network/networkd-netdev-ipvlan.h \
         src/network/networkd-netdev-dummy.h \
         src/network/networkd-netdev-tuntap.h \
         src/network/networkd-netdev-bond.h \
@@ -5029,6 +5583,7 @@ libsystemd_networkd_core_la_SOURCES = \
         src/network/networkd-netdev-vxlan.c \
         src/network/networkd-netdev-vlan.c \
         src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-ipvlan.c \
         src/network/networkd-netdev-dummy.c \
         src/network/networkd-netdev-tuntap.c \
         src/network/networkd-netdev-bond.c \
@@ -5036,10 +5591,12 @@ libsystemd_networkd_core_la_SOURCES = \
         src/network/networkd-link.c \
         src/network/networkd-ipv4ll.c \
         src/network/networkd-dhcp4.c \
+       src/network/networkd-dhcp6.c \
         src/network/networkd-network.c \
         src/network/networkd-address.c \
         src/network/networkd-route.c \
         src/network/networkd-manager.c \
+       src/network/networkd-fdb.c \
         src/network/networkd-address-pool.c
  
  nodist_libsystemd_networkd_core_la_SOURCES = \
@@ -5088,12 +5645,14 @@ networkctl_LDADD = \
  test_network_SOURCES = \
         src/network/test-network.c
  
-test_network_CFLAGS = \
-       $(AM_CFLAGS)
-
  test_network_LDADD = \
         libsystemd-networkd-core.la
  
+if HAVE_LIBIPTC
+test_network_LDADD += \
+       libsystemd-fw.la
+endif
+
  test_network_tables_SOURCES = \
         src/network/test-network-tables.c \
         src/shared/test-tables.h
@@ -5102,6 +5661,11 @@ test_network_tables_LDADD = \
         libsystemd-networkd-core.la \
         libudev-core.la
  
+if HAVE_LIBIPTC
+test_network_tables_LDADD += \
+       libsystemd-fw.la
+endif
+
  tests += \
         test-network \
         test-network-tables
@@ -5163,7 +5727,6 @@ libsystemd_logind_core_la_SOURCES = \
  
  libsystemd_logind_core_la_LIBADD = \
         libsystemd-label.la \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libudev-internal.la \
         libsystemd-shared.la
@@ -5191,10 +5754,13 @@ rootlibexec_PROGRAMS += \
  
  loginctl_SOURCES = \
         src/login/loginctl.c \
+       src/login/sysfs-show.h \
         src/login/sysfs-show.c
  
  loginctl_LDADD = \
         libsystemd-internal.la \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
         libudev-internal.la \
         libsystemd-shared.la
  
@@ -5272,7 +5838,6 @@ pam_systemd_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
  
  pam_systemd_la_LIBADD = \
-       libsystemd-capability.la \
         libsystemd-internal.la \
         libsystemd-shared.la \
         $(PAM_LIBS)
@@ -5289,7 +5854,9 @@ nodist_systemunit_DATA += \
         units/systemd-user-sessions.service
  
  dist_systemunit_DATA += \
-       units/user.slice \
+       units/user.slice
+
+dist_systemunit_DATA_busnames += \
         units/org.freedesktop.login1.busname
  
  dist_dbussystemservice_DATA += \
@@ -5317,20 +5884,6 @@ SYSTEM_UNIT_ALIASES += \
  BUSNAMES_TARGET_WANTS += \
         org.freedesktop.login1.busname
  
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
-       src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-       systemd-multi-seat-x
-
-endif
-
  dist_udevrules_DATA += \
         src/login/70-uaccess.rules \
         src/login/70-power-switch.rules
@@ -5738,6 +6291,10 @@ src/%: src/%.m4
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
  
+sysusers.d/%: sysusers.d/%.m4
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
  tmpfiles.d/%: tmpfiles.d/%.m4
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
@@ -5747,7 +6304,7 @@ units/%: units/%.m4
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
  
-units/user/%: units/%.m4
+units/user/%: units/user/%.m4
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
  
@@ -5764,7 +6321,6 @@ EXTRA_DIST += \
  CLEANFILES += \
         $(nodist_systemunit_DATA) \
         $(nodist_userunit_DATA) \
-       $(pkgconfigdata_DATA) \
         $(pkgconfiglib_DATA) \
         $(nodist_polkitpolicy_DATA)
  
@@ -5850,6 +6406,7 @@ SOCKETS_TARGET_WANTS += \
         systemd-initctl.socket \
         systemd-shutdownd.socket
  
+if HAVE_UTMP
  if HAVE_SYSV_COMPAT
  RUNLEVEL1_TARGET_WANTS += \
         systemd-update-utmp-runlevel.service
@@ -5864,7 +6421,10 @@ RUNLEVEL5_TARGET_WANTS += \
  endif
  
  SYSINIT_TARGET_WANTS += \
-       systemd-update-utmp.service \
+       systemd-update-utmp.service
+endif
+
+SYSINIT_TARGET_WANTS += \
         systemd-update-done.service
  
  LOCAL_FS_TARGET_WANTS += \
@@ -5903,7 +6463,6 @@ SYSTEM_UNIT_ALIASES += \
  USER_UNIT_ALIASES += \
         $(systemunitdir)/shutdown.target shutdown.target \
         $(systemunitdir)/sockets.target sockets.target \
-       $(systemunitdir)/busnames.target busnames.target \
         $(systemunitdir)/timers.target timers.target \
         $(systemunitdir)/paths.target paths.target \
         $(systemunitdir)/bluetooth.target bluetooth.target \
@@ -5911,6 +6470,11 @@ USER_UNIT_ALIASES += \
         $(systemunitdir)/sound.target sound.target \
         $(systemunitdir)/smartcard.target smartcard.target
  
+if ENABLE_KDBUS
+USER_UNIT_ALIASES += \
+       $(systemunitdir)/busnames.target busnames.target
+endif
+
  GENERAL_ALIASES += \
         $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
         $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
@@ -6049,10 +6613,13 @@ doc-sync: all destdir-sphinx
         rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
         rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
  
-.PHONY: tango
-tango: upload
+.PHONY: gardel
+gardel: upload
+       scp man/*.html gardel:public/systemd-man/
+
+.PHONY: lennart-fedora
+lennart-fedora:
         cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
-       scp man/*.html tango:public/systemd-man/
  
  .PHONY: install-tree
  install-tree: all
@@ -6171,3 +6738,12 @@ print-%:
  
  git-contrib:
         @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+        tools/gdb-sd_dump_hashmaps.py
+
+list-keys:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
+
+add-key:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -