From owner-svn-src-stable@freebsd.org Thu Jan 7 23:26:19 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D8B6A66C1A; Thu, 7 Jan 2016 23:26:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C62811AED; Thu, 7 Jan 2016 23:26:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07NQHi3091787; Thu, 7 Jan 2016 23:26:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07NQGHw091773; Thu, 7 Jan 2016 23:26:16 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201601072326.u07NQGHw091773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 7 Jan 2016 23:26:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293396 - in stable/10: lib/libpam/modules/pam_ssh secure/lib/libssh secure/libexec/sftp-server secure/libexec/ssh-keysign secure/libexec/ssh-pkcs11-helper secure/usr.bin/scp secure/usr... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2016 23:26:19 -0000 Author: bdrewery Date: Thu Jan 7 23:26:16 2016 New Revision: 293396 URL: https://svnweb.freebsd.org/changeset/base/293396 Log: MFC r291941: Replace unneeded manual dependency on header by adding it to SRCS. Modified: stable/10/lib/libpam/modules/pam_ssh/Makefile stable/10/secure/lib/libssh/Makefile stable/10/secure/libexec/sftp-server/Makefile stable/10/secure/libexec/ssh-keysign/Makefile stable/10/secure/libexec/ssh-pkcs11-helper/Makefile stable/10/secure/usr.bin/scp/Makefile stable/10/secure/usr.bin/sftp/Makefile stable/10/secure/usr.bin/ssh-add/Makefile stable/10/secure/usr.bin/ssh-agent/Makefile stable/10/secure/usr.bin/ssh-keygen/Makefile stable/10/secure/usr.bin/ssh-keyscan/Makefile stable/10/secure/usr.bin/ssh/Makefile stable/10/secure/usr.sbin/sshd/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libpam/modules/pam_ssh/Makefile ============================================================================== --- stable/10/lib/libpam/modules/pam_ssh/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/lib/libpam/modules/pam_ssh/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -12,6 +12,7 @@ SRCS+= roaming_dummy.c WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} LDADD= -lssh -lcrypto -lcrypt @@ -20,5 +21,3 @@ USEPRIVATELIB= ssh .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/lib/libssh/Makefile ============================================================================== --- stable/10/secure/lib/libssh/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/lib/libssh/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -40,9 +40,11 @@ USEPRIVATELIB+= ldns .endif CFLAGS+= -I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken .endif @@ -59,8 +61,3 @@ LDADD+= -lcrypto -lcrypt -lz .include .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif Modified: stable/10/secure/libexec/sftp-server/Makefile ============================================================================== --- stable/10/secure/libexec/sftp-server/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/libexec/sftp-server/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -6,6 +6,7 @@ PROG= sftp-server SRCS= sftp-server.c sftp-common.c sftp-server-main.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -29,5 +30,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/libexec/ssh-keysign/Makefile ============================================================================== --- stable/10/secure/libexec/ssh-keysign/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/libexec/ssh-keysign/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -6,6 +6,7 @@ PROG= ssh-keysign SRCS= ssh-keysign.c roaming_dummy.c readconf.c MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h BINMODE=4555 DPADD= ${LIBSSH} @@ -25,5 +26,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/libexec/ssh-pkcs11-helper/Makefile ============================================================================== --- stable/10/secure/libexec/ssh-pkcs11-helper/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/libexec/ssh-pkcs11-helper/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -6,6 +6,7 @@ PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c MAN= ssh-pkcs11-helper.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -29,5 +30,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/scp/Makefile ============================================================================== --- stable/10/secure/usr.bin/scp/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/scp/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= scp SRCS= scp.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/sftp/Makefile ============================================================================== --- stable/10/secure/usr.bin/sftp/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/sftp/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/ssh-add/Makefile ============================================================================== --- stable/10/secure/usr.bin/ssh-add/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/ssh-add/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= ssh-add SRCS+= ssh-add.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/ssh-agent/Makefile ============================================================================== --- stable/10/secure/usr.bin/ssh-agent/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/ssh-agent/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= ssh-agent SRCS= ssh-agent.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/ssh-keygen/Makefile ============================================================================== --- stable/10/secure/usr.bin/ssh-keygen/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/ssh-keygen/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= ssh-keygen SRCS= ssh-keygen.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh @@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/ssh-keyscan/Makefile ============================================================================== --- stable/10/secure/usr.bin/ssh-keyscan/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/ssh-keyscan/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -5,6 +5,7 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} LDADD= -lssh @@ -23,5 +24,3 @@ LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Modified: stable/10/secure/usr.bin/ssh/Makefile ============================================================================== --- stable/10/secure/usr.bin/ssh/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.bin/ssh/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -3,7 +3,6 @@ .include PROG= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 @@ -15,6 +14,9 @@ SRCS= ssh.c readconf.c clientloop.c ssht # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h + DPADD= ${LIBSSH} ${LIBUTIL} LDADD= -lssh -lutil USEPRIVATELIB= ssh @@ -28,6 +30,7 @@ USEPRIVATELIB+= ldns .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif @@ -46,8 +49,3 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif Modified: stable/10/secure/usr.sbin/sshd/Makefile ============================================================================== --- stable/10/secure/usr.sbin/sshd/Makefile Thu Jan 7 23:23:51 2016 (r293395) +++ stable/10/secure/usr.sbin/sshd/Makefile Thu Jan 7 23:26:16 2016 (r293396) @@ -24,6 +24,7 @@ SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} LDADD= -lssh -lutil -lwrap ${MINUSLPAM} @@ -44,6 +45,7 @@ LDADD+= -lbsm .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ @@ -74,8 +76,3 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif