From 7e39efa19441532963d7ec40365e9edd59da422b Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
Date: Fri, 19 Feb 2021 20:15:12 +0530
Subject: [PATCH] Release systemd version 241-7~deb10u6co1

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
---
 debian/changelog | 51 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c817842..7a46c5cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,53 @@
-systemd (241-7~deb10u6co1) UNRELEASED; urgency=medium
+systemd (241-7~deb10u6co1) apertis; urgency=medium
 
-  * PLEASE SUMMARIZE remaining Apertis changes
+  [ Ritesh Raj Sarraf ]
+  * Merge changes from Debian Buster. Remaining changes:
+    + Fix syntax error in shell script
+    + Fix new bashisms introduced on update.
+    + AppArmor: Fix conflict with chaiwala-apparmor-profiles
+    + AppArmor: Add systemd-logind profile
+    + Don’t build against libdw, since 0.158 isn’t available in target.
+    + Drop patch apertis/0101-basic-cap-list-parse-print-numerical-capabilities.patch
+    + Drop patch apertis/0102-basic-capability-util-let-cap_last_cap-return-unsign.patch
+    + Drop patch apertis/0103-basic-cap-list-reduce-scope-of-variables.patch
+
+  [ Denis Pynkin ]
+  * Force the call of systemd-journal-flush before `/var` unmount.
+    The problem with failed `/var` unmount placed on separate partition
+    have a long story: https://github.com/systemd/systemd/issues/867
+    According messages after the fix integrated into upstream -- there are
+    some corner cases which aren't fully fixed by patches adding [relinquish
+    options](https://gitlab.apertis.org/pkg/systemd/-/merge_requests/26)
+    In case of ostree-based images we have a similar issue since `/var` is
+    bind-mounted in initramfs. Systemd is trying to unmount `/var` on
+    shutdown, however `ExecStop=` command from `systemd-journal-flush`
+    service is not executed during shutdown.
+    By adding `PartOf=var.mount` into service file we force the
+    `systemd-journal-flush.service` to be called prior the `/var` unmount.
+    This allow to unlock the bind-mount, since `journald` have a chance to
+    re-link it's journal into `/run` with `journalctl
+    --smart-relinquish-var` call.
+  * Handle new capabilities gracefully (PR 16424)
+    Backported PR 16424 to avoid message
+    'Failed to parse bus message: Invalid argument'
+    with an updated kernel using new capabilities.
+
+  [ Frédéric Danis ]
+  * systemd-boot: backport fix of menu ordering with boot counting
+    systemd-boot selects the last valid entry by default, not the first, which
+    prevent correct rollback.
+
+  [ Martyn Welch ]
+  * journald: Backport support for --relinquish and --smart-relinquish options.
+    Newer version of systemd-journald support the --relinquish and
+    --smart-relinquish options that enable cleaner handling of mounts at
+    shutdown as journald can be told to close any logging under
+    /var/log/journal so that the /var filesystem can be unmounted should it be
+    on a separate partition.
+    Backport this feature as it enables shutdown without failures, a highly
+    desirable trait in embedded products using systemd.
 
- -- Apertis CI <devel@lists.apertis.org>  Fri, 19 Feb 2021 14:34:31 +0000
+ -- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>  Tue, 09 Mar 2021 15:58:45 +0530
 
 systemd (241-7~deb10u6) buster; urgency=medium
 
-- 
GitLab