authselect-1.2.7-1: rebase to upstream 1.2.7

Resolves: RHEL-94650, RHEL-156520
This commit is contained in:
Pavel Březina 2026-06-04 12:01:06 +02:00
parent fa167606e0
commit 04431f43dd
12 changed files with 479 additions and 28032 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/authselect-1.2.3.tar.gz
/authselect-1.2.5.tar.gz
/authselect-1.2.6.tar.gz
/authselect-1.2.7.tar.gz

File diff suppressed because it is too large Load Diff

View File

@ -1,48 +0,0 @@
From 9b52842d6b4b6ae0ad1f36d3d731d7afc94338e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Thu, 29 Jun 2023 14:07:25 +0200
Subject: [PATCH 2/8] profiles: do not try to change password via sssd for
local users
Steps to reproduce:
1. Create local user and set passsword
2. Log in as the local user
3. Run passwd and provide wrong password as "Current password"
"Current password" prompt should be printed only once.
Resolves: https://github.com/authselect/authselect/issues/338
(cherry picked from commit c9cc4b23badeb5e2fe3a38fa5b0649b3d7b0a718)
(cherry picked from commit 7fbb0454f2adfd8de44e17e1784eab79fce2232f)
---
profiles/sssd/password-auth | 1 +
profiles/sssd/system-auth | 1 +
2 files changed, 2 insertions(+)
diff --git a/profiles/sssd/password-auth b/profiles/sssd/password-auth
index 5ea280a..7fe23f2 100644
--- a/profiles/sssd/password-auth
+++ b/profiles/sssd/password-auth
@@ -25,6 +25,7 @@ password requisite pam_pwquality.so local_
password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok
+password [success=1 default=ignore] pam_localuser.so
password sufficient pam_sss.so use_authtok
password required pam_deny.so
diff --git a/profiles/sssd/system-auth b/profiles/sssd/system-auth
index fd1e31c..ce2e266 100644
--- a/profiles/sssd/system-auth
+++ b/profiles/sssd/system-auth
@@ -32,6 +32,7 @@ password requisite pam_pwquality.so local_
password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok
+password [success=1 default=ignore] pam_localuser.so
password sufficient pam_sss.so use_authtok
password required pam_deny.so
--
2.40.1

File diff suppressed because it is too large Load Diff

View File

@ -1,61 +0,0 @@
From 5a0b9009755b47253dfd5674f14166d17e27762e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Wed, 29 Jan 2025 13:43:43 +0100
Subject: [PATCH] profiles: merge groups records with [SUCCESS=merge]
Services such as systemd-homed would like to advertise users which are
part of system groups, such as "wheel". That only works if glibc's
[SUCCESS=merge] feature is used in nsswitch.conf, so that group records
from multiple sources are merged.
This is documented here:
https://www.freedesktop.org/software/systemd/man/latest/nss-systemd.html#Configuration%20in%20/etc/nsswitch.conf
This hence adds [SUCCESS=merge] expressions to all NSS modules listed in
the "groups" lines.
This is a backport of 8d8adbd35c741d9038588386414ccbddb99bd31d
(cherry picked from commit 9ee4c249c931bf0d0309ba043f880c08a32b32a1)
---
profiles/minimal/nsswitch.conf | 2 +-
profiles/sssd/nsswitch.conf | 2 +-
profiles/winbind/nsswitch.conf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/profiles/minimal/nsswitch.conf b/profiles/minimal/nsswitch.conf
index a39e4d32ebf79e8bf05f2db5753b01596222dc35..e383b215567d5ed077549f29d12280596699cb19 100644
--- a/profiles/minimal/nsswitch.conf
+++ b/profiles/minimal/nsswitch.conf
@@ -1,7 +1,7 @@
aliases: files {exclude if "with-custom-aliases"}
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"}
+group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd {exclude if "with-custom-group"}
hosts: files dns myhostname {exclude if "with-custom-hosts"}
initgroups: files {exclude if "with-custom-initgroups"}
netgroup: files {exclude if "with-custom-netgroup"}
diff --git a/profiles/sssd/nsswitch.conf b/profiles/sssd/nsswitch.conf
index f9e4e548b184628120decff3a71e2a266bb54f1e..8fa5d2ce7c61cc3db6be8b676cc07aa195b4f231 100644
--- a/profiles/sssd/nsswitch.conf
+++ b/profiles/sssd/nsswitch.conf
@@ -1,5 +1,5 @@
passwd: {if "with-files-domain":sss files|files sss} systemd {exclude if "with-custom-passwd"}
-group: {if "with-files-domain":sss files|files sss} systemd {exclude if "with-custom-group"}
+group: {if "with-files-domain":sss [SUCCESS=merge] files [SUCCESS=merge]|files [SUCCESS=merge] sss [SUCCESS=merge]} systemd {exclude if "with-custom-group"}
netgroup: sss files {exclude if "with-custom-netgroup"}
automount: sss files {exclude if "with-custom-automount"}
services: sss files {exclude if "with-custom-services"}
diff --git a/profiles/winbind/nsswitch.conf b/profiles/winbind/nsswitch.conf
index 8a23bd71935eb26c5093e4b2080b1d91b6de5582..5446d804d5904ae71177bf4bd715dde04a2be3a3 100644
--- a/profiles/winbind/nsswitch.conf
+++ b/profiles/winbind/nsswitch.conf
@@ -1,2 +1,2 @@
passwd: files winbind systemd {exclude if "with-custom-passwd"}
-group: files winbind systemd {exclude if "with-custom-group"}
+group: files [SUCCESS=merge] winbind [SUCCESS=merge] systemd {exclude if "with-custom-group"}
--
2.48.1

View File

@ -1,18 +1,23 @@
From c3c2c3b7ffe04dc2e810c9fffdd82689543a94df Mon Sep 17 00:00:00 2001
From 2923cc2f9773d299e619b11bd77b7594607b4fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Tue, 30 Oct 2018 14:08:12 +0100
Subject: [PATCH 1/4] rhel9: remove mention of Fedora Change page in compat
Subject: [PATCH 1/5] rhel9: remove mention of Fedora Change page in compat
tool
Patch-name: 0901-rhel9-remove-mention-of-Fedora-Change-page-in-compat.patch
Patch-id: 901
Patch-status: |
# ## Downstream Patches ###
From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
---
src/compat/authcompat.py.in.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/compat/authcompat.py.in.in b/src/compat/authcompat.py.in.in
index 1a68d95c71b51beabe80e9b07c084ea9c2f3580d..8334293911d1d4c2d98a6d233b91fc348cf06575 100755
index 6bea49829410e280ea06d19e265bad552ac93b02..4beb1b8c1dee4b22c7943d029be04f5ba34d75e7 100755
--- a/src/compat/authcompat.py.in.in
+++ b/src/compat/authcompat.py.in.in
@@ -471,7 +471,6 @@ class AuthCompat:
@@ -472,7 +472,6 @@ class AuthCompat:
"It does not provide all capabilities of authconfig.\n"))
print(_("IMPORTANT: authconfig is replaced by authselect, "
"please update your scripts."))
@ -21,5 +26,5 @@ index 1a68d95c71b51beabe80e9b07c084ea9c2f3580d..8334293911d1d4c2d98a6d233b91fc34
options = self.options.getSetButUnsupported()
--
2.34.1
2.54.0

View File

@ -1,8 +1,11 @@
From 9da7355f1e2c8a148d4730fec4c4707c56e6dfa1 Mon Sep 17 00:00:00 2001
From cba8255c22d9a0a6de4bd1ec5c5a134c434488c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Mon, 10 Jun 2019 10:53:15 +0200
Subject: [PATCH 2/4] rhel9: remove ecryptfs support
Subject: [PATCH 2/5] rhel9: remove ecryptfs support
Patch-name: 0902-rhel9-remove-ecryptfs-support.patch
Patch-id: 902
From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
---
profiles/nis/README | 3 ---
profiles/nis/fingerprint-auth | 1 -
@ -26,7 +29,7 @@ Subject: [PATCH 2/4] rhel9: remove ecryptfs support
19 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/profiles/nis/README b/profiles/nis/README
index 895e8fa8650c04d41bf8bc8d6e3cda18db9bf814..71e23d61a8c1ea773c98524256a5eaad5a75d197 100644
index 46a4b1c2b47b15a11e760e830a68255555cc0ca2..a741e4c44e927c81861ceeb0129ad8d0c91509fb 100644
--- a/profiles/nis/README
+++ b/profiles/nis/README
@@ -21,9 +21,6 @@ with-mkhomedir::
@ -52,10 +55,10 @@ index 3a2609df4ca29cdfcbff84b37576bb7b840d72b2..0b2f583a2fcf164647f7de387e9be298
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/password-auth b/profiles/nis/password-auth
index f181a58ab7792c7e1a4234e677cbb7e3d0a6548d..79fb521eb5dff4978203166491b185887d1ec744 100644
index 927fbcbda8fa4e910e29c88a3806fb5265bbc7bc..56a51d9eebb2987da340805ddb4e4a6752ebdeb2 100644
--- a/profiles/nis/password-auth
+++ b/profiles/nis/password-auth
@@ -18,7 +18,6 @@ password required pam_deny.so
@@ -20,7 +20,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -76,10 +79,10 @@ index 137cd00dc65ee9ea83123f1d3a6f7ba04f0aea04..04a11f049bc1e220c9064fba7b46eb24
session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet
session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed}
diff --git a/profiles/nis/system-auth b/profiles/nis/system-auth
index bc3f402435aafb5294dbae94096b184af51cf914..38c10c1afcf936c1d24d8edef941ae849d1186fc 100644
index 40a1bf74aaf3d721c4d720938e57766bfe651e47..74cf6ece9ce0b1b64b122fd2309ebf5d496c4787 100644
--- a/profiles/nis/system-auth
+++ b/profiles/nis/system-auth
@@ -19,7 +19,6 @@ password required pam_deny.so
@@ -21,7 +21,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -88,10 +91,10 @@ index bc3f402435aafb5294dbae94096b184af51cf914..38c10c1afcf936c1d24d8edef941ae84
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 61d5aedf65b2351cf23cea0a6b6b0932e32f0e48..ab9af237442089ded86b63942dd856397108ccf0 100644
index 3c0bcfd365e87b86cf31d2bb3067f750d7a499c4..baa5f904b5934687751cc1626326826fb3c63399 100644
--- a/profiles/sssd/README
+++ b/profiles/sssd/README
@@ -40,9 +40,6 @@ with-mkhomedir::
@@ -35,9 +35,6 @@ with-mkhomedir::
Enable automatic creation of home directories for users on their
first login.
@ -114,10 +117,10 @@ index 20ad3613e66ec85c7d2462d0449854e522383b3a..dc7befe7a4839a1ae5a4d21f4e523212
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/password-auth b/profiles/sssd/password-auth
index 3e33dcc09f68055f2f87709e638005929bd577b3..858c6db357d07dc554806f4807f9b0858a649f44 100644
index 7fe23f2312e5c34586aad31fbe79aa5409c49b78..5b235de810a838d3002013a68a85995a15ab1a8f 100644
--- a/profiles/sssd/password-auth
+++ b/profiles/sssd/password-auth
@@ -28,7 +28,6 @@ password required pam_deny.so
@@ -31,7 +31,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -150,10 +153,10 @@ index 0d8bcab250633b09bce0232a5747f3a7e740d5d7..754847f2d8885ff35cbc57ec2364d82b
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/system-auth b/profiles/sssd/system-auth
index a43341120f55bad3fb07dfea1c04453d0a278329..88c49e2dd5b60847d1d19154622a8614a21e5e1f 100644
index ce2e266146aaefbdbc6ef58a1566f36655dfb6b4..22e87d8f4ee64a4ad69d547873ae833de6ac5c41 100644
--- a/profiles/sssd/system-auth
+++ b/profiles/sssd/system-auth
@@ -35,7 +35,6 @@ password required pam_deny.so
@@ -38,7 +38,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -162,7 +165,7 @@ index a43341120f55bad3fb07dfea1c04453d0a278329..88c49e2dd5b60847d1d19154622a8614
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 0048c29256f5d4064edfb84a2f4b761fd09e90f6..6f7a7cab1efc768c4c82791d6a8f00def1771d37 100644
index 929e0cdc10b55816d14c82ca1b0f6b186e108e7b..160622af9fe9daa10291b4374a67c111efbe385a 100644
--- a/profiles/winbind/README
+++ b/profiles/winbind/README
@@ -33,9 +33,6 @@ with-mkhomedir::
@ -188,10 +191,10 @@ index e8997c6c78ce7305fa7068fb169c05c68167880d..c5485ab848989a252e4ff4b1376a4120
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/password-auth b/profiles/winbind/password-auth
index 58705f3b15165c8d8bd4938889e3fb4d89c1a528..e84e2fcbb2bad9af6156e6e6db23f089f2b5d210 100644
index 8d1682b9301c2b9c92292a41120f69611f148108..8b260fa06f5ed8494d1f6fac74517d3a54622693 100644
--- a/profiles/winbind/password-auth
+++ b/profiles/winbind/password-auth
@@ -25,7 +25,6 @@ password required pam_deny.so
@@ -27,7 +27,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -212,10 +215,10 @@ index 137cd00dc65ee9ea83123f1d3a6f7ba04f0aea04..04a11f049bc1e220c9064fba7b46eb24
session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet
session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed}
diff --git a/profiles/winbind/system-auth b/profiles/winbind/system-auth
index 994c342441a0ed2738765a9fa7f6cc84f692d1d8..b5c5cfaa964a31b1cd8ac4cb62998c0a0a53a03e 100644
index 612143d10fe502d7f6ed636b4fba6cc639aa66b0..33aa13efb92405393236c3511ebb351facd916f0 100644
--- a/profiles/winbind/system-auth
+++ b/profiles/winbind/system-auth
@@ -26,7 +26,6 @@ password required pam_deny.so
@@ -28,7 +28,6 @@ password required pam_deny.so
session optional pam_keyinit.so revoke
session required pam_limits.so
@ -224,10 +227,10 @@ index 994c342441a0ed2738765a9fa7f6cc84f692d1d8..b5c5cfaa964a31b1cd8ac4cb62998c0a
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/src/compat/authcompat.py.in.in b/src/compat/authcompat.py.in.in
index 8334293911d1d4c2d98a6d233b91fc348cf06575..55e205bae2c0b1f7892f8b286c288dfeaa26a60d 100755
index 4beb1b8c1dee4b22c7943d029be04f5ba34d75e7..7d7a2810986fa54597258923a18c82386cdd2c37 100755
--- a/src/compat/authcompat.py.in.in
+++ b/src/compat/authcompat.py.in.in
@@ -523,7 +523,6 @@ class AuthCompat:
@@ -524,7 +524,6 @@ class AuthCompat:
'smartcard': 'with-smartcard',
'requiresmartcard': 'with-smartcard-required',
'fingerprint': 'with-fingerprint',
@ -279,5 +282,5 @@ index 3513a7e7cd3d7cc0045167e8224248c5be90ab2c..888cd4e5a0750d4e1aa5898887f5f7fd
authconfig --enablewinbind --enablewinbindauth --winbindjoin=Administrator --updateall
realm join -U Administrator --client-software=winbind WINBINDDOMAIN
--
2.34.1
2.54.0

View File

@ -1,42 +1,46 @@
From 6381b49e90b3850fade68c8af03b17d0cc016d3c Mon Sep 17 00:00:00 2001
From 1013f9754c376aec255960b9e82080172f618486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Wed, 25 Nov 2020 14:05:00 +0100
Subject: [PATCH 3/4] rhel9: Revert "profiles: add support for resolved"
Subject: [PATCH 3/5] rhel9: Revert "profiles: add support for resolved"
systemd-resolved should not be enabled by default on rhel8.
This reverts commit c5294c508a940291440eb32d5d750f33baf1ae54.
Patch-name: 0903-rhel9-Revert-profiles-add-support-for-resolved.patch
Patch-id: 903
From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
---
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
index 82dd45f1eaf6623f97199079c48c80515b156afc..112236e326b10cd74b304827dd241c0d8b5f34e2 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"}
@@ -3,7 +3,7 @@ automount: files {exclude if "with-custom
ethers: files {exclude if "with-custom-ethers"}
group: files {if "with-altfiles":altfiles }systemd {exclude if "with-custom-group"}
group: files {if "with-altfiles":altfiles }systemd {exclude if "with-custom-group"} {exclude if "with-group-merging"}
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd {exclude if "with-custom-group"} {include if "with-group-merging"}
-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
index c395b9670c48fd5f95160a5765b176c3382cd967..5fc8292c238ef474ef646b3da57f51355f5d0cb3 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"}
@@ -3,7 +3,7 @@ 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"}
group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-custom-group"} {exclude if "with-group-merging"}
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd {exclude if "with-custom-group"} {include if "with-group-merging"}
-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.34.1
2.54.0

View File

@ -1,30 +1,44 @@
From fde1c60f1e87383596ee7060f4d748675b2efae9 Mon Sep 17 00:00:00 2001
From 7027cd82fc5d2a9a455b0d9af091d97004bf29a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Wed, 9 Jun 2021 13:59:01 +0200
Subject: [PATCH 4/4] rhel9: remove nis support
Subject: [PATCH 4/5] rhel9: remove nis support
NIS is no longer supported in RHEL9.
---
profiles/Makefile.am | 14 -----
profiles/nis/dconf-db | 3 -
profiles/nis/dconf-locks | 2 -
profiles/nis/nsswitch.conf | 14 -----
profiles/nis/postlogin | 4 --
rpm/authselect.spec.in | 11 ----
src/compat/authcompat.py.in.in | 95 -----------------------------
src/compat/authcompat_Options.py | 8 ++-
src/man/authselect-migration.7.adoc | 2 +-
9 files changed, 6 insertions(+), 147 deletions(-)
profiles/Makefile.am | 15 ----
profiles/nis/README | 125 ----------------------------
profiles/nis/REQUIREMENTS | 16 ----
profiles/nis/dconf-db | 4 -
profiles/nis/dconf-locks | 3 -
profiles/nis/fingerprint-auth | 22 -----
profiles/nis/nsswitch.conf | 15 ----
profiles/nis/password-auth | 27 ------
profiles/nis/postlogin | 4 -
profiles/nis/smartcard-auth | 1 -
profiles/nis/switchable-auth | 1 -
profiles/nis/system-auth | 28 -------
rpm/authselect.spec.in | 12 ---
src/compat/authcompat.py.in.in | 95 ---------------------
src/compat/authcompat_Options.py | 8 +-
src/man/authselect-migration.7.adoc | 2 +-
16 files changed, 6 insertions(+), 372 deletions(-)
delete mode 100644 profiles/nis/README
delete mode 100644 profiles/nis/REQUIREMENTS
delete mode 100644 profiles/nis/dconf-db
delete mode 100644 profiles/nis/dconf-locks
delete mode 100644 profiles/nis/fingerprint-auth
delete mode 100644 profiles/nis/nsswitch.conf
delete mode 100644 profiles/nis/password-auth
delete mode 100644 profiles/nis/postlogin
delete mode 100644 profiles/nis/smartcard-auth
delete mode 100644 profiles/nis/switchable-auth
delete mode 100644 profiles/nis/system-auth
diff --git a/profiles/Makefile.am b/profiles/Makefile.am
index 7191b2604ca2c9ebaba3a4f1beb950e7d0e03970..4ab613f42a581df02c427636a0070092b58ec418 100644
index d7f687a85f1091380f875b19de6c4c88ec060746..eab4b87ba21c995dd5eef4bb03f96da5b5093464 100644
--- a/profiles/Makefile.am
+++ b/profiles/Makefile.am
@@ -15,20 +15,6 @@ dist_profile_minimal_DATA = \
@@ -16,21 +16,6 @@ dist_profile_minimal_DATA = \
$(top_srcdir)/profiles/minimal/dconf-locks \
$(NULL)
@ -36,6 +50,7 @@ index 7191b2604ca2c9ebaba3a4f1beb950e7d0e03970..4ab613f42a581df02c427636a0070092
- $(top_srcdir)/profiles/nis/README \
- $(top_srcdir)/profiles/nis/REQUIREMENTS \
- $(top_srcdir)/profiles/nis/smartcard-auth \
- $(top_srcdir)/profiles/nis/switchable-auth \
- $(top_srcdir)/profiles/nis/system-auth \
- $(top_srcdir)/profiles/nis/fingerprint-auth \
- $(top_srcdir)/profiles/nis/dconf-db \
@ -45,43 +60,260 @@ index 7191b2604ca2c9ebaba3a4f1beb950e7d0e03970..4ab613f42a581df02c427636a0070092
profile_sssddir = $(authselect_profile_dir)/sssd
dist_profile_sssd_DATA = \
$(top_srcdir)/profiles/sssd/nsswitch.conf \
diff --git a/profiles/nis/README b/profiles/nis/README
deleted file mode 100644
index a741e4c44e927c81861ceeb0129ad8d0c91509fb..0000000000000000000000000000000000000000
--- a/profiles/nis/README
+++ /dev/null
@@ -1,125 +0,0 @@
-Enable NIS for system authentication
-====================================
-
-Selecting this profile will enable Network Information Services as the source
-of identity and authentication providers.
-
-NIS CONFIGURATION
------------------
-
-Authselect does not touch NIS configuration. Please, read NIS' documentation
-to see how to configure it manually.
-
-AVAILABLE OPTIONAL FEATURES
----------------------------
-
-with-faillock::
- Enable account locking in case of too many consecutive
- authentication failures.
-
-with-mkhomedir::
- Enable automatic creation of home directories for users on their
- first login.
-
-with-fingerprint::
- Enable authentication with fingerprint reader through *pam_fprintd*.
-
-with-pam-gnome-keyring::
- Enable pam-gnome-keyring support.
-
-with-pam-u2f::
- Enable authentication via u2f dongle through *pam_u2f*.
-
-with-pam-u2f-2fa::
- Enable 2nd factor authentication via u2f dongle through *pam_u2f*.
-
-without-pam-u2f-nouserok::
- Module argument nouserok is omitted if also with-pam-u2f-2fa is used.
- *WARNING*: Omitting nouserok argument means that users without pam-u2f
- authentication configured will not be able to log in *INCLUDING* root.
- Make sure you are able to log in before losing root privileges.
-
-with-silent-lastlog::
- Do not produce pam_lastlog message during login.
-
-with-pamaccess::
- Check access.conf during account authorization.
-
-with-pwhistory::
- Enable pam_pwhistory module for local users.
-
-with-altfiles::
- Use nss_altfiles for passwd and group nsswitch databases.
-
-with-nispwquality::
- If this option is set pam_pwquality module will check password quality
- for NIS users as well as local users during password change. Without this
- option only local users passwords are checked.
-
-with-group-merging::
- Enable merging of group records from multiple NSS sources using
- [SUCCESS=merge]. Required for services like systemd-homed that
- advertise users as part of system groups.
-
-without-nullok::
- Do not add nullok parameter to pam_unix.
-
-DISABLE SPECIFIC NSSWITCH DATABASES
------------------------------------
-
-Normally, nsswitch databases set by the profile overwrites values set in
-user-nsswitch.conf. The following options can force authselect to
-ignore value set by the profile and use the one set in user-nsswitch.conf
-instead.
-
-with-custom-aliases::
-Ignore "aliases" map set by the profile.
-
-with-custom-automount::
-Ignore "automount" map set by the profile.
-
-with-custom-ethers::
-Ignore "ethers" map set by the profile.
-
-with-custom-group::
-Ignore "group" map set by the profile.
-
-with-custom-hosts::
-Ignore "hosts" map set by the profile.
-
-with-custom-initgroups::
-Ignore "initgroups" map set by the profile.
-
-with-custom-netgroup::
-Ignore "netgroup" map set by the profile.
-
-with-custom-networks::
-Ignore "networks" map set by the profile.
-
-with-custom-passwd::
-Ignore "passwd" map set by the profile.
-
-with-custom-protocols::
-Ignore "protocols" map set by the profile.
-
-with-custom-publickey::
-Ignore "publickey" map set by the profile.
-
-with-custom-rpc::
-Ignore "rpc" map set by the profile.
-
-with-custom-services::
-Ignore "services" map set by the profile.
-
-with-custom-shadow::
-Ignore "shadow" map set by the profile.
-
-EXAMPLES
---------
-* Enable NIS with no additional modules
-
- authselect select nis
-
-* Enable NIS and create home directories for users on their first login
-
- authselect select nis with-mkhomedir
diff --git a/profiles/nis/REQUIREMENTS b/profiles/nis/REQUIREMENTS
deleted file mode 100644
index 1d31137bd97af19d8e4740019769c8387f5c8130..0000000000000000000000000000000000000000
--- a/profiles/nis/REQUIREMENTS
+++ /dev/null
@@ -1,16 +0,0 @@
-Make sure that NIS service is configured and enabled. See NIS documentation for more information.
- {include if "with-fingerprint"}
-- with-fingerprint is selected, make sure fprintd service is configured and enabled {include if "with-fingerprint"}
- {include if "with-pam-u2f"}
-- with-pam-u2f is selected, make sure that the pam u2f module is installed {include if "with-pam-u2f"}
- - users can then configure keys using the pamu2fcfg tool {include if "with-pam-u2f"}
- {include if "with-pam-gnome-keyring"}
-- with-pam-gnome-keyring is selected, make sure the pam_gnome_keyring module {include if "with-pam-gnome-keyring"}
- is present. {include if "with-pam-gnome-keyring"}
- {include if "with-pam-u2f-2fa"}
-- with-pam-u2f-2fa is selected, make sure that the pam u2f module is installed {include if "with-pam-u2f-2fa"}
- - users can then configure keys using the pamu2fcfg tool {include if "with-pam-u2f-2fa"}
- {include if "with-mkhomedir"}
-- with-mkhomedir is selected, make sure pam_oddjob_mkhomedir module {include if "with-mkhomedir"}
- is present and oddjobd service is enabled and active {include if "with-mkhomedir"}
- - systemctl enable --now oddjobd.service {include if "with-mkhomedir"}
diff --git a/profiles/nis/dconf-db b/profiles/nis/dconf-db
deleted file mode 100644
index bd32b2819f66acdc75ab0fc522ec85673d10ed72..0000000000000000000000000000000000000000
index 92652ddc7c1a39ffe7094704205f1a3c06b87938..0000000000000000000000000000000000000000
--- a/profiles/nis/dconf-db
+++ /dev/null
@@ -1,3 +0,0 @@
@@ -1,4 +0,0 @@
-[org/gnome/login-screen]
-enable-smartcard-authentication=false
-enable-fingerprint-authentication={if "with-fingerprint":true|false}
-enable-switchable-authentication=false
diff --git a/profiles/nis/dconf-locks b/profiles/nis/dconf-locks
deleted file mode 100644
index 8a36fa9568344338272786394aece872185d0ab3..0000000000000000000000000000000000000000
index 6e8112a310f1653be1a47cc7889a716a68f6974b..0000000000000000000000000000000000000000
--- a/profiles/nis/dconf-locks
+++ /dev/null
@@ -1,2 +0,0 @@
@@ -1,3 +0,0 @@
-/org/gnome/login-screen/enable-smartcard-authentication
-/org/gnome/login-screen/enable-fingerprint-authentication
-/org/gnome/login-screen/enable-switchable-authentication
diff --git a/profiles/nis/fingerprint-auth b/profiles/nis/fingerprint-auth
deleted file mode 100644
index 0b2f583a2fcf164647f7de387e9be2982bdf36cb..0000000000000000000000000000000000000000
--- a/profiles/nis/fingerprint-auth
+++ /dev/null
@@ -1,22 +0,0 @@
-auth required pam_debug.so auth=authinfo_unavail {exclude if "with-fingerprint"}
-{continue if "with-fingerprint"}
-auth required pam_env.so
-auth required pam_faillock.so preauth silent {include if "with-faillock"}
-auth [success=done default=bad] pam_fprintd.so
-auth required pam_faillock.so authfail {include if "with-faillock"}
-auth optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
-auth required pam_deny.so
-
-account required pam_access.so {include if "with-pamaccess"}
-account required pam_faillock.so {include if "with-faillock"}
-account required pam_unix.so broken_shadow
-
-password required pam_deny.so
-
-session optional pam_keyinit.so revoke
-session required pam_limits.so
--session optional pam_systemd.so
-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
-session required pam_unix.so
-session optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf
deleted file mode 100644
index 9bee7d839f84ff39d54cb6ead9dea38e51736b4d..0000000000000000000000000000000000000000
index 5fc8292c238ef474ef646b3da57f51355f5d0cb3..0000000000000000000000000000000000000000
--- a/profiles/nis/nsswitch.conf
+++ /dev/null
@@ -1,14 +0,0 @@
@@ -1,15 +0,0 @@
-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"}
-group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-custom-group"} {exclude if "with-group-merging"}
-group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd {exclude if "with-custom-group"} {include if "with-group-merging"}
-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"}
-passwd: files nis systemd {exclude if "with-custom-passwd"}
-passwd: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-custom-passwd"}
-protocols: files nis {exclude if "with-custom-protocols"}
-publickey: files nis {exclude if "with-custom-publickey"}
-rpc: files nis {exclude if "with-custom-rpc"}
-services: files nis {exclude if "with-custom-services"}
-shadow: files nis {exclude if "with-custom-shadow"}
diff --git a/profiles/nis/password-auth b/profiles/nis/password-auth
deleted file mode 100644
index 56a51d9eebb2987da340805ddb4e4a6752ebdeb2..0000000000000000000000000000000000000000
--- a/profiles/nis/password-auth
+++ /dev/null
@@ -1,27 +0,0 @@
-auth required pam_env.so
-auth required pam_faildelay.so delay=2000000
-auth required pam_faillock.so preauth silent {include if "with-faillock"}
-auth sufficient pam_u2f.so cue {include if "with-pam-u2f"}
-auth required pam_u2f.so cue {if not "without-pam-u2f-nouserok":nouserok} {include if "with-pam-u2f-2fa"}
-auth sufficient pam_unix.so {if not "without-nullok":nullok}
-auth required pam_faillock.so authfail {include if "with-faillock"}
-auth optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
-auth required pam_deny.so
-
-account required pam_access.so {include if "with-pamaccess"}
-account required pam_faillock.so {include if "with-faillock"}
-account required pam_unix.so broken_shadow
-
-password requisite pam_pwquality.so {if not "with-nispwquality":local_users_only}
-password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
-password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
-password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok nis
-password required pam_deny.so
-
-session optional pam_keyinit.so revoke
-session required pam_limits.so
--session optional pam_systemd.so
-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
-session required pam_unix.so
-session optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
diff --git a/profiles/nis/postlogin b/profiles/nis/postlogin
deleted file mode 100644
index 04a11f049bc1e220c9064fba7b46eb243ddd4996..0000000000000000000000000000000000000000
@ -92,8 +324,56 @@ index 04a11f049bc1e220c9064fba7b46eb243ddd4996..00000000000000000000000000000000
-session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet
-session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed}
-session optional pam_lastlog.so silent noupdate showfailed
diff --git a/profiles/nis/smartcard-auth b/profiles/nis/smartcard-auth
deleted file mode 100644
index 5fc13165a5bcb70b4ca1281915d85c33e4755b00..0000000000000000000000000000000000000000
--- a/profiles/nis/smartcard-auth
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_debug.so auth=authinfo_unavail
diff --git a/profiles/nis/switchable-auth b/profiles/nis/switchable-auth
deleted file mode 100644
index 5fc13165a5bcb70b4ca1281915d85c33e4755b00..0000000000000000000000000000000000000000
--- a/profiles/nis/switchable-auth
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_debug.so auth=authinfo_unavail
diff --git a/profiles/nis/system-auth b/profiles/nis/system-auth
deleted file mode 100644
index 74cf6ece9ce0b1b64b122fd2309ebf5d496c4787..0000000000000000000000000000000000000000
--- a/profiles/nis/system-auth
+++ /dev/null
@@ -1,28 +0,0 @@
-auth required pam_env.so
-auth required pam_faildelay.so delay=2000000
-auth required pam_faillock.so preauth silent {include if "with-faillock"}
-auth sufficient pam_fprintd.so {include if "with-fingerprint"}
-auth sufficient pam_u2f.so cue {include if "with-pam-u2f"}
-auth required pam_u2f.so cue {if not "without-pam-u2f-nouserok":nouserok} {include if "with-pam-u2f-2fa"}
-auth sufficient pam_unix.so {if not "without-nullok":nullok}
-auth required pam_faillock.so authfail {include if "with-faillock"}
-auth optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
-auth required pam_deny.so
-
-account required pam_access.so {include if "with-pamaccess"}
-account required pam_faillock.so {include if "with-faillock"}
-account required pam_unix.so broken_shadow
-
-password requisite pam_pwquality.so {if not "with-nispwquality":local_users_only}
-password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
-password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
-password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok nis
-password required pam_deny.so
-
-session optional pam_keyinit.so revoke
-session required pam_limits.so
--session optional pam_systemd.so
-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
-session required pam_unix.so
-session optional pam_gnome_keyring.so only_if=login auto_start {include if "with-pam-gnome-keyring"}
diff --git a/rpm/authselect.spec.in b/rpm/authselect.spec.in
index f8539d5a028da1a7184b47609a8efdb5ce0be14e..95da183a41a29f7913a0a255a94070908ed9a66c 100644
index 1ce71e6b8ad9e6959529f9a51d971bf7d2804e30..c1b075e4bc883b51fb8c98ef6aba7ae1a5423017 100644
--- a/rpm/authselect.spec.in
+++ b/rpm/authselect.spec.in
@@ -165,7 +165,6 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
@ -104,9 +384,9 @@ index f8539d5a028da1a7184b47609a8efdb5ce0be14e..95da183a41a29f7913a0a255a9407090
%dir %{_datadir}/authselect/default/sssd/
%dir %{_datadir}/authselect/default/winbind/
%{_datadir}/authselect/default/minimal/dconf-db
@@ -178,16 +177,6 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
%{_datadir}/authselect/default/minimal/REQUIREMENTS
@@ -179,17 +178,6 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
%{_datadir}/authselect/default/minimal/smartcard-auth
%{_datadir}/authselect/default/minimal/switchable-auth
%{_datadir}/authselect/default/minimal/system-auth
-%{_datadir}/authselect/default/nis/dconf-db
-%{_datadir}/authselect/default/nis/dconf-locks
@ -117,12 +397,13 @@ index f8539d5a028da1a7184b47609a8efdb5ce0be14e..95da183a41a29f7913a0a255a9407090
-%{_datadir}/authselect/default/nis/README
-%{_datadir}/authselect/default/nis/REQUIREMENTS
-%{_datadir}/authselect/default/nis/smartcard-auth
-%{_datadir}/authselect/default/nis/switchable-auth
-%{_datadir}/authselect/default/nis/system-auth
%{_datadir}/authselect/default/sssd/dconf-db
%{_datadir}/authselect/default/sssd/dconf-locks
%{_datadir}/authselect/default/sssd/fingerprint-auth
diff --git a/src/compat/authcompat.py.in.in b/src/compat/authcompat.py.in.in
index 55e205bae2c0b1f7892f8b286c288dfeaa26a60d..c6d1f2786c233f7ebdbfe5f2503aa0016012aee0 100755
index 7d7a2810986fa54597258923a18c82386cdd2c37..7c5239681ef3210517bd5290e675a74be220ba91 100755
--- a/src/compat/authcompat.py.in.in
+++ b/src/compat/authcompat.py.in.in
@@ -243,20 +243,6 @@ class Configuration:
@ -146,7 +427,7 @@ index 55e205bae2c0b1f7892f8b286c288dfeaa26a60d..c6d1f2786c233f7ebdbfe5f2503aa001
class SSSD(Base):
def __init__(self, options):
super(Configuration.SSSD, self).__init__(options, ServiceName="sssd")
@@ -378,83 +364,6 @@ class Configuration:
@@ -379,83 +365,6 @@ class Configuration:
# other applications may depend on it.
return
@ -230,7 +511,7 @@ index 55e205bae2c0b1f7892f8b286c288dfeaa26a60d..c6d1f2786c233f7ebdbfe5f2503aa001
class AuthCompat:
def __init__(self):
self.sysconfig = EnvironmentFile(Path.System('authconfig'))
@@ -538,8 +447,6 @@ class AuthCompat:
@@ -539,8 +448,6 @@ class AuthCompat:
or self.options.getBool("sssd")
or self.options.getBool("sssdauth")):
profile = "sssd"
@ -239,7 +520,7 @@ index 55e205bae2c0b1f7892f8b286c288dfeaa26a60d..c6d1f2786c233f7ebdbfe5f2503aa001
elif self.options.getBool("winbind"):
profile = "winbind"
@@ -596,13 +503,11 @@ class AuthCompat:
@@ -597,13 +504,11 @@ class AuthCompat:
def writeConfiguration(self):
configs = [
Configuration.LDAP(self.options),
@ -293,5 +574,5 @@ index 888cd4e5a0750d4e1aa5898887f5f7fd42472741..d9777b9b473859d7ec532f39f7e14bd8
.Relation of authconfig options to authselect profile features
--
2.34.1
2.54.0

View File

@ -1,16 +1,16 @@
From f222ccb9f4d0ec1021d3117e9b91b3317722a3fe Mon Sep 17 00:00:00 2001
From 244c5f2bfb48341a21f31793b45655c259bc36ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Mon, 5 Dec 2022 19:03:00 +0100
Subject: [PATCH 8/8] rhel9: Revert yescrypt
Subject: [PATCH 5/5] rhel9: Revert yescrypt
(cherry picked from commit a5d390b6c2a98854c6b5a53f49e3e76e86d7eb28)
Patch-name: 0905-rhel9-Revert-yescrypt.patch
Patch-id: 905
From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
---
po/af.po | 2 +-
po/af.po | 4 ++--
po/authselect.pot | 2 +-
po/ca.po | 2 +-
po/ca.po | 4 ++--
po/cs.po | 4 ++--
po/de.po | 4 ++--
po/es.po | 4 ++--
@ -18,14 +18,14 @@ From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
po/fi.po | 4 ++--
po/fr.po | 4 ++--
po/hu.po | 4 ++--
po/id.po | 2 +-
po/id.po | 4 ++--
po/it.po | 4 ++--
po/ja.po | 4 ++--
po/ka.po | 4 ++--
po/ko.po | 4 ++--
po/nl.po | 4 ++--
po/pl.po | 4 ++--
po/pt.po | 2 +-
po/pt.po | 4 ++--
po/pt_BR.po | 4 ++--
po/ru.po | 4 ++--
po/si.po | 2 +-
@ -36,8 +36,6 @@ From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
po/zh_TW.po | 4 ++--
profiles/minimal/password-auth | 2 +-
profiles/minimal/system-auth | 2 +-
profiles/nis/password-auth | 2 +-
profiles/nis/system-auth | 2 +-
profiles/sssd/password-auth | 2 +-
profiles/sssd/system-auth | 2 +-
profiles/winbind/password-auth | 2 +-
@ -54,7 +52,7 @@ From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
src/man/po/authselect-migration.7.adoc.hu.po | 2 +-
src/man/po/authselect-migration.7.adoc.it.po | 2 +-
src/man/po/authselect-migration.7.adoc.ja.po | 4 ++--
src/man/po/authselect-migration.7.adoc.ko.po | 4 ++--
src/man/po/authselect-migration.7.adoc.ko.po | 6 +++---
src/man/po/authselect-migration.7.adoc.nl.po | 4 ++--
src/man/po/authselect-migration.7.adoc.pl.po | 2 +-
src/man/po/authselect-migration.7.adoc.pot | 2 +-
@ -67,23 +65,25 @@ From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
src/man/po/authselect-migration.7.adoc.uk.po | 4 ++--
src/man/po/authselect-migration.7.adoc.zh_CN.po | 2 +-
src/man/po/authselect-migration.7.adoc.zh_TW.po | 2 +-
59 files changed, 87 insertions(+), 87 deletions(-)
57 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/po/af.po b/po/af.po
index e305029..b4f0418 100644
index b72dce8683fa84e2a71d7a79796c7cbb5d6fde96..0b93ceaa18acdf3419a63ba386a54e51a3dc0ed2 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1575,7 +1575,7 @@ msgid "<name>"
msgstr ""
@@ -1581,8 +1581,8 @@ msgid "<name>"
msgstr "<naam>"
#: src/compat/authcompat_Options.py:148
-msgid "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
-msgstr "<ontsyfer|bigcrypt|md5|sha256|sha512|yescrypt>"
+msgid "<descrypt|bigcrypt|md5|sha256|sha512>"
msgstr ""
+msgstr "<ontsyfer|bigcrypt|md5|sha256|sha512>"
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/authselect.pot b/po/authselect.pot
index ebb39b0..c308071 100644
index ebb39b01c03715ee9838421e4a433741d87ab901..c30807134393315fde32054aa174b870abfdfc4a 100644
--- a/po/authselect.pot
+++ b/po/authselect.pot
@@ -1535,7 +1535,7 @@ msgid "<name>"
@ -96,20 +96,22 @@ index ebb39b0..c308071 100644
#: src/compat/authcompat_Options.py:149
diff --git a/po/ca.po b/po/ca.po
index 3373e10..75d91ec 100644
index 943567b31873a7f81f10259fa75984850e475eb1..9bf555a5d35f0bdf25eebe1e18dcd28e4df3721d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1569,7 +1569,7 @@ msgid "<name>"
msgstr ""
@@ -1607,8 +1607,8 @@ msgid "<name>"
msgstr "<nom>"
#: src/compat/authcompat_Options.py:148
-msgid "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
-msgstr "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
+msgid "<descrypt|bigcrypt|md5|sha256|sha512>"
msgstr ""
+msgstr "<descrypt|bigcrypt|md5|sha256|sha512>"
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/cs.po b/po/cs.po
index 48929b6..b9150b7 100644
index 0ae114698ed3e459f4569525c258137d9daaccbb..82f74c4eeb95e8199c4191622aafc55b2e3bb353 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1600,8 +1600,8 @@ msgid "<name>"
@ -124,7 +126,7 @@ index 48929b6..b9150b7 100644
# auto translated by TM merge from project: authconfig, version: master, DocId: po/authconfig
#: src/compat/authcompat_Options.py:149
diff --git a/po/de.po b/po/de.po
index 07eab1e..746d167 100644
index 07eab1ed0d6ac02ff746412caedd30a88ea5bd88..746d16716d55945ba45d9d1a1cb34615b1da3669 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1600,8 +1600,8 @@ msgid "<name>"
@ -139,10 +141,10 @@ index 07eab1e..746d167 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/es.po b/po/es.po
index 3868023..af5cde8 100644
index 307a3dfc7e9ff2a9cee78d162589b9affbd5a28a..4592ba1ec9b5793d66eec2e8d5b45bf5d848f579 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1598,8 +1598,8 @@ msgid "<name>"
@@ -1594,8 +1594,8 @@ msgid "<name>"
msgstr "<nombre>"
#: src/compat/authcompat_Options.py:148
@ -154,7 +156,7 @@ index 3868023..af5cde8 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/fa.po b/po/fa.po
index 7776891..d74c1cd 100644
index 7776891d61507c1c633894a2a230f70adf0abe55..d74c1cd462163f59d4975f0c04ed37f3303c42a0 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1537,7 +1537,7 @@ msgid "<name>"
@ -167,7 +169,7 @@ index 7776891..d74c1cd 100644
#: src/compat/authcompat_Options.py:149
diff --git a/po/fi.po b/po/fi.po
index 2ae32ff..7390590 100644
index 7edc39870f8185c353208c06d67502f98af0d69c..ec7499c22cfeb0079a7c80439bdc5fbb708e2a1f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1583,8 +1583,8 @@ msgid "<name>"
@ -182,10 +184,10 @@ index 2ae32ff..7390590 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/fr.po b/po/fr.po
index a40cf4c..d526c5d 100644
index 92d5928d12f2952fe9de048c0d233733e984d10c..f9c81f4c2be62bcaececfd6545d5782375ded522 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1605,8 +1605,8 @@ msgid "<name>"
@@ -1606,8 +1606,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
@ -197,10 +199,10 @@ index a40cf4c..d526c5d 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/hu.po b/po/hu.po
index 758be29..e18d6bf 100644
index 871cf9ff43d0ec46d2211cb665185d210cb592e0..9b4c0103a2a94b339f4efad0f6d1430e0172e4d0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1590,8 +1590,8 @@ msgid "<name>"
@@ -1591,8 +1591,8 @@ msgid "<name>"
msgstr "<név>"
#: src/compat/authcompat_Options.py:148
@ -212,23 +214,25 @@ index 758be29..e18d6bf 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/id.po b/po/id.po
index a83e1e2..6a7e2a7 100644
index a201cd75bd761f896e29331d73bebf4edfd127a4..22200572d69b640906f391290cb948b0d4a9a4f2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1538,7 +1538,7 @@ msgid "<name>"
msgstr ""
@@ -1589,8 +1589,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
-msgid "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
-msgstr "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
+msgid "<descrypt|bigcrypt|md5|sha256|sha512>"
msgstr ""
+msgstr "<descrypt|bigcrypt|md5|sha256|sha512>"
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/it.po b/po/it.po
index 9427893..4b27ef2 100644
index a6c25a8bdeabd2988d0f36af5f71f16e71469d97..8cc716e3f3609f1466a7b9d9286be0204a151b60 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1585,8 +1585,8 @@ msgid "<name>"
@@ -1593,8 +1593,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
@ -240,7 +244,7 @@ index 9427893..4b27ef2 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/ja.po b/po/ja.po
index fe83406..7ea9ae8 100644
index fe83406052e4460f01f715d6406e2c36eb7197b0..7ea9ae870a615b19ef39fd2989faf1abf47266b1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1598,8 +1598,8 @@ msgid "<name>"
@ -255,7 +259,7 @@ index fe83406..7ea9ae8 100644
# auto translated by TM merge from translation memory: authconfig, unique id: authconfig:6.2.8:authconfig:0bbce02e304562c295a1d57d66c296d3
#: src/compat/authcompat_Options.py:149
diff --git a/po/ka.po b/po/ka.po
index ef2e7c6..e19c0ab 100644
index c2a2ad3d80e3192498837c61edb0ce8e49fabaa1..2756d9d53df82963dc0349c6a6e913daffce9216 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1573,8 +1573,8 @@ msgid "<name>"
@ -270,7 +274,7 @@ index ef2e7c6..e19c0ab 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/ko.po b/po/ko.po
index 52d2cac..eb768fe 100644
index eadfe5b8145aa3b7d722e8b5f048a5ea9787d300..f7d0053ed1371506961eddf51563760b504b5e44 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1570,8 +1570,8 @@ msgid "<name>"
@ -285,7 +289,7 @@ index 52d2cac..eb768fe 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/nl.po b/po/nl.po
index 1bd2a9b..ba50b52 100644
index 1bd2a9bf67442420faf1c0100d8e88c6f65fb945..ba50b52363a05676303ba50ee3b6d6fc8f81de12 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1602,8 +1602,8 @@ msgid "<name>"
@ -300,7 +304,7 @@ index 1bd2a9b..ba50b52 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/pl.po b/po/pl.po
index 9b6627c..13553c8 100644
index 9b6627cc766c1e0a0db70187e13a57760dbb30c9..13553c81d1c57f22c5225aa0c017242abba15bf6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1609,8 +1609,8 @@ msgid "<name>"
@ -315,23 +319,25 @@ index 9b6627c..13553c8 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/pt.po b/po/pt.po
index ad02a0b..90d2aa3 100644
index f438af06bdec181b3ecd239e7208e13e8f19fb7e..a4228b05bacaa862debcecfaabdb2674205d2eab 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1536,7 +1536,7 @@ msgid "<name>"
msgstr ""
@@ -1595,8 +1595,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
-msgid "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
-msgstr "<descrypt|bigcrypt|md5|sha256|sha512|yescrypt>"
+msgid "<descrypt|bigcrypt|md5|sha256|sha512>"
msgstr ""
+msgstr "<descrypt|bigcrypt|md5|sha256|sha512>"
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1215bb..544b8e9 100644
index 73deaf180e3f84d075bea365c57e170c2adbb0b6..4dd44eadb4ac5d1c673d8d5d9f26acc1e5efd659 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1592,8 +1592,8 @@ msgid "<name>"
@@ -1593,8 +1593,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
@ -343,7 +349,7 @@ index a1215bb..544b8e9 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/ru.po b/po/ru.po
index 4919002..d23284d 100644
index 49190028c7ce89e2a33b0d72f0ae4f185f251ffc..d23284d29df8503e8e8afca6ac60dc0f89f7e886 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1590,8 +1590,8 @@ msgid "<name>"
@ -358,7 +364,7 @@ index 4919002..d23284d 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/si.po b/po/si.po
index 39f5a79..eaf4b3c 100644
index 39f5a79298a22cc38cbba427d976a64347d6b51d..eaf4b3c08a31f275c51f8f52078df993992e7dbb 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1536,7 +1536,7 @@ msgid "<name>"
@ -371,7 +377,7 @@ index 39f5a79..eaf4b3c 100644
#: src/compat/authcompat_Options.py:149
diff --git a/po/sv.po b/po/sv.po
index 9292b1f..cc70f2d 100644
index 9292b1f0b9aae19a6af711c8e8a7ef5f3ef8a36b..cc70f2d99be6a14175b009066d41f6db102dafe2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1580,8 +1580,8 @@ msgid "<name>"
@ -386,7 +392,7 @@ index 9292b1f..cc70f2d 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/tr.po b/po/tr.po
index 9be388f..0aaa543 100644
index 9be388fbbde21396666502662b964bc475098980..0aaa54335877ddadf13d4da7ad3277b1eccd0a09 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1589,8 +1589,8 @@ msgid "<name>"
@ -401,7 +407,7 @@ index 9be388f..0aaa543 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/uk.po b/po/uk.po
index c66594f..bc4c93b 100644
index e13a1656266cb9743e39a0cc70da4fcbd3b46701..a3cb1c808ab9a7bb171eb9600f75dd90468ec72a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1591,8 +1591,8 @@ msgid "<name>"
@ -416,7 +422,7 @@ index c66594f..bc4c93b 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75ec7d8..6c109a0 100644
index 75ec7d808811187b7722121966aaa55236dbc7d4..6c109a0d8556a8b5fd93e03ae543f3d3e909a6b8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1559,8 +1559,8 @@ msgid "<name>"
@ -431,10 +437,10 @@ index 75ec7d8..6c109a0 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 89fefed..0562435 100644
index 67b67e55689cf10a8da4e03e499b4b6b58b0abef..14dd6304ac159ef0fbc96712cea7a758b8e9d04d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1562,8 +1562,8 @@ msgid "<name>"
@@ -1561,8 +1561,8 @@ msgid "<name>"
msgstr "<name>"
#: src/compat/authcompat_Options.py:148
@ -446,7 +452,7 @@ index 89fefed..0562435 100644
#: src/compat/authcompat_Options.py:149
msgid "<URL>"
diff --git a/profiles/minimal/password-auth b/profiles/minimal/password-auth
index 858c21f..8c4cb37 100644
index 858c21f588fb0a76e30b7ecb122f1f332d18a294..8c4cb37f848a01889724ec8c56f1b819facb330d 100644
--- a/profiles/minimal/password-auth
+++ b/profiles/minimal/password-auth
@@ -12,7 +12,7 @@ account required pam_unix.so
@ -459,7 +465,7 @@ index 858c21f..8c4cb37 100644
session optional pam_keyinit.so revoke
diff --git a/profiles/minimal/system-auth b/profiles/minimal/system-auth
index 858c21f..8c4cb37 100644
index 858c21f588fb0a76e30b7ecb122f1f332d18a294..8c4cb37f848a01889724ec8c56f1b819facb330d 100644
--- a/profiles/minimal/system-auth
+++ b/profiles/minimal/system-auth
@@ -12,7 +12,7 @@ account required pam_unix.so
@ -470,35 +476,9 @@ index 858c21f..8c4cb37 100644
+password sufficient pam_unix.so sha512 shadow {if not "without-nullok":nullok} use_authtok
password required pam_deny.so
session optional pam_keyinit.so revoke
diff --git a/profiles/nis/password-auth b/profiles/nis/password-auth
index 56a51d9..56b19a6 100644
--- a/profiles/nis/password-auth
+++ b/profiles/nis/password-auth
@@ -15,7 +15,7 @@ account required pam_unix.so broken_shad
password requisite pam_pwquality.so {if not "with-nispwquality":local_users_only}
password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
-password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok nis
+password sufficient pam_unix.so sha512 shadow {if not "without-nullok":nullok} use_authtok nis
password required pam_deny.so
session optional pam_keyinit.so revoke
diff --git a/profiles/nis/system-auth b/profiles/nis/system-auth
index 74cf6ec..5d5010a 100644
--- a/profiles/nis/system-auth
+++ b/profiles/nis/system-auth
@@ -16,7 +16,7 @@ account required pam_unix.so broken_shad
password requisite pam_pwquality.so {if not "with-nispwquality":local_users_only}
password [default=1 ignore=ignore success=ok] pam_localuser.so {include if "with-pwhistory"}
password requisite pam_pwhistory.so use_authtok {include if "with-pwhistory"}
-password sufficient pam_unix.so yescrypt shadow {if not "without-nullok":nullok} use_authtok nis
+password sufficient pam_unix.so sha512 shadow {if not "without-nullok":nullok} use_authtok nis
password required pam_deny.so
session optional pam_keyinit.so revoke
diff --git a/profiles/sssd/password-auth b/profiles/sssd/password-auth
index 5b235de..b64f048 100644
index 5b235de810a838d3002013a68a85995a15ab1a8f..b64f048f09a40c2a0b1b258bb52f62e7cf459f9f 100644
--- a/profiles/sssd/password-auth
+++ b/profiles/sssd/password-auth
@@ -24,7 +24,7 @@ account required pam_permit.so
@ -511,7 +491,7 @@ index 5b235de..b64f048 100644
password sufficient pam_sss.so use_authtok
password required pam_deny.so
diff --git a/profiles/sssd/system-auth b/profiles/sssd/system-auth
index 22e87d8..d338719 100644
index 22e87d8f4ee64a4ad69d547873ae833de6ac5c41..d33871908cd0b3fde1eae34a6098e6774464ec30 100644
--- a/profiles/sssd/system-auth
+++ b/profiles/sssd/system-auth
@@ -31,7 +31,7 @@ account required pam_permit.so
@ -524,7 +504,7 @@ index 22e87d8..d338719 100644
password sufficient pam_sss.so use_authtok
password required pam_deny.so
diff --git a/profiles/winbind/password-auth b/profiles/winbind/password-auth
index 8b260fa..4944b42 100644
index 8b260fa06f5ed8494d1f6fac74517d3a54622693..4944b4213d83acc6f18e6078d9d5d95d8e30950c 100644
--- a/profiles/winbind/password-auth
+++ b/profiles/winbind/password-auth
@@ -21,7 +21,7 @@ account required pam_permit.so
@ -537,7 +517,7 @@ index 8b260fa..4944b42 100644
password required pam_deny.so
diff --git a/profiles/winbind/system-auth b/profiles/winbind/system-auth
index 33aa13e..afe27d7 100644
index 33aa13efb92405393236c3511ebb351facd916f0..afe27d7b0864e66b9a91a582d0c6f94cc37f1af7 100644
--- a/profiles/winbind/system-auth
+++ b/profiles/winbind/system-auth
@@ -22,7 +22,7 @@ account required pam_permit.so
@ -550,7 +530,7 @@ index 33aa13e..afe27d7 100644
password required pam_deny.so
diff --git a/src/compat/authcompat_Options.py b/src/compat/authcompat_Options.py
index 79ead60..5b80b80 100644
index 79ead60fa9edc1244227e3b69df025471b7c7991..5b80b80bef8ac88740726fda15863f81647120c3 100644
--- a/src/compat/authcompat_Options.py
+++ b/src/compat/authcompat_Options.py
@@ -142,7 +142,7 @@ class Options:
@ -563,7 +543,7 @@ index 79ead60..5b80b80 100644
Option.UnsupportedValued("smartcardmodule", _("<module>")),
Option.UnsupportedValued("smbsecurity", _("<user|server|domain|ads>")),
diff --git a/src/man/authselect-migration.7.adoc b/src/man/authselect-migration.7.adoc
index d9777b9..9e3021a 100644
index d9777b9b473859d7ec532f39f7e14bd81c4f1b90..9e3021a8d62ff8ba71773b212f5a1a43ac19a703 100644
--- a/src/man/authselect-migration.7.adoc
+++ b/src/man/authselect-migration.7.adoc
@@ -90,7 +90,7 @@ configuration file for required services.
@ -576,10 +556,10 @@ index d9777b9..9e3021a 100644
You can just omit these options.
diff --git a/src/man/po/authselect-migration.7.adoc.ca.po b/src/man/po/authselect-migration.7.adoc.ca.po
index 08b11b7..12f14d6 100644
index 7e653a228cdff666949fd12d62090aa5dbe20bc1..b6890bfcfb713bc3185152bc1f140b5d34d3c535 100644
--- a/src/man/po/authselect-migration.7.adoc.ca.po
+++ b/src/man/po/authselect-migration.7.adoc.ca.po
@@ -185,7 +185,7 @@ msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -589,7 +569,7 @@ index 08b11b7..12f14d6 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.cs.po b/src/man/po/authselect-migration.7.adoc.cs.po
index d11809b..caf570b 100644
index d11809b0c89c0c25927385c23092d09febf6a6a6..caf570bf8dd29c2a4018dc33c6a6ac8f07f88828 100644
--- a/src/man/po/authselect-migration.7.adoc.cs.po
+++ b/src/man/po/authselect-migration.7.adoc.cs.po
@@ -242,7 +242,7 @@ msgstr ""
@ -602,7 +582,7 @@ index d11809b..caf570b 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.de.po b/src/man/po/authselect-migration.7.adoc.de.po
index c166a0f..fff88c8 100644
index c166a0f6b3ecaa15f6bd691092c5534a75b0ab8b..fff88c84af35494e65b6587efe78ff09d75f350f 100644
--- a/src/man/po/authselect-migration.7.adoc.de.po
+++ b/src/man/po/authselect-migration.7.adoc.de.po
@@ -193,7 +193,7 @@ msgstr ""
@ -615,10 +595,10 @@ index c166a0f..fff88c8 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.es.po b/src/man/po/authselect-migration.7.adoc.es.po
index 8cb3584..5403cde 100644
index 05d4d494a1adc10c5d393078dfbdf5910e327f27..6be9bc318384edf97a247028b317c070c0f6a788 100644
--- a/src/man/po/authselect-migration.7.adoc.es.po
+++ b/src/man/po/authselect-migration.7.adoc.es.po
@@ -241,7 +241,7 @@ msgstr ""
@@ -248,7 +248,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -628,7 +608,7 @@ index 8cb3584..5403cde 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.fa.po b/src/man/po/authselect-migration.7.adoc.fa.po
index b902c0c..db37728 100644
index b902c0cd5271bb0ee79f575a9fe3eca275b6c56a..db37728fc44ebd368345f984dd73b9b9ff74f3e8 100644
--- a/src/man/po/authselect-migration.7.adoc.fa.po
+++ b/src/man/po/authselect-migration.7.adoc.fa.po
@@ -189,7 +189,7 @@ msgstr ""
@ -641,10 +621,10 @@ index b902c0c..db37728 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.fi.po b/src/man/po/authselect-migration.7.adoc.fi.po
index 14c6894..79ff561 100644
index 1f8b1a0b5e73e162bc943e7aa76105406de1d868..c07e2c10a3179c1647266bf5bdf6bd3b06578b02 100644
--- a/src/man/po/authselect-migration.7.adoc.fi.po
+++ b/src/man/po/authselect-migration.7.adoc.fi.po
@@ -252,14 +252,14 @@ msgstr ""
@@ -253,14 +253,14 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -662,10 +642,10 @@ index 14c6894..79ff561 100644
#. type: Block title
diff --git a/src/man/po/authselect-migration.7.adoc.fr.po b/src/man/po/authselect-migration.7.adoc.fr.po
index cf3fcf9..55a7386 100644
index 06257a4160970bfbf623e33548d689096ab58bf1..954034740677bbb7fd94ed5cf7f5174a9162d195 100644
--- a/src/man/po/authselect-migration.7.adoc.fr.po
+++ b/src/man/po/authselect-migration.7.adoc.fr.po
@@ -259,14 +259,14 @@ msgstr ""
@@ -261,14 +261,14 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -683,7 +663,7 @@ index cf3fcf9..55a7386 100644
"Vous pouvez simplement omettre ces options."
diff --git a/src/man/po/authselect-migration.7.adoc.hu.po b/src/man/po/authselect-migration.7.adoc.hu.po
index a058b22..368476a 100644
index a058b221b3324f6ed120a05fefcd3fe46af7e08b..368476a43138b2952baad7a0691e064d452715d5 100644
--- a/src/man/po/authselect-migration.7.adoc.hu.po
+++ b/src/man/po/authselect-migration.7.adoc.hu.po
@@ -189,7 +189,7 @@ msgstr ""
@ -696,10 +676,10 @@ index a058b22..368476a 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.it.po b/src/man/po/authselect-migration.7.adoc.it.po
index f28d362..d09af60 100644
index 0082dd3dedcf6679d2411dddf5793524c7b440a1..4e918bf865e4bff1c3017b269dc9e9731ea7f247 100644
--- a/src/man/po/authselect-migration.7.adoc.it.po
+++ b/src/man/po/authselect-migration.7.adoc.it.po
@@ -189,7 +189,7 @@ msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -709,7 +689,7 @@ index f28d362..d09af60 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.ja.po b/src/man/po/authselect-migration.7.adoc.ja.po
index 782e094..a8da7e2 100644
index 782e094c5f7c06a7d0fb340cf38d0c3b2f9a56ec..a8da7e2a23ef8f43e95df47a462bce919748ab19 100644
--- a/src/man/po/authselect-migration.7.adoc.ja.po
+++ b/src/man/po/authselect-migration.7.adoc.ja.po
@@ -246,13 +246,13 @@ msgstr ""
@ -729,7 +709,7 @@ index 782e094..a8da7e2 100644
"せん(カスタムプロファイルを作成する場合のみ)。 これらのオプションは省略でき"
"ます。"
diff --git a/src/man/po/authselect-migration.7.adoc.ko.po b/src/man/po/authselect-migration.7.adoc.ko.po
index 9704e0b..338bc33 100644
index e6eccd0628cad08d93ef29e3030d0af1ebb45e5a..8919c3b5619915993069ea75d13334b7f44f3ba7 100644
--- a/src/man/po/authselect-migration.7.adoc.ko.po
+++ b/src/man/po/authselect-migration.7.adoc.ko.po
@@ -249,13 +249,13 @@ msgstr ""
@ -741,15 +721,16 @@ index 9704e0b..338bc33 100644
"it cannot be changed through an option (only by creating a custom profile). "
"You can just omit these options."
msgstr ""
"Authconfig 선택 `--enableshadow`와 `--passalgo=sah512`는 비밀번호는 `sha512` "
"알고리즘을 사용하여 `/etc/shadow`에서 저장되어지도록 자주 사용되곤 합니다. "
-"*authselect 프로파일은 이제 yescrypt 해쉬 방법을 사용합니다* 그리고 이는 선택"
+"*authselect 프로파일은 이제 sha512 해쉬 방법을 사용합니다* 그리고 이는 선택"
"(사용자 정의 프로파일 생성에서만)을 통해 변경 될 수 없습니다. 당신은 다만 이"
"들 옵션을 생략 할 수 있습니다."
"Authconfig 선택 `--enableshadow`와 `--passalgo=sha512`는 비밀번호는 `sha512` "
-"알고리즘을 사용하여 `/etc/shadow`에서 저장되어지도록 자주 사용되곤 합니다. *"
-"authselect 프로파일은 이제 yescrypt 해쉬 방법을 사용합니다* 그리고 이는 선택("
+"알고리즘을 사용하여 `/etc/shadow`에서 저장되어지도록 자주 사용되곤 합니다. "
+"*authselect 프로파일은 이제 sha512 해쉬 방법을 사용합니다* 그리고 이는 선택("
"사용자 정의 프로파일 생성에서만)을 통해 변경 될 수 없습니다. 당신은 다만 "
"이들 옵션을 생략 할 수 있습니다."
diff --git a/src/man/po/authselect-migration.7.adoc.nl.po b/src/man/po/authselect-migration.7.adoc.nl.po
index 15573ef..b587fa4 100644
index 15573ef063f69728d66999fb3e58be4d9438468b..b587fa436c86e355afb8950fd289f05c4c545696 100644
--- a/src/man/po/authselect-migration.7.adoc.nl.po
+++ b/src/man/po/authselect-migration.7.adoc.nl.po
@@ -257,14 +257,14 @@ msgstr ""
@ -770,7 +751,7 @@ index 15573ef..b587fa4 100644
"gewoon weglaten."
diff --git a/src/man/po/authselect-migration.7.adoc.pl.po b/src/man/po/authselect-migration.7.adoc.pl.po
index e0e629a..d229fb7 100644
index e0e629a8dda40061e2c9d4a17554c848df1e341a..d229fb7e2fd5654682b2fdac1409746606026e02 100644
--- a/src/man/po/authselect-migration.7.adoc.pl.po
+++ b/src/man/po/authselect-migration.7.adoc.pl.po
@@ -191,7 +191,7 @@ msgstr ""
@ -783,7 +764,7 @@ index e0e629a..d229fb7 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.pot b/src/man/po/authselect-migration.7.adoc.pot
index c35b730..bed9498 100644
index c35b730bd1a90533ba0c75365e2408a94c3809a9..bed94984e506d2fe73cbaf8c5d1116ff762612d9 100644
--- a/src/man/po/authselect-migration.7.adoc.pot
+++ b/src/man/po/authselect-migration.7.adoc.pot
@@ -188,7 +188,7 @@ msgstr ""
@ -796,10 +777,10 @@ index c35b730..bed9498 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.pt.po b/src/man/po/authselect-migration.7.adoc.pt.po
index 982c629..e67478b 100644
index 96de2ff43b73a3367ae250d9b34329e68d5947ad..57dcadce8e2ffd1349d72bdc6499b0ec4a24db76 100644
--- a/src/man/po/authselect-migration.7.adoc.pt.po
+++ b/src/man/po/authselect-migration.7.adoc.pt.po
@@ -192,7 +192,7 @@ msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -809,10 +790,10 @@ index 982c629..e67478b 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.pt_BR.po b/src/man/po/authselect-migration.7.adoc.pt_BR.po
index 51584e7..a63b8fb 100644
index a7ecc0e4269b25aab4277622b7a31b9c9dbeb467..8b2e2fa80a544ef82ec0719a0df0b6cc23353a3c 100644
--- a/src/man/po/authselect-migration.7.adoc.pt_BR.po
+++ b/src/man/po/authselect-migration.7.adoc.pt_BR.po
@@ -198,7 +198,7 @@ msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -822,7 +803,7 @@ index 51584e7..a63b8fb 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.ru.po b/src/man/po/authselect-migration.7.adoc.ru.po
index 469f463..fd0eb1a 100644
index 469f4639230a977eebe5261f2b6aea9470db33c5..fd0eb1ad827962c2674a6cdda4c479d805177af0 100644
--- a/src/man/po/authselect-migration.7.adoc.ru.po
+++ b/src/man/po/authselect-migration.7.adoc.ru.po
@@ -256,14 +256,14 @@ msgstr ""
@ -843,7 +824,7 @@ index 469f463..fd0eb1a 100644
"эти параметры."
diff --git a/src/man/po/authselect-migration.7.adoc.si.po b/src/man/po/authselect-migration.7.adoc.si.po
index 0dbdb2c..5f88382 100644
index 0dbdb2c6357cbd2172c25eee157feadd57b0b9ae..5f88382d7aa4c92908b8b6821d75d085ab2a3358 100644
--- a/src/man/po/authselect-migration.7.adoc.si.po
+++ b/src/man/po/authselect-migration.7.adoc.si.po
@@ -188,7 +188,7 @@ msgstr ""
@ -856,7 +837,7 @@ index 0dbdb2c..5f88382 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.sv.po b/src/man/po/authselect-migration.7.adoc.sv.po
index b3087ea..397e901 100644
index 7199fbff8c47836848b1353c71e525afb88aa307..15fa4ca7b8385c92e661b0361942c93aa438e866 100644
--- a/src/man/po/authselect-migration.7.adoc.sv.po
+++ b/src/man/po/authselect-migration.7.adoc.sv.po
@@ -253,13 +253,13 @@ msgstr ""
@ -876,7 +857,7 @@ index b3087ea..397e901 100644
"profil). Du kan helt enkelt utelämna dessa flaggor."
diff --git a/src/man/po/authselect-migration.7.adoc.tr.po b/src/man/po/authselect-migration.7.adoc.tr.po
index 35e5d5c..157f7d2 100644
index 35e5d5c21609d1f68c5e89a5eaf54a4c456e48e3..157f7d2e4d1a53c27de1673409e658f696b083b6 100644
--- a/src/man/po/authselect-migration.7.adoc.tr.po
+++ b/src/man/po/authselect-migration.7.adoc.tr.po
@@ -258,13 +258,13 @@ msgstr ""
@ -896,7 +877,7 @@ index 35e5d5c..157f7d2 100644
"(yalnızca özel bir profil oluşturarak değiştirilebilir). Bu seçenekleri "
"yalnızca atlayabilirsiniz."
diff --git a/src/man/po/authselect-migration.7.adoc.uk.po b/src/man/po/authselect-migration.7.adoc.uk.po
index 5a1b8a3..98d9841 100644
index 5a1b8a3aa5e8ce8dfbe40b0545187878dea09dbd..98d9841724a90e207818ea179e5870fdf870ca40 100644
--- a/src/man/po/authselect-migration.7.adoc.uk.po
+++ b/src/man/po/authselect-migration.7.adoc.uk.po
@@ -257,14 +257,14 @@ msgstr ""
@ -917,7 +898,7 @@ index 5a1b8a3..98d9841 100644
"використовувати ці параметри."
diff --git a/src/man/po/authselect-migration.7.adoc.zh_CN.po b/src/man/po/authselect-migration.7.adoc.zh_CN.po
index 6f5e562..2b95ca4 100644
index 6f5e562f5026e32623952154298df7ca950c7fdb..2b95ca4d2316644af9d299a4b4757a30ae68dc2f 100644
--- a/src/man/po/authselect-migration.7.adoc.zh_CN.po
+++ b/src/man/po/authselect-migration.7.adoc.zh_CN.po
@@ -190,7 +190,7 @@ msgstr ""
@ -930,10 +911,10 @@ index 6f5e562..2b95ca4 100644
"You can just omit these options."
msgstr ""
diff --git a/src/man/po/authselect-migration.7.adoc.zh_TW.po b/src/man/po/authselect-migration.7.adoc.zh_TW.po
index 43ab062..e7112be 100644
index a5e86ab4aeb82b12fd31c8463563833b7aabd173..0eae8bd08bfa476d096292001aa541bfa842bb0c 100644
--- a/src/man/po/authselect-migration.7.adoc.zh_TW.po
+++ b/src/man/po/authselect-migration.7.adoc.zh_TW.po
@@ -189,7 +189,7 @@ msgstr ""
@@ -190,7 +190,7 @@ msgstr ""
msgid ""
"Authconfig options `--enableshadow` and `--passalgo=sha512` were often used "
"to make sure that passwords are stored in `/etc/shadow` using `sha512` "
@ -943,5 +924,5 @@ index 43ab062..e7112be 100644
"You can just omit these options."
msgstr ""
--
2.40.1
2.54.0

View File

@ -2,18 +2,14 @@
%define _empty_manifest_terminate_build 0
Name: authselect
Version: 1.2.6
Release: 3%{?dist}
Version: 1.2.7
Release: 1%{?dist}
Summary: Configures authentication and identity sources from supported profiles
URL: https://github.com/authselect/authselect
License: GPLv3+
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0001: 0001-po-update-translations.patch
Patch0002: 0002-profiles-do-not-try-to-change-password-via-sssd-for-.patch
Patch0003: 0003-po-update-translations.patch
### Downstream Patches ###
Patch0901: 0901-rhel9-remove-mention-of-Fedora-Change-page-in-compat.patch
Patch0902: 0902-rhel9-remove-ecryptfs-support.patch
@ -21,9 +17,6 @@ Patch0903: 0903-rhel9-Revert-profiles-add-support-for-resolved.patch
Patch0904: 0904-rhel9-remove-nis-support.patch
Patch0905: 0905-rhel9-Revert-yescrypt.patch
# Apply subsequent patches here to avoid constant changes to downstream only patches
Patch0906: 0004-profiles-merge-groups-records-with-SUCCESS-merge.patch
%global makedir %{_builddir}/%{name}-%{version}
BuildRequires: autoconf
@ -165,6 +158,7 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
%{_datadir}/authselect/default/minimal/README
%{_datadir}/authselect/default/minimal/REQUIREMENTS
%{_datadir}/authselect/default/minimal/smartcard-auth
%{_datadir}/authselect/default/minimal/switchable-auth
%{_datadir}/authselect/default/minimal/system-auth
%{_datadir}/authselect/default/sssd/dconf-db
%{_datadir}/authselect/default/sssd/dconf-locks
@ -175,6 +169,7 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
%{_datadir}/authselect/default/sssd/README
%{_datadir}/authselect/default/sssd/REQUIREMENTS
%{_datadir}/authselect/default/sssd/smartcard-auth
%{_datadir}/authselect/default/sssd/switchable-auth
%{_datadir}/authselect/default/sssd/system-auth
%{_datadir}/authselect/default/winbind/dconf-db
%{_datadir}/authselect/default/winbind/dconf-locks
@ -185,6 +180,7 @@ find $RPM_BUILD_ROOT -name "*.a" -exec %__rm -f {} \;
%{_datadir}/authselect/default/winbind/README
%{_datadir}/authselect/default/winbind/REQUIREMENTS
%{_datadir}/authselect/default/winbind/smartcard-auth
%{_datadir}/authselect/default/winbind/switchable-auth
%{_datadir}/authselect/default/winbind/system-auth
%{_libdir}/libauthselect.so.*
%{_mandir}/man5/authselect-profiles.5*
@ -295,6 +291,11 @@ exit 0
exit 0
%changelog
* Thu Jun 4 2026 Pavel Březina <pbrezina@redhat.com> - 1.2.7-1
- Rebase to authselect-1.2.7
- Disable group merging by default, use with-group-merging to enable it (RHEL-94650)
- Add switchable-auth (RHEL-156520)
* Wed Feb 5 2025 Pavel Březina <pbrezina@redhat.com> - 1.2.6-3
- Support group merging in nsswitch.conf (RHEL-15779)

View File

@ -1 +1 @@
SHA512 (authselect-1.2.6.tar.gz) = c89ea02f3f6c8018d42b99599744049e12caf87e9ed30173f52d4c8d97777cc33450b87fbb3b7d73129d096bff83525dd332e4919a1fbafa73e9af66d5c2dd61
SHA512 (authselect-1.2.7.tar.gz) = d84891537833efd86876768a24e5f6930db7eca12b95ca981b8b4a7caeda022c0f563f2e43cd3e3d15d2ac35ea5d17ce354e555663c7e5bd32e805e74ca04401