- partial update to 217 (kernel 3.7+ now required)

diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index c891c16a1c54180683058f46f3e284a83b84d288..27642566bce95edc6498920d60b72ac309d2ad18 100644 (file)
--- a/systemd-configfs.patch
+++ b/systemd-configfs.patch
@@ -20,11 +20,12 @@ diff -durN -x '*.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.am
 diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-208/units/sys-kernel-config.mount
 --- systemd-208.orig/units/sys-kernel-config.mount     2013-08-13 22:02:52.000000000 +0200
 +++ systemd-208/units/sys-kernel-config.mount  2014-01-10 10:22:04.000000000 +0100
-@@ -10,8 +10,8 @@
+@@ -10,9 +10,9 @@ Description=Configuration File System
  Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
  Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
 -ConditionPathExists=/sys/kernel/config
+ ConditionCapability=CAP_SYS_RAWIO
 -After=systemd-modules-load.service
 +Wants=sys-kernel-config.service
 +After=systemd-modules-load.service sys-kernel-config.service

diff --git a/systemd.spec b/systemd.spec
index 2a2efaee0b2a73737e8b35cf4235d2bbf086acbf..891f5f9cb2237979c281d3385259cd5800e6473c 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,13 +20,13 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       215
-Release:       0.5
+Version:       217
+Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: d2603e9fffd8b18d242543e36f2e7d31
+# Source0-md5: e68dbff3cc19f66e341572d9fb2ffa89
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -95,6 +95,7 @@ BuildRequires:        libseccomp-devel >= 1.0.0
 BuildRequires: libtool >= 2:2.2
 %{?with_tcpd:BuildRequires:    libwrap-devel}
 BuildRequires: libxslt-progs
+BuildRequires: lz4-devel
 BuildRequires: m4
 %{?with_pam:BuildRequires:     pam-devel}
 BuildRequires: pkgconfig >= 0.9.0
@@ -132,9 +133,9 @@ Requires:   rc-scripts >= 0.4.5.3-7
 Requires:      setup >= 2.8.0-2
 Requires:      udev-core = %{epoch}:%{version}-%{release}
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
-Requires:      uname(release) >= 3.0
+Requires:      uname(release) >= 3.7
 Suggests:      ConsoleKit
-Suggests:      fsck >= 2.20
+Suggests:      fsck >= 2.25.0
 Suggests:      service(klogd)
 Suggests:      service(syslog)
 Provides:      group(systemd-journal)
@@ -176,6 +177,7 @@ Conflicts:  cups < 1:1.5.0-10
 Conflicts:     dovecot < 1:2.0.16-3
 Conflicts:     dspam < 3.9.0-6
 Conflicts:     fail2ban < 0.8.4-4
+Conflicts:     fsck < 2.25.0
 Conflicts:     gammu-smsd < 1:1.31.0-3
 # Break gdm2.20 installs
 #Conflicts:    gdm < 2:3.2.1.1-9
@@ -478,7 +480,7 @@ Requires:   libblkid >= 2.20
 Requires:      setup >= 2.6.1-1
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= 2.6.32
-#Suggests:     uname(release) >= 3.0
+#Suggests:     uname(release) >= 3.7
 Obsoletes:     udev-compat
 Obsoletes:     udev-initrd < %{epoch}:%{version}-%{release}}
 Conflicts:     geninitrd < 12639
@@ -654,6 +656,7 @@ cp -p %{SOURCE2} src/systemd_booted.c
        --enable-gtk-doc \
        --enable-introspection \
        --enable-split-usr \
+       --enable-lz4 \
        --with-html-dir=%{_gtkdocdir} \
        --with-kbd-loadkeys=/usr/bin/loadkeys \
        --with-kbd-setfont=/bin/setfont \
@@ -1107,7 +1110,6 @@ fi
 %lang(fr) %{_libexecdir}/systemd/catalog/systemd.fr.catalog
 %lang(it) %{_libexecdir}/systemd/catalog/systemd.it.catalog
 %lang(ru) %{_libexecdir}/systemd/catalog/systemd.ru.catalog
-%dir %{_libexecdir}/systemd/ntp-units.d
 %{_libexecdir}/systemd/ntp-units.d/90-systemd.list
 %dir %{_libexecdir}/sysusers.d
 %{_libexecdir}/sysusers.d/basic.conf
@@ -1284,6 +1286,7 @@ fi
 %dir %{_libexecdir}/sysctl.d
 %{_libexecdir}/sysctl.d/50-default.conf
 %dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/ntp-units.d
 %dir %{_libexecdir}/systemd/system-shutdown
 %dir %{_libexecdir}/systemd/system-sleep
 %dir %{_libexecdir}/systemd/user

diff --git a/target-pld.patch b/target-pld.patch
index d303538f2873c2c49eeb451ccb12637e67eb4e03..fbaa208f3d9cae41f565c315fe199fd53cc39e10 100644 (file)
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -184,21 +184,21 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-
 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
 --- systemd-208.orig/src/vconsole/vconsole-setup.c     2013-08-13 22:02:47.000000000 +0200
 +++ systemd-208/src/vconsole/vconsole-setup.c  2014-01-09 15:17:49.000000000 +0100
-@@ -296,6 +296,17 @@
-                         font_copy_to_all_vcs(fd);
-         }
+@@ -284,6 +284,17 @@ int main(int argc, char **argv) {
+         if (r < 0 && r != -ENOENT)
+                 log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
  
 +        if (r <= 0) {
-+              int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
-+                                   "CONSOLEFONT", &vc_font,
-+                                   "CONSOLEMAP", &vc_font_map,
-+                                   "CONSOLESCREENFONTMAP", &vc_font_unimap,
-+                                   "KEYTABLE", &vc_keymap,
-+                                   NULL);
++                int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
++                                "CONSOLEFONT", &vc_font,
++                                "CONSOLEMAP", &vc_font_map,
++                                "CONSOLESCREENFONTMAP", &vc_font_unimap,
++                                "KEYTABLE", &vc_keymap,
++                                NULL);
 +                if (r1 < 0 && r1 != -ENOENT)
 +                        log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
-+        }
++        } 
 +
-         free(vc_keymap);
-         free(vc_font);
-         free(vc_font_map);
+         /* Let the kernel command line override /etc/vconsole.conf */
+         if (detect_container(NULL) <= 0) {
+                 r = parse_env_file("/proc/cmdline", WHITESPACE,