secure/ build fixes:
- TELNETOBJDIR is gone. `buildworld' already installs libtelnet.a
in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.
- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
New LIBSSH is introduced for libssh.a (an internal static lib).
Previously, build without prior `obj' was broken; SSH modules
always looked for libssh.a in ${.OBJDIR}. Also, the dependancies
on the libssh.a were missing.
- libtelnet/ did not install the crypto version of telnet.h into
/usr/include/arpa.
- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.
Reviewed by: markm
- MAN[1-9] -> MAN.
This commit is contained in:
Ruslan Ermilov
parent
75c9631fac
commit
b8cba406f2
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
BINDIR= /usr/libexec
|
||||
BINDIR?= /usr/libexec
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
BINDIR= /usr/bin
|
||||
BINDIR?= /usr/bin
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
|
||||
@ -10,7 +10,6 @@ PROG= openssl
|
||||
MAINTAINER= kris
|
||||
|
||||
LDADD= -lssl -lcrypto
|
||||
MAN1= openssl.1
|
||||
MLINKS= openssl.1 ssl.8
|
||||
|
||||
CFLAGS+= -DMONOLITH -I${.CURDIR}
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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
|
||||
|
||||
LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${SSHSRC}
|
||||
|
||||
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
.PATH: ${SSHDIR}
|
||||
|
||||
@ -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
|
||||
|
||||
LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${SSHSRC}
|
||||
|
||||
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
.PATH: ${SSHDIR}
|
||||
|
||||
@ -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
|
||||
|
||||
LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${SSHSRC}
|
||||
|
||||
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
|
||||
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
.PATH: ${SSHDIR}
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
BINDIR?=/usr/sbin
|
||||
BINDIR?= /usr/sbin
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
|
||||
@ -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}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user