summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-09-04 12:52:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 07:15:45 (GMT)
commit49224db93520a9eb7012d545b717f2858b12fa60 (patch)
tree9adc60b55f10160ffb923991ec19adc198e4223b /meta/recipes-core
parent4364a26db198870b12749f04da2ed0f95a105ab0 (diff)
downloadpoky-49224db93520a9eb7012d545b717f2858b12fa60.tar.gz
systemd: Update to the latest 242 branch
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch41
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb1
3 files changed, 1 insertions, 43 deletions
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 491361c..1912715 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "07f0549ffe3413f0e78b656dd34d64681cbd8f00" 17SRCREV = "f875dced33462641e1fb7875d2f9a8cd8e8c2fcc"
18SRCBRANCH = "v242-stable" 18SRCBRANCH = "v242-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
20 20
diff --git a/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch b/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch
deleted file mode 100644
index f0ae1db..0000000
--- a/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 18bddeaaf225d5becfc10cd2c6a1d037c90574a2 Mon Sep 17 00:00:00 2001
2From: Tomas Mraz <tmraz@fedoraproject.org>
3Date: Tue, 11 Jun 2019 15:10:21 +0200
4Subject: [PATCH] resolved: Fix incorrect use of OpenSSL BUF_MEM
5
6Fixes: #12763
7Upstream-Status: Backport [Not yet released]
8 https://github.com/systemd/systemd/commit/18bddeaaf225d5becfc10cd2c6a1d037c90574a2
9Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
10---
11 src/resolve/resolved-dnstls-openssl.c | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c
15index f269e4d6487f..5d9223007581 100644
16--- a/src/resolve/resolved-dnstls-openssl.c
17+++ b/src/resolve/resolved-dnstls-openssl.c
18@@ -6,6 +6,7 @@
19
20 #include <openssl/bio.h>
21 #include <openssl/err.h>
22+#include <string.h>
23
24 #include "io-util.h"
25 #include "resolved-dns-stream.h"
26@@ -34,9 +35,11 @@ static int dnstls_flush_write_buffer(DnsStream *stream) {
27 return ss;
28 } else {
29 stream->dnstls_data.write_buffer->length -= ss;
30- stream->dnstls_data.write_buffer->data += ss;
31
32 if (stream->dnstls_data.write_buffer->length > 0) {
33+ memmove(stream->dnstls_data.write_buffer->data,
34+ stream->dnstls_data.write_buffer->data + ss,
35+ stream->dnstls_data.write_buffer->length);
36 stream->dnstls_events |= EPOLLOUT;
37 return -EAGAIN;
38 }
39--
402.17.1
41
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index 759d6af..6bbe388 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -23,7 +23,6 @@ SRC_URI += "file://touchscreen.rules \
23 file://0004-rules-whitelist-hd-devices.patch \ 23 file://0004-rules-whitelist-hd-devices.patch \
24 file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ 24 file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
25 file://99-default.preset \ 25 file://99-default.preset \
26 file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \
27 " 26 "
28 27
29# patches needed by musl 28# patches needed by musl