From 38d7cff9f609bc2f66abf59bf9f1d4b9e64d1b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 11 Jan 2018 11:14:11 +0100
Subject: [PATCH] Backport a bunch of patches

---
 sources      |  2 +-
 systemd.spec | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index 558dbdb..f2f1d1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemd-236.tar.gz) = 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
+SHA512 (systemd-3e14c4c.tar.gz) = 3e01d14e858ca638ebccd50b8a1f183686f099a4e33dc17172a95d47e4b0b7d661f0413a1a77be75febe2e32724287a5af93dd579ff2c214f8e5fa2b079f6d3e
diff --git a/systemd.spec b/systemd.spec
index 990dcbf..2d08134 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,4 +1,4 @@
-#global gitcommit 4a0e9289bf443fec9fc56af25f90e2a100ba7a41
+%global gitcommit 3e14c4c1876b4dfeb8bf511185f70fef8d04a153
 %{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})}
 
 # We ship a .pc file but don't want to have a dep on pkg-config. We
@@ -13,14 +13,14 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        236
-Release:        1%{?gitcommit:.git%{gitcommitshort}}%{?dist}
+Release:        2%{?gitcommit:.git%{gitcommitshort}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
 
 # download tarballs with "spectool -g systemd.spec"
 %if %{defined gitcommit}
-Source0:        https://github.com/systemd/systemd/archive/%{?gitcommit}.tar.gz#/%{name}-%{gitcommitshort}.tar.gz
+Source0:        https://github.com/systemd/systemd-stable/archive/%{?gitcommit}.tar.gz#/%{name}-%{gitcommitshort}.tar.gz
 %else
 Source0:        https://github.com/systemd/systemd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %endif
@@ -684,6 +684,12 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Thu Jan 11 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 236-2.git23e14c4
+- Backport a bunch of bugfixes from upstream (#1531502, #1531381, #1526621
+  various memory corruptions in systemd-networkd)
+- /dev/kvm is marked as a static node which fixes permissions on s390x
+  and ppc64 (#1532382)
+
 * Fri Dec 15 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 236-1
 - Update to latest version