diff --git a/base/systemd/centos/meta_patches/Add-STX-patches.patch b/base/systemd/centos/meta_patches/Add-STX-patches.patch index 3508aad2d..c3c57e263 100644 --- a/base/systemd/centos/meta_patches/Add-STX-patches.patch +++ b/base/systemd/centos/meta_patches/Add-STX-patches.patch @@ -1,26 +1,27 @@ -From 91090adc8d4c774796d36f7563eea224569a9b0f Mon Sep 17 00:00:00 2001 +From 8ca176c7d8a3d21b928db29744f950c3cb336658 Mon Sep 17 00:00:00 2001 From: Li Zhou -Date: Wed, 21 Apr 2021 13:59:22 +0800 +Date: Wed, 21 Apr 2021 14:41:27 +0800 Subject: [PATCH] Add STX patches Signed-off-by: Jim Somerville Signed-off-by: Li Zhou --- - SPECS/systemd.spec | 58 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 58 insertions(+) + SPECS/systemd.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec -index 4c83150..72de7d6 100644 +index 9ed7715..bd14767 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec -@@ -786,6 +786,64 @@ Patch0744: 0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch - Patch0745: 0745-fix-mis-merge.patch - Patch0746: 0746-fs-util-chase_symlinks-prevent-double-free.patch - +@@ -884,6 +884,65 @@ Patch0842: 0842-core-don-t-update-unit-description-if-it-is-already-.patch + Patch0843: 0843-unit-don-t-emit-PropertiesChanged-signal-if-adding-a.patch + Patch0844: 0844-core-fix-unnecessary-fallback-to-the-rescue-mode-cau.patch + Patch0845: 0845-core-Detect-initial-timer-state-from-serialized-data.patch ++ +# STX Patches -+Patch0801: 801-inject-millisec-in-syslog-date.patch -+Patch0802: 802-fix-build-error-for-unused-variable.patch -+Patch0803: 803-Fix-compile-failure-due-to-deprecated-value.patch ++Patch0851: 851-inject-millisec-in-syslog-date.patch ++Patch0852: 852-fix-build-error-for-unused-variable.patch ++Patch0853: 853-Fix-compile-failure-due-to-deprecated-value.patch + +# This cluster of patches relates to fixing redhat bug #1819868 +# "systemd excessively reads mountinfo and udev in dense container environments" diff --git a/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch b/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch index 5fbc01d07..944e6663f 100644 --- a/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch +++ b/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch @@ -17,8 +17,8 @@ index b1ffe88..16262fb 100644 Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 219 --Release: 67%{?dist} -+Release: 67.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 78%{?dist}.3 ++Release: 78.el7_9.3%{?_tis_dist}.%{tis_patch_ver} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager diff --git a/base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch b/base/systemd/centos/patches/851-inject-millisec-in-syslog-date.patch similarity index 100% rename from base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch rename to base/systemd/centos/patches/851-inject-millisec-in-syslog-date.patch diff --git a/base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch b/base/systemd/centos/patches/852-fix-build-error-for-unused-variable.patch similarity index 100% rename from base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch rename to base/systemd/centos/patches/852-fix-build-error-for-unused-variable.patch diff --git a/base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch b/base/systemd/centos/patches/853-Fix-compile-failure-due-to-deprecated-value.patch similarity index 100% rename from base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch rename to base/systemd/centos/patches/853-Fix-compile-failure-due-to-deprecated-value.patch diff --git a/base/systemd/centos/srpm_path b/base/systemd/centos/srpm_path index 6cf114d90..a69a06ae5 100644 --- a/base/systemd/centos/srpm_path +++ b/base/systemd/centos/srpm_path @@ -1 +1 @@ -mirror:Source/systemd-219-67.el7.src.rpm +mirror:Source/systemd-219-78.el7_9.3.src.rpm diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index a6b51feb4..f4fff40a9 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -34,7 +34,7 @@ setup-2.8.71-10.el7.src.rpm shim-15-1.el7.centos.src.rpm shim-signed-15-1.el7.centos.src.rpm sudo-1.8.23-10.el7_9.1.src.rpm -systemd-219-67.el7.src.rpm +systemd-219-78.el7_9.3.src.rpm tboot-1.9.6-3.el7.src.rpm tpm2-tools-3.0.4-2.el7.src.rpm watchdog-5.13-12.el7.src.rpm