From cc8ab699f369076f652abce18fcf1fc5ca982dff Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 Dec 2018 14:25:01 +0100
Subject: [PATCH 1/4] =?UTF-8?q?systemd:=20Remove=20systemd=E2=80=99s=20sys?=
 =?UTF-8?q?ctl=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 systemd.be0 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/systemd.be0 b/systemd.be0
index ecfcd60f4..34d17a407 100755
--- a/systemd.be0
+++ b/systemd.be0
@@ -86,6 +86,9 @@ mee_install_post() {
 
     # Do not use tmpfs for `/tmp`
     ln -vs /dev/null ${D}/etc/systemd/system/tmp.mount
+
+    # Remove systemd’s sysctl configuration
+    rm -rv ${D}/${LIBDIR}/sysctl.d/*
 }
 
 ###############################################################################

From d92eb1cc286d29b640db698f0eb6858d80b2ffc8 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 Dec 2018 14:25:53 +0100
Subject: [PATCH 2/4] systemd: Update version from 238 to 239

---
 systemd.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systemd.be0 b/systemd.be0
index 34d17a407..62a70c1d2 100755
--- a/systemd.be0
+++ b/systemd.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION systemd-238-0
+# BEE_VERSION systemd-239-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)

From 08722652ef65d6c2bdd356bf3dd7d10cfd37d64b Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 Dec 2018 14:32:30 +0100
Subject: [PATCH 3/4] systemd: Explicitly set build type to Meson

It looks like, changes in bee build type ordering causes the error
below.

    [BEE] GNU autotools detection failed.
    [BEE] /dev/shm/bee-root/systemd/systemd-239-0/source/configure: does not seem to be generated
     by GNU autotools.
    [BEE] use BEE_BUILDTYPE=autotools to force it anyway
    [BEE] using magic buildtype 'make' from '/usr/libexec/bee/beesh.d/make.sh' ..
    [BEE]  -> B=S linking build dir /dev/shm/bee-root/systemd/systemd-239-0/build to source dir
    [BEE] changing to build directory: /dev/shm/bee-root/systemd/systemd-239-0/source
    [BEE] => entering mee_configure() ..
    /usr/bin/beesh: line 504: [: too many arguments
    [BEE] action 'bee_configure' is not defined: skipping..
    [BEE] <= leaving mee_configure() ..
    [BEE] => entering bee_build() ..
    [BEE] make -j100 PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/systemd
    ninja -C build
    ninja: Entering directory `build'
    ninja: fatal: chdir to 'build' - No such file or directory
    make: *** [Makefile:2: all] Error 1
    Command exited with non-zero status 2

Therefore, set the build type explicitly.
---
 systemd.be0 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/systemd.be0 b/systemd.be0
index 62a70c1d2..9835d4ae2 100755
--- a/systemd.be0
+++ b/systemd.be0
@@ -17,6 +17,8 @@ SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz"
 
 # PATCHURL+=()
 
+BEE_BUILDTYPE=meson
+
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not
 ## be added to you package but may be present in the image directory.

From 13e1590d8eb0881bb6687f3f7cb875e12a4ed980 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 Dec 2018 15:25:53 +0100
Subject: [PATCH 4/4] systemd: Disable DNS over TLS

Fix the error, that `gnutls/socket.h` cannot be found.

    ../source/src/resolve/resolved-dns-transaction.c:17:10: fatal error: gnutls/socket.h: No such
     file or directory
     #include <gnutls/socket.h>
              ^~~~~~~~~~~~~~~~~
    compilation terminated.

[1]: https://github.com/systemd/systemd/issues/9403
[2]: https://github.com/systemd/systemd/pull/9410
---
 systemd.be0 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/systemd.be0 b/systemd.be0
index 9835d4ae2..5d53aedd6 100755
--- a/systemd.be0
+++ b/systemd.be0
@@ -60,6 +60,7 @@ mee_configure() {
         -Dblkid=true \
         -Dbuildtype=release \
         -Ddefault-dnssec=yes \
+        -Ddns-over-tls=false \
         -Ddns-servers='141.14.16.1' \
         -Dntp-servers='zeit.fu-berlin.de ntps1-0.cs.tu-berlin.de time.fu-berlin.de' \
         -Dfirstboot=false \