[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/

[Mikle Kolyada]

commit:     9050251b703fb4afd2e499a349125104b7e03096
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 10:50:44 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:51:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9050251b

net-misc/openssh: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../openssh/{openssh-8.1_p1-r4.ebuild => openssh-8.1_p1-r5.ebuild}    | 4 +++-
 .../openssh/{openssh-8.2_p1-r7.ebuild => openssh-8.2_p1-r8.ebuild}    | 4 +++-
 .../openssh/{openssh-8.3_p1-r5.ebuild => openssh-8.3_p1-r6.ebuild}    | 4 +++-
 .../openssh/{openssh-8.4_p1-r2.ebuild => openssh-8.4_p1-r3.ebuild}    | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/net-misc/openssh/openssh-8.1_p1-r4.ebuild 
b/net-misc/openssh/openssh-8.1_p1-r5.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-8.1_p1-r4.ebuild
rename to net-misc/openssh/openssh-8.1_p1-r5.ebuild
index 8ca157b9c13..e055a207b9d 100644
--- a/net-misc/openssh/openssh-8.1_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r5.ebuild
@@ -399,7 +399,9 @@ src_install() {
        newinitd "${FILESDIR}"/sshd-r1.initd sshd
        newconfd "${FILESDIR}"/sshd-r1.confd sshd
 
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       if use pam; then
+               newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       fi
 
        tweak_ssh_configs
 

diff --git a/net-misc/openssh/openssh-8.2_p1-r7.ebuild 
b/net-misc/openssh/openssh-8.2_p1-r8.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-8.2_p1-r7.ebuild
rename to net-misc/openssh/openssh-8.2_p1-r8.ebuild
index b40fb15e500..595226626d7 100644
--- a/net-misc/openssh/openssh-8.2_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r8.ebuild
@@ -399,7 +399,9 @@ src_install() {
        newinitd "${FILESDIR}"/sshd-r1.initd sshd
        newconfd "${FILESDIR}"/sshd-r1.confd sshd
 
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       if use pam; then
+               newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       fi
 
        tweak_ssh_configs
 

diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild 
b/net-misc/openssh/openssh-8.3_p1-r6.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-8.3_p1-r5.ebuild
rename to net-misc/openssh/openssh-8.3_p1-r6.ebuild
index 20705683e44..ef9e80ab84f 100644
--- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r6.ebuild
@@ -418,7 +418,9 @@ src_install() {
        newinitd "${FILESDIR}"/sshd-r1.initd sshd
        newconfd "${FILESDIR}"/sshd-r1.confd sshd
 
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       if use pam; then
+               newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       fi
 
        tweak_ssh_configs
 

diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild 
b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-8.4_p1-r2.ebuild
rename to net-misc/openssh/openssh-8.4_p1-r3.ebuild
index 89417640373..6f524b1cb9f 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
@@ -423,7 +423,9 @@ src_install() {
        newinitd "${FILESDIR}"/sshd-r1.initd sshd
        newconfd "${FILESDIR}"/sshd-r1.confd sshd
 
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       if use pam; then
+               newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       fi
 
        tweak_ssh_configs