Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20121504 scp and sftp fail due to trying to execute /usr/bin/amd64/ssh
authorkavya.racharla@oracle.com <kavya.racharla@oracle.com>
Mon, 08 Dec 2014 10:00:29 -0800
changeset 3520 6bfe35769346
parent 3516 c4ee98578413
child 3521 958ebf9deed1
20121504 scp and sftp fail due to trying to execute /usr/bin/amd64/ssh
components/openssh/Makefile file | annotate | diff | comparison | revisions
components/openssh/openssh.p5m file | annotate | diff | comparison | revisions 
--- a/components/openssh/Makefile	Fri Dec 05 13:35:54 2014 -0800
+++ b/components/openssh/Makefile	Mon Dec 08 10:00:29 2014 -0800
@@ -83,6 +83,7 @@
 CONFIGURE_OPTIONS += --libexecdir=/usr/lib/ssh
 CONFIGURE_OPTIONS += --sbindir=/usr/lib/ssh
 CONFIGURE_OPTIONS += --sysconfdir=/etc/ssh
+CONFIGURE_OPTIONS += --bindir=/usr/bin
 CONFIGURE_OPTIONS += --disable-lastlog
 
 # Copy the sftp dtrace provider file and the header file to source directory
--- a/components/openssh/openssh.p5m	Fri Dec 05 13:35:54 2014 -0800
+++ b/components/openssh/openssh.p5m	Mon Dec 08 10:00:29 2014 -0800
@@ -51,13 +51,13 @@
     mediator-implementation=openssh
 link path=usr/bin/ssh-keyscan target=../lib/openssh/bin/ssh-keyscan \
     mediator=ssh mediator-implementation=openssh
-file usr/bin/$(MACH64)/scp path=usr/lib/openssh/bin/scp mode=0555
-file usr/bin/$(MACH64)/sftp path=usr/lib/openssh/bin/sftp mode=0555
-file usr/bin/$(MACH64)/ssh path=usr/lib/openssh/bin/ssh mode=0555
-file usr/bin/$(MACH64)/ssh-add path=usr/lib/openssh/bin/ssh-add mode=0555
-file usr/bin/$(MACH64)/ssh-agent path=usr/lib/openssh/bin/ssh-agent mode=2555
-file usr/bin/$(MACH64)/ssh-keygen path=usr/lib/openssh/bin/ssh-keygen mode=0555
-file usr/bin/$(MACH64)/ssh-keyscan path=usr/lib/openssh/bin/ssh-keyscan mode=0555
+file usr/bin/scp path=usr/lib/openssh/bin/scp mode=0555
+file usr/bin/sftp path=usr/lib/openssh/bin/sftp mode=0555
+file usr/bin/ssh path=usr/lib/openssh/bin/ssh mode=0555
+file usr/bin/ssh-add path=usr/lib/openssh/bin/ssh-add mode=0555
+file usr/bin/ssh-agent path=usr/lib/openssh/bin/ssh-agent mode=2555
+file usr/bin/ssh-keygen path=usr/lib/openssh/bin/ssh-keygen mode=0555
+file usr/bin/ssh-keyscan path=usr/lib/openssh/bin/ssh-keyscan mode=0555
 file usr/lib/ssh/sftp-server path=usr/lib/openssh/lib/sftp-server mode=0555
 file usr/lib/ssh/ssh-keysign path=usr/lib/openssh/lib/ssh-keysign mode=4555
 file usr/lib/ssh/ssh-pkcs11-helper path=usr/lib/openssh/lib/ssh-pkcs11-helper \
upstream/oracle/userland-gate