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.
18163120 deliver OpenSSH in 64bit mode
authorkavya.racharla@oracle.com <kavya.racharla@oracle.com>
Mon, 10 Nov 2014 14:51:36 -0800
changeset 2196 2063c1da2a7a
parent 2195 3e88c81538cb
child 2197 22c15b329605
18163120 deliver OpenSSH in 64bit mode
components/openssh/Makefile file | annotate | diff | comparison | revisions
components/openssh/openssh.p5m file | annotate | diff | comparison | revisions
components/openssh/patches/013-dtrace_sftp.patch file | annotate | diff | comparison | revisions 
--- a/components/openssh/Makefile	Fri Nov 07 13:40:42 2014 -0800
+++ b/components/openssh/Makefile	Mon Nov 10 14:51:36 2014 -0800
@@ -56,7 +56,6 @@
 CFLAGS += -DPAM_ENHANCEMENT
 CFLAGS += -DPAM_BUGFIX
 CFLAGS += -DOPTION_DEFAULT_VALUE
-CFLAGS += -DNO_UID_RESTORATION_TEST
 
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" 
 
@@ -64,7 +63,12 @@
 # pre-authentication phase, sshd will chroot to /var/empty which doesn't
 # contain any files. If we use lazyloading, sshd will fail to find any
 # libraries that it needs.
-CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS) -B direct -z nolazyload"
+LDFLAGS += -B direct -z nolazyload
+
+# Just $(BUILD_64) option was not propogating the 64 bit flags to all the
+# necessary places. Hence the -m64 option is added to LDFLAGS for
+# CONFIGURE_OPTIONS.64.
+CONFIGURE_OPTIONS.64 += LDFLAGS="$(LDFLAGS) -m64"
 
 # Build with BSM audit. Do not check if getaudit and getaudit_addr are in
 # libbsm, because they are no longer in libbsm and not needed any way.
@@ -95,9 +99,9 @@
     )
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 # Because of certain set up requirement, the regress test suite is ported to
 # the STC gate.
--- a/components/openssh/openssh.p5m	Fri Nov 07 13:40:42 2014 -0800
+++ b/components/openssh/openssh.p5m	Mon Nov 10 14:51:36 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/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/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/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 \
--- a/components/openssh/patches/013-dtrace_sftp.patch	Fri Nov 07 13:40:42 2014 -0800
+++ b/components/openssh/patches/013-dtrace_sftp.patch	Mon Nov 10 14:51:36 2014 -0800
@@ -46,7 +46,7 @@
 +	    -o $(srcdir)/sftp_provider.h
 +
 +sftp_provider.o: sftp_provider.d sftp_provider.h sftp-server.o
-+	/usr/sbin/dtrace -G -32 -xnolibs -s $(srcdir)/sftp_provider.d \
++	/usr/sbin/dtrace -G -64 -xnolibs -s $(srcdir)/sftp_provider.d \
 +            sftp-server.o -o sftp_provider.o
 +
  clean:	regressclean
upstream/oracle/userland-gate