mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-07 03:04:04 +00:00
Code Issues Projects Releases Wiki Activity

systemd: Update to the latest 242 branch

Browse Source 
Remove patch for issue fixed upstream.

(From OE-Core rev: 8f06385bb4a8244ca51daeef0018bfbdd0a93161)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Bunk
2019-09-04 15:52:40 +03:00
committed by Richard Purdie
parent 4364a26db1
commit 49224db935
3 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd.inc
+1 -1
View File
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
SRCREV = "07f0549ffe3413f0e78b656dd34d64681cbd8f00"
SRCREV = "f875dced33462641e1fb7875d2f9a8cd8e8c2fcc"
SRCBRANCH = "v242-stable"
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch
-41
View File
@@ -1,41 +0,0 @@
From 18bddeaaf225d5becfc10cd2c6a1d037c90574a2 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Tue, 11 Jun 2019 15:10:21 +0200
Subject: [PATCH] resolved: Fix incorrect use of OpenSSL BUF_MEM
Fixes: #12763
Upstream-Status: Backport [Not yet released]
https://github.com/systemd/systemd/commit/18bddeaaf225d5becfc10cd2c6a1d037c90574a2
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
src/resolve/resolved-dnstls-openssl.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c
index f269e4d6487f..5d9223007581 100644
--- a/src/resolve/resolved-dnstls-openssl.c
+++ b/src/resolve/resolved-dnstls-openssl.c
@@ -6,6 +6,7 @@
#include <openssl/bio.h>
#include <openssl/err.h>
+#include <string.h>
#include "io-util.h"
#include "resolved-dns-stream.h"
@@ -34,9 +35,11 @@ static int dnstls_flush_write_buffer(DnsStream *stream) {
return ss;
} else {
stream->dnstls_data.write_buffer->length -= ss;
- stream->dnstls_data.write_buffer->data += ss;
if (stream->dnstls_data.write_buffer->length > 0) {
+ memmove(stream->dnstls_data.write_buffer->data,
+ stream->dnstls_data.write_buffer->data + ss,
+ stream->dnstls_data.write_buffer->length);
stream->dnstls_events |= EPOLLOUT;
return -EAGAIN;
}
--
2.17.1
meta/recipes-core/systemd/systemd_242.bb
-1
View File
@@ -23,7 +23,6 @@ SRC_URI += "file://touchscreen.rules \
file://0004-rules-whitelist-hd-devices.patch \
file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
file://99-default.preset \
file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \
"
# patches needed by musl