From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 6 Sep 2014 13:19:37 +0000 (+0200)
Subject: systemd: Update to 215.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e97512ab58ee56e0ff712a06893b612f3260329;p=people%2Fms%2Fipfire-3.x.git

systemd: Update to 215.
---

diff --git a/systemd/patches/0001-Make-systemctl-is-enabled-work-for-templated-units.patch b/systemd/patches/0001-Make-systemctl-is-enabled-work-for-templated-units.patch
deleted file mode 100644
index 55dfe86a8..000000000
--- a/systemd/patches/0001-Make-systemctl-is-enabled-work-for-templated-units.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 67820a0cbdc9d72a1074debf8b2bc72203c775cc Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sun, 19 May 2013 13:45:48 +0000
-Subject: systemctl: make systemctl is-enabled work for templated units
-
-Patch resolves the problem that 'systemctl is-enabled' does
-not work for templated units.
-
-Without this patch, systemctl is-enabled something@abc.service
-returned "No such file or directory", because it first checked
-if /usr/lib/systemd/system/something@abc.service, etc. exists.
-If systemctl is-enabled is called for templated units, this
-check should be omitted and it should search for symlinks in
-the .wants dirs right away.
-
-This patch fixes the broken behaviour and resolves
-  https://bugs.freedesktop.org/show_bug.cgi?id=55318.
-
-[zj: fixed the patch to still check for broken symlinks and
-     masked instances. Also removed untrue assumptions from
-     the patch description.]
----
-diff --git a/src/shared/install.c b/src/shared/install.c
-index edf4d2a..8f27c6d 100644
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -1609,24 +1609,29 @@ UnitFileState unit_file_get_state(
-                 if (!path)
-                         return -ENOMEM;
- 
-+                /*
-+                 * Search for a unit file in our default paths, to
-+                 * be sure, that there are no broken symlinks.
-+                 */
-                 if (lstat(path, &st) < 0) {
-                         r = -errno;
--                        if (errno == ENOENT)
--                                continue;
--
--                        return -errno;
--                }
-+                        if (errno != ENOENT)
-+                                return r;
- 
--                if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
--                        return -ENOENT;
-+                        if (!unit_name_is_instance(name))
-+                                continue;
-+                } else {
-+                        if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
-+                                return -ENOENT;
- 
--                r = null_or_empty_path(path);
--                if (r < 0 && r != -ENOENT)
--                        return r;
--                else if (r > 0) {
--                        state = path_startswith(*i, "/run") ?
--                                UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
--                        return state;
-+                        r = null_or_empty_path(path);
-+                        if (r < 0 && r != -ENOENT)
-+                                return r;
-+                        else if (r > 0) {
-+                                state = path_startswith(*i, "/run") ?
-+                                        UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
-+                                return state;
-+                        }
-                 }
- 
-                 r = find_symlinks_in_scope(scope, root_dir, name, &state);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 1c6cb2623..3ed1b5b97 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 204
-release    = 5
+version    = 215
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -38,7 +38,7 @@ build
 		gperf
 		hwdata
 		intltool
-		kmod-devel >= 5
+		kmod-devel >= 15
 		libacl-devel
 		libblkid-devel
 		libcap-devel
@@ -57,6 +57,10 @@ build
 		--with-sysvinit-path= \
 		--with-sysvrcnd-path= \
 		--enable-introspection=yes \
+		--disable-networkd \
+		--disable-resolvd \
+		--disable-sysusers \
+		--disable-timesyncd \
 		--disable-static
 
 	prepare_cmds