summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--secure/Makefile.inc15
-rw-r--r--secure/lib/libcipher/Makefile2
-rw-r--r--secure/lib/libcrypto/Makefile5
-rw-r--r--secure/lib/libssh/Makefile16
-rw-r--r--secure/lib/libtelnet/Makefile7
-rw-r--r--secure/libexec/Makefile.inc3
-rw-r--r--secure/libexec/sftp-server/Makefile19
-rw-r--r--secure/libexec/telnetd/Makefile4
-rw-r--r--secure/usr.bin/Makefile.inc3
-rw-r--r--secure/usr.bin/openssl/Makefile1
-rw-r--r--secure/usr.bin/scp/Makefile13
-rw-r--r--secure/usr.bin/ssh-add/Makefile14
-rw-r--r--secure/usr.bin/ssh-agent/Makefile14
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile14
-rw-r--r--secure/usr.bin/ssh/Makefile15
-rw-r--r--secure/usr.bin/telnet/Makefile2
-rw-r--r--secure/usr.sbin/Makefile.inc3
-rw-r--r--secure/usr.sbin/sshd/Makefile21
18 files changed, 62 insertions, 109 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index f4968b8..ca5d1f4 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -4,12 +4,6 @@ DISTRIBUTION?=crypto
TELNETDIR= ${.CURDIR}/../../../crypto/telnet
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-TELNETOBJDIR= ${.OBJDIR}/../../lib/libtelnet
-.else
-TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet
-.endif
-
.if exists(${.CURDIR}/../../lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj
.else
@@ -19,3 +13,12 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
CFLAGS+= -DNO_IDEA
.endif
+
+.if !defined(NO_OPENSSH)
+SSHDIR= ${.CURDIR}/../../../crypto/openssh
+.if exists(${.OBJDIR}/../../lib/libssh)
+LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
+.else
+LIBSSH= ${.CURDIR}/../../lib/libssh/libssh.a
+.endif
+.endif
diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile
index a93667f..3074dab 100644
--- a/secure/lib/libcipher/Makefile
+++ b/secure/lib/libcipher/Makefile
@@ -7,7 +7,7 @@ SRCS= crypt.c
PRECIOUSLIB= yes
#NOPROFILE= yes
-MAN3= cipher.3
+MAN= cipher.3
MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3
MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 3cf7d85..0e7f19e 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -337,9 +337,8 @@ POD3+= ssl/SSL_CIPHER_get_name.pod \
.for section in 1 3
.for pod in ${POD${section}}
.for target in ${pod:T:S/.pod/.${section}/g}
-MAN${section}+= ${target}
+MAN+= ${target}
CLEANFILES+= ${target}
-all-man: ${target}
${target}: ${LCRYPTO_SRC}/../doc/${pod}
pod2man ${LCRYPTO_SRC}/../doc/${pod} > ${target}
.endfor
@@ -347,7 +346,7 @@ ${target}: ${LCRYPTO_SRC}/../doc/${pod}
.endfor
.endif
-MAN3+= des_crypt.3
+MAN+= des_crypt.3
MLINKS= des_crypt.3 des_read_password.3 \
des_crypt.3 des_read_2password.3 des_crypt.3 des_string_to_key.3 \
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index f13800b..f10d110 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
LIB= ssh
SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
cipher.c compat.c compress.c crc32.c deattack.c \
@@ -11,19 +9,14 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
cli.c rijndael.c
-NOPIC= yes
-
-install:
+NOPIC= yes
+INTERNALLIB= yes
+INTERNALSTATICLIB= yes
.if defined(COMPAT_GETADDRINFO)
SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
.endif
-.include <bsd.own.mk>
-
-.PATH: ${SSHSRC}
-.PATH: ${SSHSRC}/lib
-
.if defined(MAKE_KERBEROS4) && \
((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
CFLAGS+= -DKRB4
@@ -38,4 +31,7 @@ CFLAGS+= -DSKEY
DPADD+= ${LIBOPIE}
LDADD+= -lopie
SRCS+= auth-skey.c auth2-skey.c
+
.include <bsd.lib.mk>
+
+.PATH: ${SSHDIR} ${SSHDIR}/lib
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 17cab4f..23a0d0e 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -6,11 +6,12 @@ SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c pk.c
CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -I${TELNETDIR} \
+ -I${TELNETDIR}
NOPIC= yes
-INCLUDES= ${TELNETDIR}/arpa/telnet.h
+INCS= ${TELNETDIR}/arpa/telnet.h
+INCDIR= /usr/include/arpa
#
# Before complaining about this, please *double-check* that you have
@@ -20,7 +21,7 @@ INCLUDES= ${TELNETDIR}/arpa/telnet.h
# shared against libtelnet, so that in a future release we can move this
# off to a compat dist (like compat22).
#
-beforeinstall:
+afterinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.include <bsd.lib.mk>
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 4adbbf5..2b09436 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,5 @@
# $FreeBSD$
-BINDIR= /usr/libexec
+BINDIR?= /usr/libexec
+
.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 731676c..a913d5d 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,22 +1,13 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
-.PATH: ${SSHSRC}
-#.PATH: ${SSHSRC}/lib
-
PROG= sftp-server
-BINOWN= root
-
-BINMODE?=555
-
-BINDIR= /usr/libexec
-MAN8= sftp-server.8
-
SRCS= sftp-server.c log-server.c
+MAN= sftp-server.8
+
+LDADD+= ${LIBSSH} -lcrypto
+DPADD+= ${LIBSSH} ${LIBCRYPTO}
.include <bsd.prog.mk>
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto
-DPADD+= ${LIBCRYPTO}
+.PATH: ${SSHDIR}
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 53de979..20ec331 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -4,7 +4,7 @@
# telnet implementations.
PROG= telnetd
-MAN8= telnetd.8
+MAN= telnetd.8
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
@@ -15,7 +15,7 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBMP} \
${LIBCRYPT}
-LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp
+LDADD= -lutil -ltermcap -ltelnet -lcrypto -lcrypt -lmp
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
index c4fd273..de35b78 100644
--- a/secure/usr.bin/Makefile.inc
+++ b/secure/usr.bin/Makefile.inc
@@ -1,4 +1,5 @@
# $FreeBSD$
-BINDIR= /usr/bin
+BINDIR?= /usr/bin
+
.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index a97daf4..efe3c302 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -10,7 +10,6 @@ PROG= openssl
MAINTAINER= kris
LDADD= -lssl -lcrypto
-MAN1= openssl.1
MLINKS= openssl.1 ssl.8
CFLAGS+= -DMONOLITH -I${.CURDIR}
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 80ad088..c4cfac2 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,18 +1,11 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
PROG= scp
-BINOWN= root
-BINMODE=555
-MAN1= scp.1
-SRCS= scp.c
+LDADD+= ${LIBSSH} -lcrypto -lutil -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
.include <bsd.prog.mk>
-.PATH: ${SSHSRC}
-
-LDADD+= -lcrypto -lutil -lz -L${.OBJDIR}/../../lib/libssh -lssh
-DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+.PATH: ${SSHDIR}
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 5e8dbf2..fb657da 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,18 +1,12 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
PROG= ssh-add
-BINOWN= root
-BINMODE=555
-MAN1= ssh-add.1
-
SRCS= ssh-add.c log-client.c
-.include <bsd.prog.mk>
+LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.PATH: ${SSHSRC}
+.include <bsd.prog.mk>
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.PATH: ${SSHDIR}
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index 901f09e..bf9cfd6 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,18 +1,12 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
PROG= ssh-agent
-BINOWN= root
-BINMODE=555
-MAN= ssh-agent.1
-
SRCS= ssh-agent.c log-client.c
-.include <bsd.prog.mk>
+LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.PATH: ${SSHSRC}
+.include <bsd.prog.mk>
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.PATH: ${SSHDIR}
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index b34e0f7..b53e164 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,18 +1,12 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
PROG= ssh-keygen
-BINOWN= root
-BINMODE=555
-MAN= ssh-keygen.1
-
SRCS= key.c log-client.c ssh-keygen.c
-.include <bsd.prog.mk>
+LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.PATH: ${SSHSRC}
+.include <bsd.prog.mk>
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.PATH: ${SSHDIR}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 0b99611..fcb95d9 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,25 +1,16 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
-
PROG= ssh
-BINOWN= root
.if defined(ENABLE_SUID_SSH)
BINMODE=4555
.endif
-MAN1= ssh.1
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MLINKS= ssh.1 slogin.1
SRCS= ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
sshconnect1.c sshconnect2.c
-.include <bsd.own.mk>
-
-.PATH: ${SSHSRC}
-.PATH: ${SSHSRC}/lib
-
.if defined(MAKE_KERBEROS4) && \
((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
DISTRIBUTION=krb4
@@ -40,7 +31,9 @@ DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
-DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+LDADD+= ${LIBSSH} -lcrypto -lutil -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
.include <bsd.prog.mk>
+
+.PATH: ${SSHDIR}
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index b59da7a..0e9db53 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -11,7 +11,7 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
DPADD+= ${LIBIPSEC}
-LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp
+LDADD= -ltermcap -ltelnet -lcrypto -lcrypt -lmp
LDADD+= -lipsec
.include <bsd.prog.mk>
diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc
index c3699c1..1495232 100644
--- a/secure/usr.sbin/Makefile.inc
+++ b/secure/usr.sbin/Makefile.inc
@@ -1,4 +1,5 @@
# $FreeBSD$
-BINDIR?=/usr/sbin
+BINDIR?= /usr/sbin
+
.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 93c3ad0..caa71d1 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,25 +1,17 @@
# $FreeBSD$
#
-SSHSRC= ${.CURDIR}/../../../crypto/openssh
LOGINSRC= ${.CURDIR}/../../../usr.bin/login
PROG= sshd
-BINOWN= root
-BINMODE=555
-MAN8= sshd.8
-
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
pty.c log-server.c login.c servconf.c serverloop.c \
auth.c auth1.c auth2.c auth-options.c session.c login_access.c dh.c \
auth-pam.c
+MAN= sshd.8
CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DLOGIN_ACCESS -I${LOGINSRC} -DUSE_PAM -DHAVE_PAM_GETENVLIST
-.include <bsd.own.mk>
-
-.PATH: ${SSHSRC} ${LOGINSRC}
-
.if defined(MAKE_KERBEROS4) && \
((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
DISTRIBUTION=krb4
@@ -42,12 +34,13 @@ CFLAGS+= -DSKEY
LDADD+= -lopie -lmd
DPADD+= ${LIBOPIE} ${LIBMD}
-.include <bsd.prog.mk>
-
.if defined(X11BASE)
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif
-LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap \
- -lpam
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
+LDADD+= ${LIBSSH} -lcrypt -lcrypto -lutil -lz -lwrap -lpam
+DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
+
+.include <bsd.prog.mk>
+
+.PATH: ${SSHDIR} ${LOGINSRC}
OpenPOWER on IntegriCloud