diff options
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-8.1_p1-r5.ebuild (renamed from net-misc/openssh/openssh-8.1_p1-r4.ebuild) | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.2_p1-r8.ebuild (renamed from net-misc/openssh/openssh-8.2_p1-r7.ebuild) | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.3_p1-r6.ebuild (renamed from net-misc/openssh/openssh-8.3_p1-r5.ebuild) | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.4_p1-r3.ebuild (renamed from net-misc/openssh/openssh-8.4_p1-r2.ebuild) | 7 |
4 files changed, 15 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 index 8ca157b9c135..e055a207b9d5 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 index b40fb15e5003..595226626d73 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 index 20705683e44f..ef9e80ab84f4 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 index 894176403737..fc00136b3125 100644 --- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild @@ -294,6 +294,9 @@ src_configure() { append-cppflags -DBROKEN_GLOB fi + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + local myconf=( --with-ldflags="${LDFLAGS}" --disable-strip @@ -423,7 +426,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 |