From: Adrian Bunk <bunk@stusta.de>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] systemd: Upgrade 243 -> 243.2
Date: Thu, 5 Dec 2019 23:23:38 +0200 [thread overview]
Message-ID: <20191205212338.26696-1-bunk@stusta.de> (raw)
Bugfix-only changes on the 243 stable branch.
Backported patch removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
meta/recipes-core/systemd/systemd.inc | 4 +-
.../0001-pstore-fix-use-after-free.patch | 39 -------------------
meta/recipes-core/systemd/systemd_243.bb | 1 -
3 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 7f3a59c208..6965b3b482 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,10 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a"
+SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9"
SRCBRANCH = "v243-stable"
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
-PV_append = "+${SRCPV}"
+PV_append = ".2"
diff --git a/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch b/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch
deleted file mode 100644
index fd147a18be..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1b3156edd291e0882d80a695d035dd30521345d1 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 6 Sep 2019 15:04:01 +0200
-Subject: [PATCH] pstore: fix use after free
-
-The memory is still needed in the sd_journal_sendv() after the 'if' block.
-
-(cherry picked from commit 1e19f5ac0d680a63eccae7ef1fc6ce225dca0bbf)
-
-Upstream-Status: Backport
-
-Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
----
- src/pstore/pstore.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
-index c760b3e899..8ffe523830 100644
---- a/src/pstore/pstore.c
-+++ b/src/pstore/pstore.c
-@@ -117,6 +117,7 @@ static int compare_pstore_entries(const void *_a, const void *_b) {
-
- static int move_file(PStoreEntry *pe, const char *subdir) {
- _cleanup_free_ char *ifd_path = NULL, *ofd_path = NULL;
-+ _cleanup_free_ void *field = NULL;
- const char *suffix, *message;
- struct iovec iovec[2];
- int n_iovec = 0, r;
-@@ -138,7 +139,6 @@ static int move_file(PStoreEntry *pe, const char *subdir) {
- iovec[n_iovec++] = IOVEC_MAKE_STRING(message);
-
- if (pe->content_size > 0) {
-- _cleanup_free_ void *field = NULL;
- size_t field_size;
-
- field_size = strlen("FILE=") + pe->content_size;
---
-2.14.4
-
diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb
index b31d0b5ed4..ac7a5f86b3 100644
--- a/meta/recipes-core/systemd/systemd_243.bb
+++ b/meta/recipes-core/systemd/systemd_243.bb
@@ -24,7 +24,6 @@ SRC_URI += "file://touchscreen.rules \
file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \
file://99-default.preset \
- file://0001-pstore-fix-use-after-free.patch \
"
# patches needed by musl
--
2.17.1
next reply other threads:[~2019-12-05 21:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 21:23 Adrian Bunk [this message]
2019-12-09 10:41 ` [PATCH] systemd: Upgrade 243 -> 243.2 Ross Burton
2019-12-09 14:42 ` Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191205212338.26696-1-bunk@stusta.de \
--to=bunk@stusta.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.