From 58e2c63a03eee3a4517ce03b454e75c4f7ea4458 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Apr 06 2021 20:40:25 +0000 Subject: Re-enable resolved caching, hope all major bugs are fixed Signed-off-by: Adam Williamson --- diff --git a/nocache.conf b/nocache.conf deleted file mode 100644 index 25d5429..0000000 --- a/nocache.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Resolve] -Cache=no diff --git a/systemd.spec b/systemd.spec index 40b0a24..1f3c9a0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 248 -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,9 +64,6 @@ 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 @@ -559,9 +556,6 @@ 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" @@ -976,6 +970,9 @@ fi %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Tue Apr 06 2021 Adam Williamson - 248-2 +- Re-enable resolved caching, we hope all major bugs are resolved now + * Wed Mar 31 2021 Zbigniew Jędrzejewski-Szmek - 248-1 - Latest upstream release, see https://github.com/systemd/systemd/blob/v248/NEWS.