modified openssh

diff --git a/net-misc/openssh/files/sshd.rc6.3 b/net-misc/openssh/files/sshd.rc6.3
index c55116e..905cb8f 100755 (executable)
--- a/net-misc/openssh/files/sshd.rc6.3
+++ b/net-misc/openssh/files/sshd.rc6.3
@@ -13,7 +13,7 @@ depend() {
 
 SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
 SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
+SSHD_BINARY=${SSHD_BINARY:-/sbin/sshd} # PGORNICZ: installed into /sbin not /usr/sbin
 
 checkconfig() {
        if [ ! -d /var/empty ] ; then

diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service
index 45f823a..dabc5d4 100644 (file)
--- a/net-misc/openssh/files/sshd.service
+++ b/net-misc/openssh/files/sshd.service
@@ -3,7 +3,7 @@ Description=OpenSSH server daemon
 After=syslog.target network.target auditd.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D -e
+ExecStart=/sbin/sshd -D -e
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]

diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service
index 2645ad0..c7ef64c 100644 (file)
--- a/net-misc/openssh/files/sshd_at.service
+++ b/net-misc/openssh/files/sshd_at.service
@@ -3,6 +3,6 @@ Description=OpenSSH per-connection server daemon
 After=syslog.target auditd.service
 
 [Service]
-ExecStart=-/usr/sbin/sshd -i -e
+ExecStart=-/sbin/sshd -i -e
 StandardInput=socket
 StandardError=syslog

diff --git a/net-misc/openssh/openssh-5.9_p1-r4.ebuild b/net-misc/openssh/openssh-5.9_p1-r4.ebuild
index 1bba1af..0b2599d 100644 (file)
--- a/net-misc/openssh/openssh-5.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r4.ebuild
@@ -216,6 +216,9 @@ src_install() {
 
        systemd_dounit "${FILESDIR}"/sshd.{service,socket} || die
        systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' || die
+
+       # PGORNICZ: install into /sbin not /usr/sbin
+       mv "${D}"/usr/sbin "${D}"/sbin || die "PGORNICZ: Failed to mv sshd into /lib"
 }
 
 src_test() {