Merge branch 'kernel-3.9'

diff --git a/pixman/pixman.nm b/pixman/pixman.nm
index 573d3438d0d06dedb2871d70509f83d42faed94e..dceebf189a553eb5f9dfdfd458a02ac9991ac149 100644 (file)
--- a/pixman/pixman.nm
+++ b/pixman/pixman.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pixman
-version    = 0.25.6
+version    = 0.30.0
 release    = 1
 
 groups     = System/Libraries
@@ -26,7 +26,9 @@ build
        end
 
        configure_options += \
-               --disable-arm-iwmmxt
+               --disable-arm-iwmmxt \
+               --disable-arm-iwmmxt2 \
+               --disable-static
 end
 
 packages

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
new file mode 100644 (file)
index 0000000..55dfe86
--- /dev/null
+++ b/systemd/patches/0001-Make-systemctl-is-enabled-work-for-templated-units.patch
@@ -0,0 +1,72 @@
+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 9c1ca212ccf7f8e805e340135d01d3b8b3c7698b..cc9c0562c20d2101d901ed800678837687d9d2da 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 201
-release    = 1
+version    = 204
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base