rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-enable resolved caching, hope all major bugs are fixed

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-04-06 13:40:25 -07:00
parent c6e8c30b17
commit 58e2c63a03
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nocache.conf
View File

@ -1,2 +0,0 @@
[Resolve]
Cache=no

11
systemd.spec
View File

@ -21,7 +21,7 @@
Name: systemd Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 248 Version: 248
Release: 1%{?dist} Release: 2%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager Summary: System and Service Manager
@ -64,9 +64,6 @@ Source22: sysusers.attr
Source23: sysusers.prov Source23: sysusers.prov
Source24: sysusers.generate-pre.sh Source24: sysusers.generate-pre.sh
# Disable resolved caching to workaround #1933433
Source100: nocache.conf
%if 0 %if 0
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable 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 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 yum protection fragment
install -Dm0644 %{SOURCE4} %{buildroot}/etc/dnf/protected.d/systemd.conf 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} install -Dm0644 -t %{buildroot}/usr/lib/firewalld/services/ %{SOURCE7} %{SOURCE8}
# Restore systemd-user pam config from before "removal of Fedora-specific bits" # 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 %files standalone-sysusers -f .file-list-standalone-sysusers
%changelog %changelog
* Tue Apr 06 2021 Adam Williamson <awilliam@redhat.com> - 248-2
- Re-enable resolved caching, we hope all major bugs are resolved now
* Wed Mar 31 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248-1 * Wed Mar 31 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248-1
- Latest upstream release, see - Latest upstream release, see
https://github.com/systemd/systemd/blob/v248/NEWS. https://github.com/systemd/systemd/blob/v248/NEWS.