diff -r c60efbddf9c8 -r c11a68c3a63d components/openssh/Makefile --- a/components/openssh/Makefile Fri Jan 27 13:46:43 2017 -0800 +++ b/components/openssh/Makefile Fri Jan 27 14:23:05 2017 -0800 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. # COMPILER= gcc include ../../make-rules/shared-macros.mk @@ -54,6 +54,7 @@ CFLAGS += -DSET_USE_PAM CFLAGS += -DDEPRECATE_SUNSSH_OPT CFLAGS += -DKRB5_BUILD_FIX +CFLAGS += -DDTRACE_SFTP CFLAGS += -DDISABLE_BANNER CFLAGS += -DPAM_ENHANCEMENT CFLAGS += -DPAM_BUGFIX @@ -91,6 +92,12 @@ CONFIGURE_OPTIONS += --bindir=$(USRBINDIR) CONFIGURE_OPTIONS += --disable-lastlog +# Copy the sftp dtrace provider file and the header file to source directory +COMPONENT_PRE_BUILD_ACTION = \ + ( echo "Copying dtrace sftp files..."; \ + $(LN) -fs $(COMPONENT_DIR)/dtrace_sftp/*.[dh] $(SOURCE_DIR); \ + ) + MANLIST= moduli.5 scp.1 sftp-server.8 sftp.1 ssh-add.1 ssh-agent.1 \ ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8 \ ssh.1 ssh_config.5 sshd.8 sshd_config.5