From c62f5f68ce0afc43ae5ff1758fd4f94ddb17dd1d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Feb 2012 06:37:49 +0100
Subject: [PATCH] systemd: update to 40.

---
 .../0001-mount-fix-automount-regression.patch | 44 -------------------
 srcpkgs/systemd/template                      |  5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/systemd/patches/0001-mount-fix-automount-regression.patch

diff --git a/srcpkgs/systemd/patches/0001-mount-fix-automount-regression.patch b/srcpkgs/systemd/patches/0001-mount-fix-automount-regression.patch
deleted file mode 100644
index c94ce314dea..00000000000
--- a/srcpkgs/systemd/patches/0001-mount-fix-automount-regression.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Thu, 26 Jan 2012 01:19:19 +0100
-Subject: [PATCH] mount: fix automount regression
-
-Tom Gundersen noticed a regression where comment=systemd.automount in
-fstab no longer prevented the adding of the After=foo.mount dependency
-into local-fs.target. He bisected it to commit 9ddc4a26.
-
-It turns out that clearing the default_dependencies flag is necessary
-after all, in order to avoid complementing of Wants= with After= in the
-target unit. We still want to add the dependencies on quota units and
-umount.target though.
----
- src/mount.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/mount.c b/src/mount.c
-index 6d0af4e..965f705 100644
---- src/mount.c
-+++ src/mount.c
-@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
-
-                 if (UNIT(m)->fragment_path)
-                         m->from_fragment = true;
-+                else if (m->from_etc_fstab)
-+                        /* We always add several default dependencies to fstab mounts,
-+                         * but we do not want the implicit complementing of Wants= with After=
-+                         * in the target unit that this mount unit will be hooked into. */
-+                        UNIT(m)->default_dependencies = false;
-
-                 if (!m->where)
-                         if (!(m->where = unit_name_to_path(u->id)))
-@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
-                 if ((r = mount_add_fstab_links(m)) < 0)
-                         return r;
-
--                if (UNIT(m)->default_dependencies)
-+                if (UNIT(m)->default_dependencies || m->from_etc_fstab)
-                         if ((r = mount_add_default_dependencies(m)) < 0)
-                                 return r;
-
---
-1.7.8.4
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 0f42a41d356..6e2bc067d48 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,6 @@
 # Template file for 'systemd'
 pkgname=systemd
-version=39
-revision=1
+version=40
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-distro=other --with-rootprefix=
@@ -11,7 +10,7 @@ short_desc="systemd is a system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
 license="GPL-2"
-checksum=cd053f97ab0ed4261ec44f247ec582566319339f523dbe79b79c68cfe5ad677f
+checksum=5f0c04e45e593c0903698f3ab3eb3e565d68de26a91858c470675a090a05cab5
 long_desc="
  systemd is a system and service manager for Linux, compatible with SysV and LSB
  init scripts. systemd provides aggressive parallelization capabilities, uses