From 769624aac304afbb97083585a82376ee04e93771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Thu, 4 Jun 2026 12:04:37 +0200 Subject: [PATCH] authselect-1.5.3-1: rebase to upstream 1.5.3 - Disable group merging by default, use with-group-merging to enable it (RHEL-94650) Resolves: RHEL-112169 --- .gitignore | 1 + 0901-rhel10-remove-systemd-homed.patch | 20 +++++------ 0902-rhel10-remove-ecryptfs-support.patch | 10 +++--- 0903-rhel10-remove-systemd-resolved.patch | 36 +++++++++---------- ...stname-after-dns-to-fix-hostname-fqd.patch | 36 +++++++++---------- authselect.spec | 2 +- sources | 2 +- 7 files changed, 54 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index b498d48..36808e6 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /authselect-1.4.3.tar.gz /authselect-1.5.0.tar.gz /authselect-1.5.2.tar.gz +/authselect-1.5.3.tar.gz diff --git a/0901-rhel10-remove-systemd-homed.patch b/0901-rhel10-remove-systemd-homed.patch index 4abd451..cdc074b 100644 --- a/0901-rhel10-remove-systemd-homed.patch +++ b/0901-rhel10-remove-systemd-homed.patch @@ -1,4 +1,4 @@ -From 89bcfe5ed055ac1e80d9c782b178b7a4577e62ad Mon Sep 17 00:00:00 2001 +From 21406f73b474b8f80ec8ed3f75d84cb5af41eb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Fri, 23 Feb 2024 15:49:09 +0100 Subject: [PATCH 1/4] rhel10: remove systemd-homed @@ -23,10 +23,10 @@ systemd-homed is not present in rhel. 15 files changed, 53 deletions(-) diff --git a/profiles/local/README b/profiles/local/README -index 5108590d509e9694f28358d5c4c2e60a2be99183..ad762bc2d4a55ba44fe53dba035d5c220a8b877f 100644 +index dc326dd32bfa8a3c0263852021e2f5c0a8430f54..37a6427d0b98ff999c7fba3411548833c04ab341 100644 --- a/profiles/local/README +++ b/profiles/local/README -@@ -57,9 +57,6 @@ with-mdns4:: +@@ -62,9 +62,6 @@ with-mdns4:: with-mdns6:: Enable multicast DNS over IPv6. @@ -97,10 +97,10 @@ index 7f3c56adb2329dd4a08b1cb08b63e8d0d9b13c86..290cd24eb9c50f196d6fc68a3688f097 session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/nis/README b/profiles/nis/README -index 2f91de7c397b67a28fd22df2ba9f08cebb861007..566509f541449cbc9eda9b9f46edd14d3773bb6c 100644 +index c9a99ab2a2869c8e45b94f5b30b21e47dc7bff20..5fd921abc345eadd702fc175c9a08350a662a9c0 100644 --- a/profiles/nis/README +++ b/profiles/nis/README -@@ -68,9 +68,6 @@ with-mdns4:: +@@ -73,9 +73,6 @@ with-mdns4:: with-mdns6:: Enable multicast DNS over IPv6. @@ -182,10 +182,10 @@ index 0bd022ee2286f37a5becb0daba2a5813693300a9..40a1bf74aaf3d721c4d720938e57766b session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/README b/profiles/sssd/README -index 33aa59c0d0b367f596c162ff017dd1b314be3c06..77d94f1890556dc17e0d7dc56f45da41dcf7ef22 100644 +index c9b0d518b50056fde9f3d6b39b6abf8faf946176..1c1a0bfdd1ddc7992f21ea86e683a7dc56b538d5 100644 --- a/profiles/sssd/README +++ b/profiles/sssd/README -@@ -109,9 +109,6 @@ with-gssapi:: +@@ -114,9 +114,6 @@ with-gssapi:: with-subid:: Enable SSSD as a source of subid database in /etc/nsswitch.conf. @@ -280,10 +280,10 @@ index 90c3504a414f0a151475cc207285b230fec381b1..870e4d7024066e3e40786bde6c3c39c7 session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/winbind/README b/profiles/winbind/README -index 24e6fc891ab14ac6f7aab7e86a388ae81f615b7f..11f305d5a2f18e82fd8393191e496d25c8a1f7fc 100644 +index b470750ade0b9f943820ddd05208e4a81e2eeed2..d2ed3bcd72fb4fd4b0c29d20a6724b7d4669d20c 100644 --- a/profiles/winbind/README +++ b/profiles/winbind/README -@@ -78,9 +78,6 @@ with-mdns4:: +@@ -83,9 +83,6 @@ with-mdns4:: with-mdns6:: Enable multicast DNS over IPv6. @@ -375,5 +375,5 @@ index 2326c859284c5823c5a6d34390d794dbf33110d2..612143d10fe502d7f6ed636b4fba6cc6 session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid -- -2.52.0 +2.54.0 diff --git a/0902-rhel10-remove-ecryptfs-support.patch b/0902-rhel10-remove-ecryptfs-support.patch index e99fd62..5651491 100644 --- a/0902-rhel10-remove-ecryptfs-support.patch +++ b/0902-rhel10-remove-ecryptfs-support.patch @@ -1,4 +1,4 @@ -From cc9a698d03a581b9e73e532a1020a9533e084329 Mon Sep 17 00:00:00 2001 +From 2238bd5d468276f45367fda96a925b76dccd56df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Mon, 10 Jun 2019 10:53:15 +0200 Subject: [PATCH 2/4] rhel10: remove ecryptfs support @@ -25,7 +25,7 @@ ecryptfs-utils is not present in rhel. 17 files changed, 2 insertions(+), 34 deletions(-) diff --git a/profiles/nis/README b/profiles/nis/README -index 566509f541449cbc9eda9b9f46edd14d3773bb6c..660ebd1e79a7e28da64e8552ac1218b1229d48f5 100644 +index 5fd921abc345eadd702fc175c9a08350a662a9c0..b7d3d98beb408b903f2f3a49631fcb139021797d 100644 --- a/profiles/nis/README +++ b/profiles/nis/README @@ -21,9 +21,6 @@ with-mkhomedir:: @@ -87,7 +87,7 @@ index 40a1bf74aaf3d721c4d720938e57766bfe651e47..74cf6ece9ce0b1b64b122fd2309ebf5d session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/README b/profiles/sssd/README -index 77d94f1890556dc17e0d7dc56f45da41dcf7ef22..ba9b44071a0ca906ad00c09f6fd767ea686efcb5 100644 +index 1c1a0bfdd1ddc7992f21ea86e683a7dc56b538d5..255e305fb27a3aa104776edb3ef72de27adac496 100644 --- a/profiles/sssd/README +++ b/profiles/sssd/README @@ -35,9 +35,6 @@ with-mkhomedir:: @@ -161,7 +161,7 @@ index 870e4d7024066e3e40786bde6c3c39c7ba8d62c0..4ea19acebe2208f9e21676bf0ae0a92e session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/winbind/README b/profiles/winbind/README -index 11f305d5a2f18e82fd8393191e496d25c8a1f7fc..f246fb43bb68f427fa0782d9662af02bcb4bf0ef 100644 +index d2ed3bcd72fb4fd4b0c29d20a6724b7d4669d20c..62ecd04a7e22c7ebabfdbeb7cce3e19eb8c90a36 100644 --- a/profiles/winbind/README +++ b/profiles/winbind/README @@ -33,9 +33,6 @@ with-mkhomedir:: @@ -246,5 +246,5 @@ index 8cc58e60301925974fdb738c5b9a746749981df8..9056913dee9eef1590c8590d3cc0b510 authconfig --enablewinbind --enablewinbindauth --winbindjoin=Administrator --updateall realm join -U Administrator --client-software=winbind WINBINDDOMAIN -- -2.52.0 +2.54.0 diff --git a/0903-rhel10-remove-systemd-resolved.patch b/0903-rhel10-remove-systemd-resolved.patch index a5f5b9d..19644b5 100644 --- a/0903-rhel10-remove-systemd-resolved.patch +++ b/0903-rhel10-remove-systemd-resolved.patch @@ -1,4 +1,4 @@ -From 7b93a32e84845c545ae3a28a6b53a77ea518d727 Mon Sep 17 00:00:00 2001 +From 6c3b60c1f71b7c538371d57289353d1f82d6174a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Fri, 23 Feb 2024 16:01:58 +0100 Subject: [PATCH 3/4] rhel10: remove systemd-resolved @@ -12,57 +12,57 @@ systemd-resolved should not be enabled by default in rhel. 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/local/nsswitch.conf b/profiles/local/nsswitch.conf -index b21d36c64249c08600ec8aca09a92a062d9eb084..bbcbf2b684e9c1e1755c0afd619e2c3b8e9c6b99 100644 +index 2cb92da4f1e5fdd7fc0e14779456b00eb16d57de..d45726d73eb62e3bbce5f049c4fcce188aaabd86 100644 --- a/profiles/local/nsswitch.conf +++ b/profiles/local/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }systemd shadow: files systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd + group: files {if "with-altfiles":altfiles }systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns +hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns services: files netgroup: files automount: files diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf -index f7749d0eb12229aa577dc0a84ef284dad24027c8..2e7b63dd36f46185c513779b09c6123bd7e7a373 100644 +index 061d226c62e85e5782f860527e043ad8bf44c76e..a70ecc24eec4bc93fc58867477a53720007f375e 100644 --- a/profiles/nis/nsswitch.conf +++ b/profiles/nis/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }nis systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }nis systemd shadow: files nis systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd + group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] nis dns +hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }nis dns services: files nis netgroup: files nis automount: files nis diff --git a/profiles/sssd/nsswitch.conf b/profiles/sssd/nsswitch.conf -index b893ee67698d60175ffe6396a12546f5aed97ca7..b8138a3c07e3c54612a0cbf3c0b721bedd821966 100644 +index b7eaf8be6bc7f96a10a5876dd27c70364428c9f8..955048b6b869b41003eb3f57ef6297188da67141 100644 --- a/profiles/sssd/nsswitch.conf +++ b/profiles/sssd/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "with-tlog":sss }systemd +@@ -3,7 +3,7 @@ passwd: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "wi shadow: files systemd - group: {if "with-tlog":sss [SUCCESS=merge] }files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }{if not "with-tlog":sss [SUCCESS=merge] }systemd + group: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "with-tlog":sss }systemd {exclude if "with-group-merging"} + group: {if "with-tlog":sss [SUCCESS=merge] }files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }{if not "with-tlog":sss [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns +hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns services: files sss netgroup: files sss sudoers: files sss {include if "with-sudo"} diff --git a/profiles/winbind/nsswitch.conf b/profiles/winbind/nsswitch.conf -index 6282c1385f687fbeb928567dc8de03c3b7d66a21..c7d57595b0c4e2f8c492b8e4f1a9c56f203337c5 100644 +index 5df6b60f88d7da99be85bef3fb009522fe43abe1..76a0a8a7babc24df949e1d8b246f36a3a2e14d93 100644 --- a/profiles/winbind/nsswitch.conf +++ b/profiles/winbind/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }winbind systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }winbind systemd shadow: files systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }winbind [SUCCESS=merge] systemd + group: files {if "with-altfiles":altfiles }winbind systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }winbind [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns +hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns services: files netgroup: files automount: files -- -2.52.0 +2.54.0 diff --git a/0904-rhel10-move-myhostname-after-dns-to-fix-hostname-fqd.patch b/0904-rhel10-move-myhostname-after-dns-to-fix-hostname-fqd.patch index 384c5f4..a0e8eb4 100644 --- a/0904-rhel10-move-myhostname-after-dns-to-fix-hostname-fqd.patch +++ b/0904-rhel10-move-myhostname-after-dns-to-fix-hostname-fqd.patch @@ -1,4 +1,4 @@ -From abdef39cb04eee5ad2507252f917d0f2e3fdcb5d Mon Sep 17 00:00:00 2001 +From 6d484957b86576101fe25fd013b920fe6b7cd0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Fri, 2 Aug 2024 12:26:38 +0200 Subject: [PATCH 4/4] rhel10: move myhostname after dns to fix hostname --fqdn @@ -16,57 +16,57 @@ in rhel8 and rhel9. 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/local/nsswitch.conf b/profiles/local/nsswitch.conf -index bbcbf2b684e9c1e1755c0afd619e2c3b8e9c6b99..37a13b0e254c01b2b358bd9e85f742ade693d0ce 100644 +index d45726d73eb62e3bbce5f049c4fcce188aaabd86..c24d42d005cc0f54482dd40cae8367b3ec8fbed3 100644 --- a/profiles/local/nsswitch.conf +++ b/profiles/local/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }systemd shadow: files systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd + group: files {if "with-altfiles":altfiles }systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns +hosts: files {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns myhostname services: files netgroup: files automount: files diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf -index 2e7b63dd36f46185c513779b09c6123bd7e7a373..109f44129ef034795ae5585e6a7b2f12f847084b 100644 +index a70ecc24eec4bc93fc58867477a53720007f375e..4eca6f20f7f89ad8a17f0837f3503ae1432fe87b 100644 --- a/profiles/nis/nsswitch.conf +++ b/profiles/nis/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }nis systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }nis systemd shadow: files nis systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd + group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }nis dns +hosts: files {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }nis dns myhostname services: files nis netgroup: files nis automount: files nis diff --git a/profiles/sssd/nsswitch.conf b/profiles/sssd/nsswitch.conf -index b8138a3c07e3c54612a0cbf3c0b721bedd821966..27ccf10befc3fa7e5371459cc9f6f4cd1fcf5d10 100644 +index 955048b6b869b41003eb3f57ef6297188da67141..9322c76b979adc6e41ea6a4d1a04db4a8fd147a3 100644 --- a/profiles/sssd/nsswitch.conf +++ b/profiles/sssd/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "with-tlog":sss }systemd +@@ -3,7 +3,7 @@ passwd: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "wi shadow: files systemd - group: {if "with-tlog":sss [SUCCESS=merge] }files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }{if not "with-tlog":sss [SUCCESS=merge] }systemd + group: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "with-tlog":sss }systemd {exclude if "with-group-merging"} + group: {if "with-tlog":sss [SUCCESS=merge] }files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }{if not "with-tlog":sss [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns +hosts: files {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns myhostname services: files sss netgroup: files sss sudoers: files sss {include if "with-sudo"} diff --git a/profiles/winbind/nsswitch.conf b/profiles/winbind/nsswitch.conf -index c7d57595b0c4e2f8c492b8e4f1a9c56f203337c5..64600c57329459e2fa78c6514f6cc8913e64d23a 100644 +index 76a0a8a7babc24df949e1d8b246f36a3a2e14d93..873538c44e381afe1663f485fd4675d9afe78135 100644 --- a/profiles/winbind/nsswitch.conf +++ b/profiles/winbind/nsswitch.conf -@@ -2,7 +2,7 @@ - passwd: files {if "with-altfiles":altfiles }winbind systemd +@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }winbind systemd shadow: files systemd - group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }winbind [SUCCESS=merge] systemd + group: files {if "with-altfiles":altfiles }winbind systemd {exclude if "with-group-merging"} + group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }winbind [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"} -hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns +hosts: files {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns myhostname services: files netgroup: files automount: files -- -2.52.0 +2.54.0 diff --git a/authselect.spec b/authselect.spec index 89a7917..83bde82 100644 --- a/authselect.spec +++ b/authselect.spec @@ -2,7 +2,7 @@ %define _empty_manifest_terminate_build 0 Name: authselect -Version: 1.5.2 +Version: 1.5.3 Release: %autorelease Summary: Configures authentication and identity sources from supported profiles URL: https://github.com/authselect/authselect diff --git a/sources b/sources index 6cc240f..446c585 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (authselect-1.5.2.tar.gz) = a4dc363ede65740be651ebba328f051be68d60e918c3d67bc95e0bd3a491d555fbeb840c7b11590941f50340ef5bf3c002e3c49e1c73ae2d40a66c5d811a549b +SHA512 (authselect-1.5.3.tar.gz) = 70d2d6a49c698a17340a6bbd1c33121d3f2cb2ec63ce0a3af4428984695f3789cd2c7b9ad952e8954299a487fcb90bb31ca1e4cabc56fddd247d5a31666b13b7