From e421b37422a405882da7393ea53019c9647d0855 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Mon, 17 May 2021 14:22:51 +0200
Subject: [PATCH] sys-apps/systemd: update systemd to 246.13

Update systemd to 246.13, and adjust Flatcar patches to make it
compilable with the new version.
---
 sys-apps/systemd/Manifest                              |  2 +-
 .../files/0007-core-use-max-for-DefaultTasksMax.patch  | 10 +++++-----
 .../{systemd-246.6.ebuild => systemd-246.13.ebuild}    |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename sys-apps/systemd/{systemd-246.6.ebuild => systemd-246.13.ebuild} (100%)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 755d27a01c9..c0d65779b10 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1 +1 @@
-DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
+DIST systemd-stable-246.13.tar.gz 9565553 BLAKE2B d4335af50769619567033e5f567b186b4390978c95f86a2426d8dcafc90b67763bf67b6af89d4d21a8f61fbc81978c86ac34d86c17f5238f3d354872c0e379ff SHA512 b8bf10d6201b3505f20f9b113d7dccae457163317349f2fe8c062bf44c5ebcb6c93f0f87110a4cbefa74ee7ea2b1b0476c362acba4739027397957ca1ccfb528
diff --git a/sys-apps/systemd/files/0007-core-use-max-for-DefaultTasksMax.patch b/sys-apps/systemd/files/0007-core-use-max-for-DefaultTasksMax.patch
index bae6d8327fb..28949337930 100644
--- a/sys-apps/systemd/files/0007-core-use-max-for-DefaultTasksMax.patch
+++ b/sys-apps/systemd/files/0007-core-use-max-for-DefaultTasksMax.patch
@@ -28,11 +28,11 @@ index c64e57c277..c6824f976f 100644
          <listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See
          <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
          for details. This setting applies to all unit types that support resource control settings, with the exception
--        of slice units. Defaults to 15%, which equals 4915 with the kernel's defaults on the host, but might be smaller
-+        of slice units. Defaults to 100%, which equals 4915 with the kernel's defaults on the host, but might be smaller
-         in OS containers.</para></listitem>
-       </varlistentry>
-
+-        of slice units. Defaults to 15% of the sysctl setting <varname>kernel.pid_max=</varname> or root cgroup <varname>pids.max</varname>.
++        of slice units. Defaults to 100% of the sysctl setting <varname>kernel.pid_max=</varname> or root cgroup <varname>pids.max</varname>.
+         Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores.
+         For example with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
+         but might be greater in other systems or smaller in OS containers.</para></listitem>
 diff --git a/src/core/main.c b/src/core/main.c
 index 9a834a875e..851c0a929d 100644
 --- a/src/core/main.c
diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.13.ebuild
similarity index 100%
rename from sys-apps/systemd/systemd-246.6.ebuild
rename to sys-apps/systemd/systemd-246.13.ebuild