From 58e51a6f6eeaffd8c63de7e15f3c5a958eeb679e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 12 Mar 2021 17:46:46 -0800
Subject: [PATCH] Disable resolved cache via config snippet (#1940715)

---
 nocache.conf |  2 ++
 systemd.spec | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 nocache.conf

diff --git a/nocache.conf b/nocache.conf
new file mode 100644
index 0000000..25d5429
--- /dev/null
+++ b/nocache.conf
@@ -0,0 +1,2 @@
+[Resolve]
+Cache=no
diff --git a/systemd.spec b/systemd.spec
index 5c01334..c31c136 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        248~rc4
-Release:        1%{?dist}
+Release:        2%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -64,6 +64,9 @@ Source22:       sysusers.attr
 Source23:       sysusers.prov
 Source24:       sysusers.generate-pre.sh
 
+# Disable resolved caching to workaround #1933433
+Source100:      nocache.conf
+
 %if 0
 GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
 i=1; for j in 00*patch; do printf "Patch%04d:      %s\n" $i $j; i=$((i+1));done|xclip
@@ -554,6 +557,9 @@ touch %{buildroot}%{_localstatedir}/lib/private/systemd/journal-upload/state
 # Install yum protection fragment
 install -Dm0644 %{SOURCE4} %{buildroot}/etc/dnf/protected.d/systemd.conf
 
+# Install resolved cache disable fragment
+install -Dm0644 -t %{buildroot}%{pkgdir}/resolved.conf.d %{SOURCE100}
+
 install -Dm0644 -t %{buildroot}/usr/lib/firewalld/services/ %{SOURCE7} %{SOURCE8}
 
 # Restore systemd-user pam config from before "removal of Fedora-specific bits"
@@ -949,6 +955,9 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Fri Mar 19 2021 Adam Williamson <awilliam@redhat.com> - 248~rc4-2
+- Disable resolved cache via config snippet (#1940715)
+
 * Thu Mar 18 2021 Yu Watanabe <yuwatana@redhat.com> - 248~rc4-1
 - Latest upstream prerelease, see
   https://github.com/systemd/systemd/blob/v248-rc4/NEWS.