[oe-commits] [openembedded-core] 17/19: systemd: Update to the latest 242 branch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 8f06385bb4a8244ca51daeef0018bfbdd0a93161
Author: Adrian Bunk <bunk at stusta.de>
AuthorDate: Wed Sep 4 15:52:40 2019 +0300

    systemd: Update to the latest 242 branch
    
    Remove patch for issue fixed upstream.
    
    Signed-off-by: Adrian Bunk <bunk at stusta.de>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/systemd/systemd.inc              |  2 +-
 ...lved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch | 41 ----------------------
 meta/recipes-core/systemd/systemd_242.bb           |  1 -
 3 files changed, 1 insertion(+), 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"
 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}"
 
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 @@
-From 18bddeaaf225d5becfc10cd2c6a1d037c90574a2 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz at 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 at 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
-
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 \
            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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.