From 3e5fd38c84fd8321ede9c30705b2c62b0f7634d5 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: May 04 2022 10:47:54 +0000
Subject: 250.3-6.7: Backport some upstream fixes + move files to networkd


We backport two fixes that ensure systemd-tmpfiles doesn't fail
due to a missing systemd-network user. The upstream fixes move the
networkd related stuff in tmpfiles.d/systemd.conf to
tmpfiles.d/systemd-network.conf. We then move this new file to the
networkd package so that it is only applied when the networkd
package is installed which also ensures the systemd-network user
will exist.

---

diff --git a/sources b/sources
index 8139fa5..6d6939c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (systemd-hs-250.3.tar.gz) = 20b77d0c58253f7f6c5690f52b83d8e6582de5ffdb1f887f0aa30ceedf9c46b2b3199dedf94b7086c05f8becc91a6108e2c0f0053a23222450d96c8000ea3f79
-SHA512 (systemd-hs+fb-250.3.tar.gz) = 2fd710f8169d1a18694ec53f7c698ceebcb889854a6e4796b9b679a4529a01f0b92503fb0047acaabd1cf96c1f26e3cce8219ed60746547b168692f028aedf7e
+SHA512 (systemd-hs-250.3.tar.gz) = 1531bb825ae0dcb6244a262e4a8d52a7070ff83db7bd000c90d1fa4c453dd76170b3773fc563a5cbd3ff0ca70f93b212bfc45558d8153f70b4f41780606b1298
+SHA512 (systemd-hs+fb-250.3.tar.gz) = 3abf78271c5e3e5907d6585dfc3dfcfa48d0c2924610f58b5b097b2be165096f1e6ab7c47136ab03157cc9857d4151d0a6d48371bf6ac8406f0c51abed4aac93
diff --git a/split-files.py b/split-files.py
index f855093..eaed4c2 100644
--- a/split-files.py
+++ b/split-files.py
@@ -9,14 +9,14 @@ networkd_regex = r'''
     /usr/lib/systemd/network/80-|
     networkd|
     networkctl|
-    org\.freedesktop\.network1
+    org\.freedesktop\.network1|
+    systemd\.network|
+    systemd-network\.conf|
+    systemd\.netdev
 '''
 
 if release == "8":
     networkd_regex += r'''|
-        systemd\.netdev|
-        systemd\.network|
-        systemd-network\.conf|
         systemd-network-generator
     '''
 
diff --git a/systemd.spec b/systemd.spec
index 67659bc..2ac95d8 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -4,9 +4,9 @@
 %global stable 1
 
 %if 0%{?facebook}
-%global hs_commit 7398fa7259fb3b805bc8e6770db21eab7ed8bc0d
+%global hs_commit 469e5686ae61dbcf04a6d87fbc8e00fd932a1e3f
 %else
-%global hs_commit ee232c833a604e2075703065811fd5619aad4dec
+%global hs_commit 45a3b57ecf40f316450313d20a4069bfe0c80eb5
 %endif
 
 # We ship a .pc file but don't want to have a dep on pkg-config. We
@@ -43,7 +43,7 @@ Name:           systemd
 Url:            https://pagure.io/centos-sig-hyperscale/systemd
 %if %{without inplace}
 Version:        250.3
-Release:        6.6%{?dist}
+Release:        6.7%{?dist}
 %else
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@@ -1078,6 +1078,11 @@ fi
 %endif
 
 %changelog
+* Wed May  4 2022 Daan De Meyer <daan.j.demeyer@gmail.com> - 250.3-6.7
+- Backported https://github.com/systemd/systemd/pull/23254 and
+  https://github.com/systemd/systemd/pull/23205
+- Move more files to the networkd package
+
 * Wed Apr 13 2022 Daan De Meyer <daan.j.demeyer@gmail.com> - 250.3-6.6
 - Fixed bug in networkd changes to split-files.py that caused the
   /etc/systemd/network to get moved to the networkd package (which we don't