Page MenuHomeFreeBSD
Files F163144006

D31896.id95342.diff
No OneTemporary
Actions

D31896.id95342.diff
View Options

Index: secure/Makefile.openssh
===================================================================
--- /dev/null
+++ secure/Makefile.openssh
@@ -0,0 +1,19 @@
+# Common options for OpenSSH applications/libs
+
+.include <src.opts.mk>
+
+SSHDIR?= ${.CURDIR}
+
+# All OpenSSH applications are guaranteed to need ssh_namespace.h, and note that
+# adding it to SRCS makes it a dependency of other objects.
+CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
+
+# Handle WITH_/WITHOUT_LDNS.
+.if ${MK_LDNS} != "no"
+CFLAGS+= -DHAVE_LDNS=1
+.endif
+
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+= -DLIBWRAP=1
+.endif
Index: secure/lib/libssh/Makefile
===================================================================
--- secure/lib/libssh/Makefile
+++ secure/lib/libssh/Makefile
@@ -42,14 +42,11 @@
SRCS+= getrrsetbyname.c
.else
LDNSDIR= ${SRCTOP}/contrib/ldns
-CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR}
+CFLAGS+= -I${LDNSDIR}
SRCS+= getrrsetbyname-ldns.c
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
@@ -65,4 +62,5 @@
.include <bsd.lib.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
Index: secure/libexec/sftp-server/Makefile
===================================================================
--- secure/libexec/sftp-server/Makefile
+++ secure/libexec/sftp-server/Makefile
@@ -5,17 +5,10 @@
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
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/libexec/ssh-keysign/Makefile
===================================================================
--- secure/libexec/ssh-keysign/Makefile
+++ secure/libexec/ssh-keysign/Makefile
@@ -5,20 +5,11 @@
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
-
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
-LIBADD+= crypto
+LIBADD= crypto ssh
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/libexec/ssh-pkcs11-helper/Makefile
===================================================================
--- secure/libexec/ssh-pkcs11-helper/Makefile
+++ secure/libexec/ssh-pkcs11-helper/Makefile
@@ -5,19 +5,10 @@
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
-
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
-LIBADD+= crypto
+LIBADD= crypto ssh
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/scp/Makefile
===================================================================
--- secure/usr.bin/scp/Makefile
+++ secure/usr.bin/scp/Makefile
@@ -5,17 +5,10 @@
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
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/sftp/Makefile
===================================================================
--- secure/usr.bin/sftp/Makefile
+++ secure/usr.bin/sftp/Makefile
@@ -5,17 +5,10 @@
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
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/ssh-add/Makefile
===================================================================
--- secure/usr.bin/ssh-add/Makefile
+++ secure/usr.bin/ssh-add/Makefile
@@ -5,17 +5,10 @@
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
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/ssh-agent/Makefile
===================================================================
--- secure/usr.bin/ssh-agent/Makefile
+++ secure/usr.bin/ssh-agent/Makefile
@@ -5,23 +5,14 @@
PROG= ssh-agent
SRCS= ssh-agent.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
-LIBADD= ssh
-
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
+LIBADD= crypto ssh
.if defined(LOCALBASE)
CFLAGS+= -DDEFAULT_PKCS11_WHITELIST='"/usr/lib*/*,${LOCALBASE}/lib*/*"'
.endif
-LIBADD+= crypto
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/ssh-keygen/Makefile
===================================================================
--- secure/usr.bin/ssh-keygen/Makefile
+++ secure/usr.bin/ssh-keygen/Makefile
@@ -6,17 +6,10 @@
# 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
-
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-.endif
-
-LIBADD+= crypto
+LIBADD= crypto ssh
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/ssh-keyscan/Makefile
===================================================================
--- secure/usr.bin/ssh-keyscan/Makefile
+++ secure/usr.bin/ssh-keyscan/Makefile
@@ -5,17 +5,10 @@
PROG= ssh-keyscan
SRCS= ssh-keyscan.c
PACKAGE= ssh
-CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-SRCS+= ssh_namespace.h
LIBADD= ssh
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.bin/ssh/Makefile
===================================================================
--- secure/usr.bin/ssh/Makefile
+++ secure/usr.bin/ssh/Makefile
@@ -16,15 +16,8 @@
# 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"
-CFLAGS+= -DHAVE_LDNS=1
-.endif
-
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
SRCS+= krb5_config.h
@@ -39,4 +32,5 @@
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}
Index: secure/usr.sbin/sshd/Makefile
===================================================================
--- secure/usr.sbin/sshd/Makefile
+++ secure/usr.sbin/sshd/Makefile
@@ -25,8 +25,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
@@ -34,12 +32,6 @@
# pam should always happen before ssh here for static linking
LIBADD= pam ssh util
-.if ${MK_LDNS} != "no"
-CFLAGS+= -DHAVE_LDNS=1
-#DPADD+= ${LIBLDNS}
-#LDADD+= -lldns
-.endif
-
.if ${MK_AUDIT} != "no"
CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1
LIBADD+= bsm
@@ -59,7 +51,6 @@
.endif
.if ${MK_TCP_WRAPPERS} != "no"
-CFLAGS+= -DLIBWRAP=1
LIBADD+= wrap
.endif
@@ -71,4 +62,5 @@
.include <bsd.prog.mk>
+.include "${SRCTOP}/secure/Makefile.openssh"
.PATH: ${SSHDIR}

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 21, 12:09 PM (6 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35316069
Default Alt Text
D31896.id95342.diff (7 KB)

Event Timeline