systemd: Update to 201.

[people/ms/ipfire-3.x.git] / systemd / systemd.nm

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 028646c9eba3c1a60f7ef2fac0388050a55ab255..9c1ca212ccf7f8e805e340135d01d3b8b3c7698b 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = systemd
-version    = 185
+version    = 201
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -24,6 +24,7 @@ build
        unitdir = %{prefix}/lib/systemd/system
 
        requires
+               attr-devel
                audit-devel
                automake
                autoconf
@@ -41,8 +42,10 @@ build
                libacl-devel
                libblkid-devel
                libcap-devel
+               libgcrypt-devel
                libselinux-devel
                libtool
+               libuuid-devel
                pam-devel
                pciutils-devel
                usbutils
@@ -51,18 +54,19 @@ build
        end
 
        configure_options += \
-               --with-distro=ipfire \
+               --with-sysvinit-path= \
+               --with-sysvrcnd-path= \
+               --enable-introspection=yes \
                --disable-static
 
        prepare_cmds
                ./autogen.sh ac
        end
 
-       test
-               make check
-       end
-
        install_cmds
+               # Create folder in log to store the journal.
+               mkdir -pv %{BUILDROOT}/var/log/journal
+
                # Create sysv compatible symlinks.
                mkdir -pv %{BUILDROOT}%{sbindir}
                ln -svf ../lib/systemd/systemd  %{BUILDROOT}/%{sbindir}/init
@@ -99,15 +103,28 @@ build
 
                # Replace absolute symlinks by relative ones.
                cd %{BUILDROOT}%{unitdir}/../user
-               for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do
+               for i in bluetooth local-fs paths printer remote-fs shutdown smartcard sockets sound swap timers; do
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
-               # Remove unneeded symlink for xdg
-               rm -rfv %{BUILDROOT}/etc/xdg/systemd
+               # Remove unneeded stuff for xdg
+               rm -rfv %{BUILDROOT}/etc/xdg
+
+               # Remove unneeded stuff for rpm.
+               rm -rvf %{BUILDROOT}/etc/rpm
+
+               # Use journald. Enable the import of kernel messages.
+               # Stop forwarding to a syslog daemon.
+               sed \
+                       -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
+                       -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
+                       -i %{BUILDROOT}/etc/systemd/journald.conf
+
+               # Install legacy tmpfile to autocreate /run/lock on startup.
+               install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
        end
 end
 
@@ -122,6 +139,7 @@ packages
                        hwdata
                        python-cairo
                        python-dbus
+                       python-gobject3
                        %{name}-units=%{thisver}
                        util-linux>=2.19
                end
@@ -134,12 +152,15 @@ packages
                        /sbin/reboot
                        /sbin/shutdown
 
+                       syslog
                        udev = %{thisver}
                end
 
                conflicts
+                       bash-completion < 2.1
                        dracut < 019
                        filesystem < 002
+                       rsyslog < 5.8.6-4
                        upstart
                end
 
@@ -199,6 +220,12 @@ packages
                        # Restart login service after update
                        /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+
+                       # Use the new journald configuration file and restart the service.
+                       if ! grep -xq ImportKernel=yes /etc/systemd/journald.conf ; then
+                               mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf
+                               /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || :
+                       fi
                end
 
                # Be sure to start the new udev after everything is done.
@@ -244,6 +271,10 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       end
+
        package %{name}-devel
                template DEVEL
 
@@ -263,7 +294,7 @@ packages
                end
 
                files
-                       %{libdir}/libgudev*.so.*
+                       %{libdir}/lib*udev*.so.*
                        %{libidr}/girepository*/
                end
        end
@@ -281,8 +312,10 @@ packages
                end
 
                files
-                       %{libdir}/libgudev*.so
+                       %{libdir}/lib*udev*.so
+                       %{libdir}/pkgconfig/lib*udev.pc
                        %{libdir}/pkgconfig/gudev*
+                       %{includedir}/lib*udev.h
                        %{includedir}/gudev*
                        %{datadir}/gir-*
                        %{datadir}/gtk-doc/html/gudev