Page MenuHomeFreeBSD
Files F107523202

D32808.diff
No OneTemporary
Actions

D32808.diff
View Options

diff --git a/secure/Makefile.inc b/secure/Makefile.inc
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,15 +1,9 @@
# $FreeBSD$
-.include <src.opts.mk>
-
.if exists(${.CURDIR:H:H}/lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj
.else
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt
.endif
-.if ${MK_OPENSSH} != "no"
-SSHDIR= ${SRCTOP}/crypto/openssh
-.endif
-
WARNS?= 0
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
LIB= ssh
PRIVATELIB= true
@@ -50,9 +51,6 @@
LIBADD+= ldns
.endif
-CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
-
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
SRCS+= krb5_config.h
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
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
LIBADD= ssh
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-keysign
SRCS= ssh-keysign.c readconf.c uidswap.c
MAN= ssh-keysign.8
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
BINMODE=4555
LIBADD= ssh
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
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
LIBADD= ssh
diff --git a/secure/ssh.mk b/secure/ssh.mk
new file mode 100644
--- /dev/null
+++ b/secure/ssh.mk
@@ -0,0 +1,6 @@
+# Common Make variables for OpenSSH
+
+SSHDIR= ${SRCTOP}/crypto/openssh
+
+CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= scp
SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh edit
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-add
SRCS+= ssh-add.c ssh-sk-client.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-agent
SRCS= ssh-agent.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,13 +1,12 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-keygen
# XXX ssh-sk-client.c in libssh maybe?
SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-keyscan
SRCS= ssh-keyscan.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
CONFS= ssh_config
CONFSDIR= /etc/ssh
@@ -16,9 +17,6 @@
# 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
-
LIBADD= ssh
.if ${MK_LDNS} != "no"
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
+.include "${SRCTOP}/secure/ssh.mk"
CONFS= moduli sshd_config
CONFSDIR= /etc/ssh
@@ -25,8 +26,6 @@
SRCS+= gss-genr.c
MAN= sshd.8 sshd_config.5
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
# Don't rebuild based on moduli.c
moduli: .MADE

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 16, 10:04 AM (19 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15823767
Default Alt Text
D32808.diff (5 KB)

Event Timeline