diff options
| author |   Hank Leininger <hlein@korelogic.com> | 2020-02-18 12:51:48 -0700 |
|---|---|---|
| committer |   Ulrich Müller <ulm@gentoo.org> | 2020-02-19 21:25:35 +0100 |
| commit | 0cfdb10442be996e94f64bfaca9ba08317ac0e39 (patch) | |
| tree | 9c07a205d3b0b7190fd319785734882ccafd9a9d /net-misc/scponly/files | |
| parent | acct-user/scponly: added user for scponly. (diff) | |
| download | gentoo-0cfdb10442be996e94f64bfaca9ba08317ac0e39.tar.gz gentoo-0cfdb10442be996e94f64bfaca9ba08317ac0e39.tar.bz2 gentoo-0cfdb10442be996e94f64bfaca9ba08317ac0e39.zip | |
net-misc/scponly: GLEP-81, fix sftp-server path, add maintainer
Redone to address feedback in https://github.com/gentoo/gentoo/pull/14286
scponly's sftp support has been broken since profile 17.1's move
from /usr/lib/ to /usr/lib64/; this includes the fix for that.
Also moved scponly's creation of a chroot user behind a
USE=chroot flag, as it's entirely usable if you are setting up
your own chroots and do not need it to create one.
Added myself as proxy maintainer.
Signed-off-by: Hank Leininger <hlein@korelogic.com>
Closes: https://bugs.gentoo.org/701368
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'net-misc/scponly/files')
| -rw-r--r-- | net-misc/scponly/files/scponly-4.8-sftp-server-path.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch b/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch new file mode 100644 index 000000000000..c191de877518 --- /dev/null +++ b/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch @@ -0,0 +1,42 @@ +diff -urNp scponly-4.8-orig/configure scponly-4.8-dwok/configure +--- scponly-4.8-orig/configure 2019-11-26 16:34:19.028544577 +0100 ++++ scponly-4.8-dwok/configure 2019-11-26 16:33:24.571763528 +0100 +@@ -3244,7 +3244,7 @@ else + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" | sed -e 's/:/ /'`" ++as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" | sed -e 's/:/ /'`" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -4240,7 +4240,7 @@ else + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="`echo "$PATH:/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" | sed -e 's/:/ /'`" ++as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" | sed -e 's/:/ /'`" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +diff -urNp scponly-4.8-orig/configure.in scponly-4.8-dwok/configure.in +--- scponly-4.8-orig/configure.in 2019-11-26 16:34:19.028544577 +0100 ++++ scponly-4.8-dwok/configure.in 2019-11-26 16:33:28.491819749 +0100 +@@ -231,7 +231,7 @@ AC_ARG_ENABLE([quota-compat], + + if test "x$scponly_scp_compat" != "x"; then + AC_MSG_NOTICE([enabling core WinSCP and Vanilla SCP binaries...]) +- SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh]) ++ SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh]) + SCPONLY_PATH_PROG_DEFINE([PROG_LS], [ls], [/bin:/usr/bin:/sbin:/usr/sbin]) + SCPONLY_PATH_PROG_DEFINE([PROG_SCP], [scp], [/bin:/usr/bin:/sbin:/usr/sbin]) + SCPONLY_PATH_PROG_DEFINE([PROG_RM], [rm], [/bin:/usr/bin:/sbin:/usr/sbin]) +@@ -297,7 +297,7 @@ if test "x$scponly_sftp_compat" != "x"; + if test "x$scponly_explicit_sftpserver_path" = "x"; then + dnl Informed guess: + SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server], +- [/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec]) ++ [/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec]) + dnl Debian uses /usr/lib + dnl Red Hat uses /usr/libexec/openssh + dnl Many a *BSD uses $PATH itself (which is implicit + checked 1st) |