systemd: Update to 231.

This is an major update to the latest stable version of systemd.

* Enable testsuite during buildtime.
* Dropp support for SELinux.

Fixes #10962.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch
new file mode 100644 (file)
index 0000000..cd4bbe9
--- /dev/null
+++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch
@@ -0,0 +1,58 @@
+diff -Nur a/Makefile.am b/Makefile.am
+--- a/Makefile.am      2016-07-25 21:49:47.000000000 +0200
++++ b/Makefile.am      2016-09-23 08:34:47.924257243 +0200
+@@ -1480,9 +1480,7 @@
+       test-job-type \
+       test-env-util \
+       test-strbuf \
+-      test-strv \
+       test-path \
+-      test-path-util \
+       test-strxcpyx \
+       test-siphash24 \
+       test-unit-name \
+@@ -1541,7 +1539,6 @@
+       test-capability \
+       test-async \
+       test-ratelimit \
+-      test-condition \
+       test-uid-range \
+       test-locale-util \
+       test-execute \
+@@ -3586,11 +3583,9 @@
+ 
+ tests += \
+       test-dhcp-option \
+-      test-dhcp-client \
+       test-dhcp-server \
+       test-ipv4ll \
+       test-ndisc-rs \
+-      test-dhcp6-client \
+       test-lldp
+ 
+ # ------------------------------------------------------------------------------
+@@ -4298,16 +4293,11 @@
+       catalog-remove-hook
+ 
+ tests += \
+-      test-journal \
+       test-journal-enum \
+       test-journal-send \
+       test-journal-syslog \
+       test-journal-match \
+-      test-journal-stream \
+       test-journal-init \
+-      test-journal-verify \
+-      test-journal-interleaving \
+-      test-journal-flush \
+       test-mmap-cache \
+       test-catalog \
+       test-audit-type
+@@ -6518,7 +6508,6 @@
+       test-libudev-sym.c
+ 
+ tests += \
+-      test-libsystemd-sym \
+       test-libudev-sym
+ 
+ .PHONY: cppcheck

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 585916b0c3afdc1bc0eb34f727d967d8b8c92124..9c2d9372167ebf4b832048a73f388cd0ed11494c 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 221
-release    = 5
+version    = 231
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -18,13 +18,20 @@ description
        SysV and LSB init scripts.
 end
 
-source_dl  = http://www.freedesktop.org/software/systemd/
-sources    = %{thisapp}.tar.xz
+source_dl  = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/
 
 build
        unitdir = %{prefix}/lib/systemd/system
 
        requires
+               # Testsuite
+               /usr/bin/getfacl
+               /usr/bin/mount
+               /usr/bin/tree
+               /usr/bin/umount
+
+               autoconf
+               automake
                attr-devel
                audit-devel
                cryptsetup-luks-devel >= 1.4.2
@@ -37,14 +44,14 @@ build
                gobject-introspection-devel >= 1.31
                gperf
                hwdata
-               intltool
+               intltool >= 0.51.0
                kmod-devel >= 15
                libacl-devel
                libblkid-devel
                libcap-devel
                libgcrypt-devel
                libmount-devel
-               libselinux-devel
+               libtool
                libuuid-devel
                m4
                pam-devel
@@ -57,6 +64,8 @@ build
                zlib-devel
        end
 
+       export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+
        configure_options += \
                PYTHON=%{python3} \
                --with-sysvinit-path= \
@@ -82,6 +91,16 @@ build
 
        prepare_cmds
                %{create_groups}
+
+               ./autogen.sh
+       end
+
+       test
+               # Create dummy machine-id file, which is required for some tests.
+               touch %{sysconfdir}/machine-id
+
+               # Run the testsuite.
+               make check
        end
 
        install_cmds