From 1b967da3090923eeea99d8bfc51f04f970260242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 1 Jun 2021 11:27:14 +0200 Subject: [PATCH] authselect-1.2.3-3: remove systemd-resolved support Resolves: rhbz#1966484 --- ...hel9-remove-support-for-for-resolved.patch | 44 +++++++++++++++++++ authselect.spec | 6 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 9004-rhel9-remove-support-for-for-resolved.patch diff --git a/9004-rhel9-remove-support-for-for-resolved.patch b/9004-rhel9-remove-support-for-for-resolved.patch new file mode 100644 index 0000000..a009f8d --- /dev/null +++ b/9004-rhel9-remove-support-for-for-resolved.patch @@ -0,0 +1,44 @@ +From 259e4e50a97a5196436e3d7ed42d2ecf0be3203f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pavel=20B=C5=99ezina?= +Date: Mon, 31 May 2021 15:42:49 +0200 +Subject: [PATCH] rhel9: remove support for for resolved + +systemd-resolved is an experimental feature at this point and it +should not be enabled by default. Steps to switch this feature on +will be documented in RHEL guide. + +This reverts commit c5294c508a940291440eb32d5d750f33baf1ae54. +--- + profiles/minimal/nsswitch.conf | 2 +- + profiles/nis/nsswitch.conf | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/profiles/minimal/nsswitch.conf b/profiles/minimal/nsswitch.conf +index a9e4bc79a1090304542ccd8b43d1107eeb5304df..a39e4d32ebf79e8bf05f2db5753b01596222dc35 100644 +--- a/profiles/minimal/nsswitch.conf ++++ b/profiles/minimal/nsswitch.conf +@@ -2,7 +2,7 @@ aliases: files {exclude if "with-custom + automount: files {exclude if "with-custom-automount"} + ethers: files {exclude if "with-custom-ethers"} + group: files {if "with-altfiles":altfiles }systemd {exclude if "with-custom-group"} +-hosts: resolve [!UNAVAIL=return] files myhostname dns {exclude if "with-custom-hosts"} ++hosts: files dns myhostname {exclude if "with-custom-hosts"} + initgroups: files {exclude if "with-custom-initgroups"} + netgroup: files {exclude if "with-custom-netgroup"} + networks: files {exclude if "with-custom-networks"} +diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf +index 50a3ffb7431a91b88b4bfef4c09df19310fac7e7..9bee7d839f84ff39d54cb6ead9dea38e51736b4d 100644 +--- a/profiles/nis/nsswitch.conf ++++ b/profiles/nis/nsswitch.conf +@@ -2,7 +2,7 @@ aliases: files nis {exclude if "with-custom-aliases"} + automount: files nis {exclude if "with-custom-automount"} + ethers: files nis {exclude if "with-custom-ethers"} + group: files nis systemd {exclude if "with-custom-group"} +-hosts: resolve [!UNAVAIL=return] files nis myhostname dns {exclude if "with-custom-hosts"} ++hosts: files nis dns myhostname {exclude if "with-custom-hosts"} + initgroups: files nis {exclude if "with-custom-initgroups"} + netgroup: files nis {exclude if "with-custom-netgroup"} + networks: files nis {exclude if "with-custom-networks"} +-- +2.31.1 + diff --git a/authselect.spec b/authselect.spec index 91b8ff9..b84ec0e 100644 --- a/authselect.spec +++ b/authselect.spec @@ -3,7 +3,7 @@ Name: authselect Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configures authentication and identity sources from supported profiles URL: https://github.com/authselect/authselect @@ -15,6 +15,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch9001: 9001-rhel9-remove-mention-of-Fedora-Change-page-in-compat.patch Patch9002: 9002-rhel9-remove-ecryptfs-support.patch Patch9003: 9003-rhel9-sssd-default-to-files-first-for-users-and-grou.patch +Patch9004: 9004-rhel9-remove-support-for-for-resolved.patch %endif %global makedir %{_builddir}/%{name}-%{version} @@ -299,6 +300,9 @@ exit 0 exit 0 %changelog +* Tue Jun 1 2021 Pavel Březina - 1.2.3-3 +- Remove systemd-resolved support (rhbz#1966484) + * Thu Apr 15 2021 Mohan Boddu - 1.2.3-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937