systemd-selinux 208-10 update

14 files changed, 1009 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ca9c2f99665..1e7dc8bff214 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = systemd-selinux
 	pkgver = 208
-	pkgrel = 2
+	pkgrel = 10
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
 	makedepends = acl
 	makedepends = cryptsetup
-	makedepends = dbus-core
+	makedepends = libdbus
 	makedepends = docbook-xsl
 	makedepends = gobject-introspection
 	makedepends = gperf
@@ -18,10 +18,10 @@ pkgbase = systemd-selinux
 	makedepends = libmicrohttpd
 	makedepends = libxslt
 	makedepends = linux-api-headers
+	makedepends = pam-selinux
 	makedepends = python
 	makedepends = quota-tools
 	makedepends = xz
-	makedepends = pam-selinux
 	makedepends = libselinux
 	options = strip
 	options = debug
@@ -29,16 +29,40 @@ pkgbase = systemd-selinux
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
 	source = initcpio-install-udev
+	source = 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
+	source = 0001-Make-hibernation-test-work-for-swap-files.patch
 	source = 0001-fix-lingering-references-to-var-lib-backlight-random.patch
 	source = 0001-mount-check-for-NULL-before-reading-pm-what.patch
 	source = 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+	source = 0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+	source = 0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
+	source = 0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
+	source = 0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
+	source = 0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
+	source = 0005-mount-service-drop-FsckPassNo-support.patch
+	source = 0006-efi-boot-generator-hookup-to-fsck.patch
+	source = 0007-fsck-root-only-run-when-requested-in-fstab.patch
+	source = 0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
+	source = 0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
 	md5sums = df64550d92afbffb4f67a434193ee165
 	md5sums = 29245f7a240bfba66e2b1783b63b6b40
 	md5sums = 8b68b0218a3897d4d37a6ccf47914774
 	md5sums = bde43090d4ac0ef048e3eaee8202a407
+	md5sums = 8f1182afa1156f0076a912b23e761e02
+	md5sums = a5c6564d5435ee99814effd2aa9baf93
 	md5sums = 1b191c4e7a209d322675fd199e3abc66
 	md5sums = a693bef63548163ffc165f4c4801ebf7
 	md5sums = ccafe716d87df9c42af0d1960b5a4105
+	md5sums = 441e3d464ee6af5fe4af6a8bc10d7980
+	md5sums = 718d841203cf2ea9e24a7d0f1d19d48b
+	md5sums = 623c77bad0d2968e44963d72924825f1
+	md5sums = e52fc8368853c7800ab03ab8868cfd41
+	md5sums = 2096f33bd36dfa0a7f0431d0a429787a
+	md5sums = d2481a6ea199b581e243a950125b0ca6
+	md5sums = c2aee634a3a6c50778968f0d5c756f40
+	md5sums = ef8b8212d504bb73c10bf4e85f0703b2
+	md5sums = 4ba2317bf4d7708fca406f49482b1bf3
+	md5sums = 078f10d6fc315b329844cd20fa742eee
 
 pkgname = systemd-selinux
 	pkgdesc = system and service manager
@@ -74,7 +98,7 @@ pkgname = systemd-selinux
 	provides = libsystemd-journal.so
 	provides = libsystemd-login.so
 	provides = libudev.so
-	provides = systemd=208-2
+	provides = systemd=208-10
 	conflicts = libsystemd
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
@@ -104,10 +128,9 @@ pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd
 	groups = selinux
 	license = GPL2
-	depends = sysvinit-tools
 	depends = systemd-selinux
-	provides = systemd-sysvcompat-sysvcompat=208-2
-	provides = selinux-systemd-sysvcompat-sysvcompat=208-2
+	provides = systemd-sysvcompat-sysvcompat=208-10
+	provides = selinux-systemd-sysvcompat-sysvcompat=208-10
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/0001-Make-hibernation-test-work-for-swap-files.patch b/0001-Make-hibernation-test-work-for-swap-files.patch
new file mode 100644
index 000000000000..e780e01b69b7
--- /dev/null
+++ b/0001-Make-hibernation-test-work-for-swap-files.patch
@@ -0,0 +1,28 @@
+From 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo@web.de>
+Date: Thu, 31 Oct 2013 17:22:03 +0100
+Subject: [PATCH] Make hibernation test work for swap files
+
+Suspend to disk works for swap files too (even if it is located
+on an ecrypted file system):
+https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
+---
+ src/shared/sleep-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index d068bfc..2bb0493 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
+                 if (!d)
+                         return -ENOMEM;
+ 
+-                if (!streq(type, "partition")) {
++                if (!streq(type, "partition") && !streq(type, "file")) {
+                         log_debug("Partition %s has type %s, ignoring.", d, type);
+                         continue;
+                 }
+-- 
+1.8.5.2
+
diff --git a/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch b/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
new file mode 100644
index 000000000000..2594d50661a3
--- /dev/null
+++ b/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
@@ -0,0 +1,26 @@
+From f576cd2092bc40f9998415cdc3caf10035d4743a Mon Sep 17 00:00:00 2001
+From: Pavel Holica <conscript89@gmail.com>
+Date: Wed, 6 Nov 2013 23:24:16 +0100
+Subject: [PATCH] acpi-fpdt: break on zero or negative length read
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1027478
+---
+ src/shared/acpi-fpdt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index 75648b4..7bae47f 100644
+--- a/src/shared/acpi-fpdt.c
++++ b/src/shared/acpi-fpdt.c
+@@ -109,6 +109,8 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
+         for (rec = (struct acpi_fpdt_header *)(buf + sizeof(struct acpi_table_header));
+              (char *)rec < buf + l;
+              rec = (struct acpi_fpdt_header *)((char *)rec + rec->length)) {
++                if (rec->length <= 0)
++                        break;
+                 if (rec->type != ACPI_FPDT_TYPE_BOOT)
+                         continue;
+                 if (rec->length != sizeof(struct acpi_fpdt_header))
+-- 
+1.8.5.2
+
diff --git a/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch b/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
new file mode 100644
index 000000000000..e0f3d4ce3597
--- /dev/null
+++ b/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
@@ -0,0 +1,33 @@
+From 92e94a2b145eb3bee7035907cd8482285bb680ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Sun, 22 Dec 2013 09:17:14 +0100
+Subject: [PATCH] fstab-generator: Do not try to fsck non-devices
+
+This fixes a regression introduced in 64e70e4 where the mount fails
+when fstab is misconfigured with fs_passno > 0 on a virtual file
+system like nfs, and the type is specified as "auto".
+
+This is a backport of e2f123b97, but it since not all fsck-related patches
+have been backported to this version, the implementation is a bit different.
+---
+ src/fstab-generator/fstab-generator.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index c0c2992..cf8b371 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,7 +210,9 @@ static int add_mount(
+                         post);
+ 
+         if (passno > 0) {
+-                if (streq(where, "/")) {
++                if(!is_device_path(what)) {
++                        log_warning("Checking was requested for \"%s\", but it is not a device.", what);
++                } else if (streq(where, "/")) {
+                         lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
+                         if (!lnk)
+                                 return log_oom();
+-- 
+1.8.5.2
+
diff --git a/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch b/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
new file mode 100644
index 000000000000..3cdbcf02d989
--- /dev/null
+++ b/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
@@ -0,0 +1,29 @@
+From 7f5806d7095a197e4788a7803642831beec295bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 00:32:33 +0200
+Subject: [PATCH 1/7] fstab-generator: When parsing the root= cmdline option,
+ set FsckPassNo to 1
+
+[tomegun: without this we would never fsck the rootfs if it was directly
+mounted 'rw' from the initrd. We now risk fsck'ing it twice in the case it
+is mounted 'ro', so that should be addressed in a separate patch.]
+---
+ src/fstab-generator/fstab-generator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 9e7d55d..a7536f8 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -442,7 +442,7 @@ static int parse_new_root_from_proc_cmdline(void) {
+         }
+ 
+         log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+-        r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
++        r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false,
+                       SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+ 
+         return (r < 0) ? r : 0;
+-- 
+1.8.5.1
+
diff --git a/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
new file mode 100644
index 000000000000..9a92209e341b
--- /dev/null
+++ b/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
@@ -0,0 +1,36 @@
+From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Sun, 15 Dec 2013 12:18:00 +0100
+Subject: [PATCH] login: Don't stop a running user manager from
+ garbage-collecting the user.
+
+With the current logic, a user will never be garbage-collected, since its
+manager will always be around. Change the logic such that a user is
+garbage-collected when it has no sessions and linger is disabled.
+
+This is a backport from the master branch to 208 which also backports
+the improved handling of running slice and service jobs.
+---
+ src/login/logind-user.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/login/logind-user.c b/src/login/logind-user.c
+index adbe638..e2fce5c 100644
+--- a/src/login/logind-user.c
++++ b/src/login/logind-user.c
+@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) {
+         if (u->slice_job || u->service_job)
+                 return 1;
+ 
+-        if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
+-                return 1;
+-
+-        if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
+-                return 1;
+-
+         return 0;
+ }
+ 
+-- 
+1.8.5.1
+
diff --git a/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch b/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
new file mode 100644
index 000000000000..6e7f37bfec23
--- /dev/null
+++ b/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
@@ -0,0 +1,41 @@
+From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 3 Oct 2013 22:15:08 -0400
+Subject: [PATCH] systemd: order remote mounts from mountinfo before
+ remote-fs.target
+
+Usually the network is stopped before filesystems are umounted.
+Ordering network filesystems before remote-fs.target means that their
+unmounting will be performed earlier, and can terminate sucessfully.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70002
+---
+ src/core/mount.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 3d46557..93bfa99 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1440,6 +1440,9 @@ static int mount_add_one(
+ 
+         u = manager_get_unit(m, e);
+         if (!u) {
++                const char* const target =
++                        fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
++
+                 delete = true;
+ 
+                 u = unit_new(m, sizeof(Mount));
+@@ -1466,7 +1469,7 @@ static int mount_add_one(
+                         goto fail;
+                 }
+ 
+-                r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true);
++                r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
+                 if (r < 0)
+                         goto fail;
+ 
+-- 
+1.8.5.2
+
diff --git a/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch b/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
new file mode 100644
index 000000000000..57edf64b4957
--- /dev/null
+++ b/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
@@ -0,0 +1,102 @@
+From 64e70e4b86d3f732d3513189312f6220d1d5cfbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:44 +0200
+Subject: [PATCH 2/7] fstab-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun:
+  * order all fsck instances after fsck-root
+  * check for OOM
+  * added notes in the manpages]
+---
+ man/systemd-fsck@.service.xml         |  3 ++-
+ man/systemd-fstab-generator.xml       |  5 +++++
+ src/fstab-generator/fstab-generator.c | 21 +++++++++++++++++----
+ units/systemd-fsck@.service.in        |  2 +-
+ 4 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index e934352..17bd1c0 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -62,7 +62,8 @@
+                 system
+                 check. <filename>systemd-fsck-root.service</filename> is
+                 responsible for file system checks on the root
+-                file system.</para>
++                file system. The root file system check is performed
++                before the other file systems.</para>
+ 
+                 <para><filename>systemd-fsck</filename> will
+                 forward file system checking progress to the
+diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
+index 9ca16c7..740db8f 100644
+--- a/man/systemd-fstab-generator.xml
++++ b/man/systemd-fstab-generator.xml
+@@ -61,6 +61,11 @@
+                 reloaded. This will instantiate mount and swap units
+                 as necessary.</para>
+ 
++                <para>The <term><varname>passno</varname></term> field
++                is treated like a simlpe boolean, and the ordering information
++                is discarded. However, the root filesystem is checked
++                before all the other filesystems.</para>
++
+                 <para>See
+                 <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                 and
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index a7536f8..77247de 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -209,17 +209,30 @@ static int add_mount(
+                         "Before=%s\n",
+                         post);
+ 
++        if (passno > 0) {
++                _cleanup_free_ char *fsck = NULL;
++
++                fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++                if (!fsck)
++                        return log_oom();
++
++                fprintf(f,
++                        "Requires=%s\n"
++                        "After=%s\n",
++                        fsck,
++                        fsck);
++        }
++
++
+         fprintf(f,
+                 "\n"
+                 "[Mount]\n"
+                 "What=%s\n"
+                 "Where=%s\n"
+-                "Type=%s\n"
+-                "FsckPassNo=%i\n",
++                "Type=%s\n",
+                 what,
+                 where,
+-                type,
+-                passno);
++                type);
+ 
+         if (!isempty(opts) &&
+             !streq(opts, "defaults"))
+diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
+index e229cdc..c12efa8 100644
+--- a/units/systemd-fsck@.service.in
++++ b/units/systemd-fsck@.service.in
+@@ -10,7 +10,7 @@ Description=File System Check on %f
+ Documentation=man:systemd-fsck@.service(8)
+ DefaultDependencies=no
+ BindsTo=%i.device
+-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
++After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service
+ Before=shutdown.target
+ 
+ [Service]
+-- 
+1.8.5.1
+
diff --git a/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch b/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
new file mode 100644
index 000000000000..c1b3aa049798
--- /dev/null
+++ b/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
@@ -0,0 +1,55 @@
+From 4c8bda2442bfc6d84a5deb241dc29efcb81bf3af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:45 +0200
+Subject: [PATCH 3/7] gpt-auto-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun: check for OOM]
+---
+ src/gpt-auto-generator/gpt-auto-generator.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
+index fae4b71..25440e7 100644
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -182,7 +182,7 @@ static int add_swap(const char *path, const char *fstype) {
+ }
+ 
+ static int add_home(const char *path, const char *fstype) {
+-        _cleanup_free_ char *unit = NULL, *lnk = NULL;
++        _cleanup_free_ char *unit = NULL, *lnk = NULL, *fsck = NULL;
+         _cleanup_fclose_ FILE *f = NULL;
+ 
+         if (dir_is_empty("/home") <= 0)
+@@ -200,19 +200,23 @@ static int add_home(const char *path, const char *fstype) {
+                 return -errno;
+         }
+ 
++        fsck = unit_name_from_path_instance("systemd-fsck", path, ".service");
++        if (!fsck)
++                return log_oom();
++
+         fprintf(f,
+                 "# Automatically generated by systemd-gpt-auto-generator\n\n"
+                 "[Unit]\n"
+                 "DefaultDependencies=no\n"
+-                "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n"
++                "Requires=%s\n"
++                "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n"
+                 "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
+                 "Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n"
+                 "[Mount]\n"
+                 "What=%s\n"
+                 "Where=/home\n"
+-                "Type=%s\n"
+-                "FsckPassNo=2\n",
+-                path, fstype);
++                "Type=%s\n",
++                fsck, fsck, path, fstype);
+ 
+         fflush(f);
+         if (ferror(f)) {
+-- 
+1.8.5.1
+
diff --git a/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch b/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
new file mode 100644
index 000000000000..90ff5456fc3c
--- /dev/null
+++ b/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
@@ -0,0 +1,22 @@
+From 4952a9beff339b75641a7a84c226c11d6bd680c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:46 +0200
+Subject: [PATCH 4/7] Remove FsckPassNo from systemd-fsck-root.service
+
+---
+ units/systemd-fsck-root.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
+index 4388314..4162983 100644
+--- a/units/systemd-fsck-root.service.in
++++ b/units/systemd-fsck-root.service.in
+@@ -19,5 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-fsck
+ StandardOutput=journal+console
+-FsckPassNo=1
+ TimeoutSec=0
+-- 
+1.8.5.1
+
diff --git a/0005-mount-service-drop-FsckPassNo-support.patch b/0005-mount-service-drop-FsckPassNo-support.patch
new file mode 100644
index 000000000000..9758c4676f7a
--- /dev/null
+++ b/0005-mount-service-drop-FsckPassNo-support.patch
@@ -0,0 +1,364 @@
+From accdd018ede77ef1c057775396c18c73406cbcb4 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:28:09 +0200
+Subject: [PATCH 5/7] mount/service: drop FsckPassNo support
+
+We now treat passno as boleans in the generators, and don't need this any more. fsck itself
+is able to sequentialize checks on the same local media, so in the common case the ordering
+is redundant.
+
+It is still possible to force an order by using .d fragments, in case that is desired.
+---
+ TODO                                  |  4 ---
+ man/systemd.mount.xml                 | 22 ---------------
+ man/systemd.service.xml               | 27 -------------------
+ src/core/load-fragment-gperf.gperf.m4 |  2 --
+ src/core/load-fragment.c              | 30 ---------------------
+ src/core/load-fragment.h              |  1 -
+ src/core/mount.c                      | 32 +---------------------
+ src/core/mount.h                      |  1 -
+ src/core/service.c                    | 51 -----------------------------------
+ src/core/service.h                    |  2 --
+ 10 files changed, 1 insertion(+), 171 deletions(-)
+
+diff --git a/TODO b/TODO
+index 29a76ef..f0060d9 100644
+--- a/TODO
++++ b/TODO
+@@ -84,8 +84,6 @@ Features:
+ 
+ * ensure scope units may be started only a single time
+ 
+-* document that in instead of FsckPassNo= people should just add a manual dep to systemd-fsck@.service to their mount units.
+-
+ * better error message if you run systemctl without systemd running
+ 
+ * systemctl status output should should include list of triggering units and their status
+@@ -562,8 +560,6 @@ Features:
+ 
+ * when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr
+ 
+-* move passno parsing to fstab generator
+-
+ * automount: implement expire:
+    - set superblock timeout AUTOFS_DEV_IOCTL_TIMEOUT_CMD
+    - periodically run AUTOFS_DEV_IOCTL_EXPIRE_CMD
+diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
+index 48af1ca..217289a 100644
+--- a/man/systemd.mount.xml
++++ b/man/systemd.mount.xml
+@@ -273,28 +273,6 @@
+         </refsect1>
+ 
+         <refsect1>
+-                <title>Compatibility Options</title>
+-
+-                <para>The following option is also available in the
+-                <literal>[Mount]</literal> section, but exists purely
+-                for compatibility reasons and should not be used in
+-                newly written mount files.</para>
+-
+-                <variablelist class='unit-directives'>
+-                        <varlistentry>
+-                                <term><varname>FsckPassNo=</varname></term>
+-
+-                                <listitem><para>The pass number for
+-                                the file system checking service for
+-                                this mount. See
+-                                <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+-                                for more information on this setting.
+-                                </para></listitem>
+-                        </varlistentry>
+-                </variablelist>
+-        </refsect1>
+-
+-        <refsect1>
+                   <title>See Also</title>
+                   <para>
+                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+diff --git a/man/systemd.service.xml b/man/systemd.service.xml
+index 81a4078..b1e3af2 100644
+--- a/man/systemd.service.xml
++++ b/man/systemd.service.xml
+@@ -970,33 +970,6 @@
+                                 range 0-99.</para></listitem>
+                         </varlistentry>
+ 
+-                        <varlistentry>
+-                                <term><varname>FsckPassNo=</varname></term>
+-                                <listitem><para>Set the fsck passno
+-                                priority to use to order this service
+-                                in relation to other file system
+-                                checking services. This option is only
+-                                necessary to fix ordering in relation
+-                                to fsck jobs automatically created for
+-                                all <filename>/etc/fstab</filename>
+-                                entries with a value in the fs_passno
+-                                column > 0. As such it should only be
+-                                used as option for fsck
+-                                services. Almost always it is a better
+-                                choice to add explicit ordering
+-                                directives via
+-                                <varname>After=</varname> or
+-                                <varname>Before=</varname>,
+-                                instead. For more details see
+-                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
+-                                used, pass an integer value in the
+-                                same range as
+-                                <filename>/etc/fstab</filename>'s
+-                                fs_passno column. See
+-                                <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+-                                for details.</para></listitem>
+-                        </varlistentry>
+-
+                 </variablelist>
+         </refsect1>
+ 
+diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
+index 31fb7bc..e3025d2 100644
+--- a/src/core/load-fragment-gperf.gperf.m4
++++ b/src/core/load-fragment-gperf.gperf.m4
+@@ -173,7 +173,6 @@ Service.NonBlocking,             config_parse_bool,                  0,
+ Service.BusName,                 config_parse_unit_string_printf,    0,                             offsetof(Service, bus_name)
+ Service.NotifyAccess,            config_parse_notify_access,         0,                             offsetof(Service, notify_access)
+ Service.Sockets,                 config_parse_service_sockets,       0,                             0
+-Service.FsckPassNo,              config_parse_fsck_passno,           0,                             offsetof(Service, fsck_passno)
+ EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+@@ -225,7 +224,6 @@ Mount.What,                      config_parse_string,                0,
+ Mount.Where,                     config_parse_path,                  0,                             offsetof(Mount, where)
+ Mount.Options,                   config_parse_string,                0,                             offsetof(Mount, parameters_fragment.options)
+ Mount.Type,                      config_parse_string,                0,                             offsetof(Mount, parameters_fragment.fstype)
+-Mount.FsckPassNo,                config_parse_fsck_passno,           0,                             offsetof(Mount, parameters_fragment.passno)
+ Mount.TimeoutSec,                config_parse_sec,                   0,                             offsetof(Mount, timeout_usec)
+ Mount.DirectoryMode,             config_parse_mode,                  0,                             offsetof(Mount, directory_mode)
+ EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
+diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
+index fb7efca..4067930 100644
+--- a/src/core/load-fragment.c
++++ b/src/core/load-fragment.c
+@@ -1033,35 +1033,6 @@ int config_parse_sysv_priority(const char *unit,
+ }
+ #endif
+ 
+-int config_parse_fsck_passno(const char *unit,
+-                             const char *filename,
+-                             unsigned line,
+-                             const char *section,
+-                             const char *lvalue,
+-                             int ltype,
+-                             const char *rvalue,
+-                             void *data,
+-                             void *userdata) {
+-
+-        int *passno = data;
+-        int i, r;
+-
+-        assert(filename);
+-        assert(lvalue);
+-        assert(rvalue);
+-        assert(data);
+-
+-        r = safe_atoi(rvalue, &i);
+-        if (r || i < 0) {
+-                log_syntax(unit, LOG_ERR, filename, line, -r,
+-                           "Failed to parse fsck pass number, ignoring: %s", rvalue);
+-                return 0;
+-        }
+-
+-        *passno = (int) i;
+-        return 0;
+-}
+-
+ DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+ 
+ int config_parse_kill_signal(const char *unit,
+@@ -2708,7 +2679,6 @@ void unit_dump_config_items(FILE *f) {
+                 { config_parse_start_limit_action,    "ACTION" },
+                 { config_parse_set_status,            "STATUS" },
+                 { config_parse_service_sockets,       "SOCKETS" },
+-                { config_parse_fsck_passno,           "PASSNO" },
+                 { config_parse_environ,               "ENVIRON" },
+                 { config_parse_syscall_filter,        "SYSCALL" },
+                 { config_parse_cpu_shares,            "SHARES" },
+diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
+index 90e5e3a..404df76 100644
+--- a/src/core/load-fragment.h
++++ b/src/core/load-fragment.h
+@@ -56,7 +56,6 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign
+ int config_parse_bounding_set(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_limit(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_sysv_priority(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+-int config_parse_fsck_passno(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_timer(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 70cd372..88563b3 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) {
+         if (r < 0)
+                 return r;
+ 
+-        if (p->passno > 0 &&
+-            UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
+-                char *name;
+-                Unit *fsck;
+-                /* Let's add in the fsck service */
+-
+-                /* aka SPECIAL_FSCK_SERVICE */
+-                name = unit_name_from_path_instance("systemd-fsck", p->what, ".service");
+-                if (!name)
+-                        return -ENOMEM;
+-
+-                r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck);
+-                if (r < 0) {
+-                        log_warning_unit(name,
+-                                         "Failed to prepare unit %s: %s", name, strerror(-r));
+-                        free(name);
+-                        return r;
+-                }
+-                free(name);
+-
+-                SERVICE(fsck)->fsck_passno = p->passno;
+-
+-                r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true);
+-                if (r < 0)
+-                        return r;
+-        }
+-
+         return 0;
+ }
+ 
+@@ -1410,7 +1383,6 @@ static int mount_add_one(
+                 const char *where,
+                 const char *options,
+                 const char *fstype,
+-                int passno,
+                 bool set_flags) {
+         int r;
+         Unit *u;
+@@ -1530,8 +1502,6 @@ static int mount_add_one(
+         free(p->fstype);
+         p->fstype = f;
+ 
+-        p->passno = passno;
+-
+         if (load_extras) {
+                 r = mount_add_extras(MOUNT(u));
+                 if (r < 0)
+@@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+                 if (!d || !p)
+                         return log_oom();
+ 
+-                k = mount_add_one(m, d, p, o, fstype, 0, set_flags);
++                k = mount_add_one(m, d, p, o, fstype, set_flags);
+                 if (k < 0)
+                         r = k;
+         }
+diff --git a/src/core/mount.h b/src/core/mount.h
+index 7cd4320..a955069 100644
+--- a/src/core/mount.h
++++ b/src/core/mount.h
+@@ -58,7 +58,6 @@ typedef struct MountParameters {
+         char *what;
+         char *options;
+         char *fstype;
+-        int passno;
+ } MountParameters;
+ 
+ typedef enum MountResult {
+diff --git a/src/core/service.c b/src/core/service.c
+index 96ed2d3..ce75757 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1056,48 +1056,6 @@ static int service_load_sysv(Service *s) {
+ }
+ #endif
+ 
+-static int fsck_fix_order(Service *s) {
+-        Unit *other;
+-        int r;
+-
+-        assert(s);
+-
+-        if (s->fsck_passno <= 0)
+-                return 0;
+-
+-        /* For each pair of services where both have an fsck priority
+-         * we order things based on it. */
+-
+-        LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) {
+-                Service *t;
+-                UnitDependency d;
+-
+-                t = SERVICE(other);
+-
+-                if (s == t)
+-                        continue;
+-
+-                if (UNIT(t)->load_state != UNIT_LOADED)
+-                        continue;
+-
+-                if (t->fsck_passno <= 0)
+-                        continue;
+-
+-                if (t->fsck_passno < s->fsck_passno)
+-                        d = UNIT_AFTER;
+-                else if (t->fsck_passno > s->fsck_passno)
+-                        d = UNIT_BEFORE;
+-                else
+-                        continue;
+-
+-                r = unit_add_dependency(UNIT(s), d, UNIT(t), true);
+-                if (r < 0)
+-                        return r;
+-        }
+-
+-        return 0;
+-}
+-
+ static int service_verify(Service *s) {
+         assert(s);
+ 
+@@ -1254,10 +1212,6 @@ static int service_load(Unit *u) {
+                         return r;
+ #endif
+ 
+-                r = fsck_fix_order(s);
+-                if (r < 0)
+-                        return r;
+-
+                 if (s->bus_name)
+                         if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
+                                 return r;
+@@ -1381,11 +1335,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
+                         prefix, s->sysv_runlevels);
+ #endif
+ 
+-        if (s->fsck_passno > 0)
+-                fprintf(f,
+-                        "%sFsckPassNo: %i\n",
+-                        prefix, s->fsck_passno);
+-
+         if (s->status_text)
+                 fprintf(f, "%sStatus Text: %s\n",
+                         prefix, s->status_text);
+diff --git a/src/core/service.h b/src/core/service.h
+index ce5b5e0..37fa6ff 100644
+--- a/src/core/service.h
++++ b/src/core/service.h
+@@ -157,8 +157,6 @@ struct Service {
+         pid_t main_pid, control_pid;
+         int socket_fd;
+ 
+-        int fsck_passno;
+-
+         bool permissions_start_only;
+         bool root_directory_start_only;
+         bool remain_after_exit;
+-- 
+1.8.5.1
+
diff --git a/0006-efi-boot-generator-hookup-to-fsck.patch b/0006-efi-boot-generator-hookup-to-fsck.patch
new file mode 100644
index 000000000000..3830ecfcfa78
--- /dev/null
+++ b/0006-efi-boot-generator-hookup-to-fsck.patch
@@ -0,0 +1,81 @@
+From d09ee17da21b7ca2259067ac4e54f8a1cc3c0fc0 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:32:21 +0200
+Subject: [PATCH 6/7] efi-boot-generator: hookup to fsck
+
+---
+ TODO                                        |  1 -
+ src/efi-boot-generator/efi-boot-generator.c | 26 ++++++++++++++++++++++----
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/TODO b/TODO
+index f0060d9..814d82d 100644
+--- a/TODO
++++ b/TODO
+@@ -308,7 +308,6 @@ Features:
+ * introduce ExecCondition= in services
+ 
+ * EFI:
+-  - fsck hookup for the ESP mount is missing
+   - write man page for efi boot generator
+   - honor language efi variables for default language selection (if there are any?)
+   - honor timezone efi variables for default timezone selection (if there are any?)
+diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
+index 05b95ed..e20d325 100644
+--- a/src/efi-boot-generator/efi-boot-generator.c
++++ b/src/efi-boot-generator/efi-boot-generator.c
+@@ -26,13 +26,14 @@
+ #include "path-util.h"
+ #include "util.h"
+ #include "mkdir.h"
++#include "unit-name.h"
+ 
+ static const char *arg_dest = "/tmp";
+ 
+ int main(int argc, char *argv[]) {
+         int r = EXIT_SUCCESS;
+         sd_id128_t id;
+-        _cleanup_free_ char *name = NULL;
++        _cleanup_free_ char *name = NULL, *what = NULL, *fsck = NULL;
+         _cleanup_fclose_ FILE *f = NULL;
+ 
+         if (argc > 1 && argc != 4) {
+@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) {
+                 return EXIT_FAILURE;
+         }
+ 
++        r = asprintf(&what,
++                     "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
++                     SD_ID128_FORMAT_VAL(id));
++        if (r < 0) {
++                log_oom();
++                return EXIT_FAILURE;
++        }
++
++        fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++        if (!fsck) {
++                log_oom();
++                return EXIT_FAILURE;
++        }
++
+         fprintf(f,
+                 "# Automatially generated by systemd-efi-boot-generator\n\n"
+                 "[Unit]\n"
+-                "Description=EFI System Partition\n\n"
++                "Description=EFI System Partition\n"
++                "Requires=%s\n"
++                "After=%s\n"
++                "\n"
+                 "[Mount]\n"
+                 "Where=/boot\n"
+-                "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
++                "What=%s\n"
+                 "Options=umask=0077\n",
+-                SD_ID128_FORMAT_VAL(id));
++                fsck, fsck, what);
+ 
+         free(name);
+         name = strjoin(arg_dest, "/boot.automount", NULL);
+-- 
+1.8.5.1
+
diff --git a/0007-fsck-root-only-run-when-requested-in-fstab.patch b/0007-fsck-root-only-run-when-requested-in-fstab.patch
new file mode 100644
index 000000000000..112b5b59ada6
--- /dev/null
+++ b/0007-fsck-root-only-run-when-requested-in-fstab.patch
@@ -0,0 +1,95 @@
+From a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 19 Oct 2013 11:38:42 +0200
+Subject: [PATCH 7/7] fsck-root: only run when requested in fstab
+
+fsck-root is redundant in case an initrd is used, or in case the rootfs
+is never remounted 'rw', so the new default is the correct behavior for
+most users. For the rest, they should enable it in fstab.
+---
+ Makefile.am                           |  1 -
+ man/systemd-fsck@.service.xml         |  4 +++-
+ src/fstab-generator/fstab-generator.c | 31 ++++++++++++++++++++++---------
+ 3 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ca01179..a29a32a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4447,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \
+ 	systemd-update-utmp.service
+ LOCAL_FS_TARGET_WANTS += \
+ 	systemd-remount-fs.service \
+-	systemd-fsck-root.service \
+ 	tmp.mount
+ MULTI_USER_TARGET_WANTS += \
+ 	getty.target \
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index 17bd1c0..811392b 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -63,7 +63,9 @@
+                 check. <filename>systemd-fsck-root.service</filename> is
+                 responsible for file system checks on the root
+                 file system. The root file system check is performed
+-                before the other file systems.</para>
++                before the other file systems. Either service is enabled
++                at boot if passno in <filename>/etc/fstab</filename> for
++                the filesystem is set to a value greater than zero.</para>
+ 
+                 <para><filename>systemd-fsck</filename> will
+                 forward file system checking progress to the
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 77247de..78d7609 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,17 +210,29 @@ static int add_mount(
+                         post);
+ 
+         if (passno > 0) {
+-                _cleanup_free_ char *fsck = NULL;
++                if (streq(where, "/")) {
++                        lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
++                        if (!lnk)
++                                return log_oom();
+ 
+-                fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
+-                if (!fsck)
+-                        return log_oom();
++                        mkdir_parents_label(lnk, 0755);
++                        if (symlink("systemd-fsck-root.service", lnk) < 0) {
++                                log_error("Failed to create symlink %s: %m", lnk);
++                                return -errno;
++                        }
++                } else {
++                        _cleanup_free_ char *fsck = NULL;
+ 
+-                fprintf(f,
+-                        "Requires=%s\n"
+-                        "After=%s\n",
+-                        fsck,
+-                        fsck);
++                        fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++                        if (!fsck)
++                                return log_oom();
++
++                        fprintf(f,
++                                "Requires=%s\n"
++                                "After=%s\n",
++                                fsck,
++                                fsck);
++                }
+         }
+ 
+ 
+@@ -248,6 +260,7 @@ static int add_mount(
+ 
+         if (!noauto) {
+                 if (post) {
++                        free(lnk);
+                         lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+                         if (!lnk)
+                                 return log_oom();
+-- 
+1.8.5.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 1d2994000791..015ec01b5c16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,83 @@
 # SELinux Maintainer: Timothée Ravier <tim@siosm.fr>
 # SELinux Contributor: Nicky726 <Nicky726@gmail.com>
 
-pkgname=('systemd-selinux')
-true && pkgname=('systemd-selinux' 'systemd-sysvcompat-selinux')
+pkgbase=systemd-selinux
+pkgname=('systemd-selinux' 'systemd-sysvcompat-selinux')
 pkgver=208
-pkgrel=2
+pkgrel=10
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl'
-             'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod'
-             'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
-             'linux-api-headers' 'python' 'quota-tools' 'xz' 'pam-selinux'
+makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
+             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt'
+             'linux-api-headers' 'pam-selinux' 'python' 'quota-tools' 'xz'
              'libselinux')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/${pkgname/-selinux}/${pkgname/-selinux}-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
+        '0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch'
+        '0001-Make-hibernation-test-work-for-swap-files.patch'
         '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
         '0001-mount-check-for-NULL-before-reading-pm-what.patch'
-        '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch')
+        '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
+        '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch'
+        '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch'
+        '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch'
+        '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch'
+        '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
+        '0005-mount-service-drop-FsckPassNo-support.patch'
+        '0006-efi-boot-generator-hookup-to-fsck.patch'
+        '0007-fsck-root-only-run-when-requested-in-fstab.patch'
+        '0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch'
+        '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch')
 md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
+         '8f1182afa1156f0076a912b23e761e02'
+         'a5c6564d5435ee99814effd2aa9baf93'
          '1b191c4e7a209d322675fd199e3abc66'
          'a693bef63548163ffc165f4c4801ebf7'
-         'ccafe716d87df9c42af0d1960b5a4105')
+         'ccafe716d87df9c42af0d1960b5a4105'
+         '441e3d464ee6af5fe4af6a8bc10d7980'
+         '718d841203cf2ea9e24a7d0f1d19d48b'
+         '623c77bad0d2968e44963d72924825f1'
+         'e52fc8368853c7800ab03ab8868cfd41'
+         '2096f33bd36dfa0a7f0431d0a429787a'
+         'd2481a6ea199b581e243a950125b0ca6'
+         'c2aee634a3a6c50778968f0d5c756f40'
+         'ef8b8212d504bb73c10bf4e85f0703b2'
+         '4ba2317bf4d7708fca406f49482b1bf3'
+         '078f10d6fc315b329844cd20fa742eee')
 
 prepare() {
   cd "${pkgname/-selinux}-$pkgver"
   patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
   patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
   patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+  # Fix lingering user managers
+  patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+  # Backport changes in fstab passno handling
+  # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches,
+  # and it doesn't hurt to backport them all.
+  patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
+  patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
+  patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
+  patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
+  patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
+  patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
+  patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
+  # Fix FS#38210 (result of the previous backport)
+  patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
+  # Fix FS#38123
+  patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
+  # Fix FS#35671
+  patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
+  # Fix FS#38403
+  patch -Np1 <"$srcdir"/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
+
+  autoreconf
 }
 
 build() {
@@ -93,8 +138,6 @@ package_systemd-selinux() {
 
   make -C "${pkgname/-selinux}-$pkgver" DESTDIR="$pkgdir" install
 
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
@@ -124,6 +167,9 @@ package_systemd-selinux() {
   chown root:systemd-journal "$pkgdir/var/log/journal"
   chmod 2755 "$pkgdir/var/log/journal"
 
+  # fix pam file
+  sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
+
   ### split out manpages for sysvcompat
   rm -rf "$srcdir/_sysvcompat"
   install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
@@ -140,8 +186,9 @@ package_systemd-sysvcompat-selinux() {
   license=('GPL2')
   groups=('selinux')
   conflicts=('sysvinit' 'systemd-sysvcompat' 'selinux-systemd-sysvcompat')
-  provides=("${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}")
-  depends=('sysvinit-tools' 'systemd-selinux')
+  provides=("${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}"
+            "selinux-${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}")
+  depends=('systemd-selinux')
 
   mv "$srcdir/_sysvcompat"/* "$pkgdir"
 
@@ -153,4 +200,11 @@ package_systemd-sysvcompat-selinux() {
   ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
 }
 
+workaround_for_the_aur_webinterface='
+pkgname="systemd-selinux"
+pkgdesc="System and service manager"
+depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap'
+         'libgcrypt' 'pam-selinux' 'util-linux-selinux' 'xz' 'libselinux')
+'
+
 # vim: ft=sh syn=sh et