commit: 6f42017f1c4cb1ff42618a097f87fceffbdf1ad3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 09:36:25 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 09:36:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f42017f
net-misc/openssh*: Fix sftp-server path in config drop-in
OpenSSH itself automatically adjusts the paths in sshd_config but not in our
drop-ins, so I missed this. Sorry!
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
...penssh-contrib-9.7_p1-r2.ebuild => openssh-contrib-9.7_p1-r3.ebuild} | 2 +-
net-misc/openssh/{openssh-9.7_p1-r4.ebuild => openssh-9.7_p1-r5.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r2.ebuild
b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r3.ebuild
similarity index 99%
rename from net-misc/openssh-contrib/openssh-contrib-9.7_p1-r2.ebuild
rename to net-misc/openssh-contrib/openssh-contrib-9.7_p1-r3.ebuild
index 0f9dacf37bf1..928f72db3060 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r2.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r3.ebuild
@@ -371,7 +371,7 @@ create_config_dropins() {
cat <<-EOF >
"${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die
# override default of no subsystems
- Subsystem sftp ${EPREFIX}/usr/libexec/sftp-server
+ Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server
EOF
if use pam ; then
diff --git a/net-misc/openssh/openssh-9.7_p1-r4.ebuild
b/net-misc/openssh/openssh-9.7_p1-r5.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-9.7_p1-r4.ebuild
rename to net-misc/openssh/openssh-9.7_p1-r5.ebuild
index 6bed5f250d22..4d382b9b6ac6 100644
--- a/net-misc/openssh/openssh-9.7_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-9.7_p1-r5.ebuild
@@ -258,7 +258,7 @@ create_config_dropins() {
cat <<-EOF >
"${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die
# override default of no subsystems
- Subsystem sftp ${EPREFIX}/usr/libexec/sftp-server
+ Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server
EOF
if use pam ; then
