aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kerberos5/Makefile.inc7
-rw-r--r--kerberos5/lib/Makefile1
-rw-r--r--kerberos5/lib/libtelnet/Makefile15
-rw-r--r--kerberos5/libexec/Makefile2
-rw-r--r--kerberos5/libexec/telnetd/Makefile8
-rw-r--r--kerberos5/usr.bin/Makefile2
-rw-r--r--kerberos5/usr.bin/telnet/Makefile15
-rw-r--r--kerberosIV/lib/libtelnet/Makefile15
-rw-r--r--kerberosIV/libexec/telnetd/Makefile11
-rw-r--r--kerberosIV/usr.bin/telnet/Makefile15
-rw-r--r--secure/lib/Makefile2
-rw-r--r--secure/lib/libtelnet/Makefile4
-rw-r--r--secure/libexec/Makefile2
-rw-r--r--secure/usr.bin/telnet/Makefile6
14 files changed, 59 insertions, 46 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index bf86f380e1af..a72ef174e82a 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -10,6 +10,7 @@ INCLUDEDIR= ${.CURDIR}/../../include
KRB4DIR= ${.CURDIR}/../../../crypto/kerberosIV
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
+TELNETDIR= ${.CURDIR}/../../../crypto/telnet
CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
@@ -98,6 +99,12 @@ SLOBJDIR= ${.OBJDIR}/../../lib/libsl
SLOBJDIR= ${.CURDIR}/../../lib/libsl
.endif
+.if exists(${.OBJDIR}/../../lib/libtelnet)
+LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
+.else
+LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
+.endif
+
COMPILE_ET= compile_et
.ORDER: asn1_err.c asn1_err.h
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index c8bf76918117..c0d5cab9df14 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -5,4 +5,5 @@ SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl l
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
SUBDIR+=libkafs5
.endif
+SUBDIR+=libtelnet
.include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index 35e936e8de46..7ee29e6bd2e2 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -6,19 +6,20 @@ INTERNALLIB= yes
INTERNALSTATICLIB=yes
NOPIC= yes
-SRCS= genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
- enc_des.c pk.c sra.c
+SRCS= genget.c getent.c misc.c encrypt.c auth.c \
+ enc_des.c sra.c pk.c
+#SRCS+= kerberos5.c
-CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -DKRB4 -DSRA -I${TELNETDIR} \
- -I${KRB4DIR}/lib/krb
+CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
+ -DSRA -I${TELNETDIR}
+#CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5
-INCS= ${TELNETDIR}/arpa/telnet.h
+INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa
#
# Remove obsolete shared libraries, if any. We don't bother moving them
-# to/usr/lib/compat, since they were only used by telnet, telnetd and
+# to /usr/lib/compat, since they were only used by telnet, telnetd and
# tn3270.
#
beforeinstall:
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index 5efa736e1f4b..c1f685e57994 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd
+SUBDIR= ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd telnetd
.include <bsd.subdir.mk>
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index 447299039de5..24e373168393 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -13,10 +13,10 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c authenc.c
-DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
- ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMP} ${LIBPAM}
-LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp ${MINUSLPAM}
+DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBPAM}
+LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+ -lcrypt ${MINUSLPAM}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index b21882937d73..60f05e58628d 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= k5admin k5destroy k5init k5list k5passwd k5su
+SUBDIR= k5admin k5destroy k5init k5list k5passwd k5su telnet
.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 7d331f7e45f4..b2755c816eec 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -2,17 +2,18 @@
PROG= telnet
-CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
- -DENCRYPTION -DAUTHENTICATION -DKRB4 \
- -I${TELNETDIR} -DIPSEC -DINET6
+CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
+ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+ -I${TELNETDIR}
+#CFLAGS+= -DKRB5
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
-DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
- ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
-LDADD= -ltermcap ${LIBTELNET} -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec ${MINUSLPAM}
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
+ ${LIBIPSEC} ${LIBPAM}
+LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
+ -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>
diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile
index 35e936e8de46..d1707caad0f1 100644
--- a/kerberosIV/lib/libtelnet/Makefile
+++ b/kerberosIV/lib/libtelnet/Makefile
@@ -6,19 +6,20 @@ INTERNALLIB= yes
INTERNALSTATICLIB=yes
NOPIC= yes
-SRCS= genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
- enc_des.c pk.c sra.c
+SRCS= genget.c getent.c misc.c encrypt.c auth.c \
+ enc_des.c sra.c pk.c
+SRCS+= kerberos.c
-CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -DKRB4 -DSRA -I${TELNETDIR} \
- -I${KRB4DIR}/lib/krb
+CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
+ -DSRA -I${TELNETDIR}
+CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb
-INCS= ${TELNETDIR}/arpa/telnet.h
+INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa
#
# Remove obsolete shared libraries, if any. We don't bother moving them
-# to/usr/lib/compat, since they were only used by telnet, telnetd and
+# to /usr/lib/compat, since they were only used by telnet, telnetd and
# tn3270.
#
beforeinstall:
diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile
index 447299039de5..79f41fa14a97 100644
--- a/kerberosIV/libexec/telnetd/Makefile
+++ b/kerberosIV/libexec/telnetd/Makefile
@@ -6,17 +6,18 @@
PROG= telnetd
MAN= telnetd.8
-CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
+CFLAGS= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-I${TELNETDIR} -DINET6
+CFLAGS+= -DKRB4
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c authenc.c
-DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
- ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMP} ${LIBPAM}
-LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp ${MINUSLPAM}
+DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+ ${LIBKRB} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBPAM}
+LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err ${MINUSLPAM}
.include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile
index 7d331f7e45f4..e5d752da2daf 100644
--- a/kerberosIV/usr.bin/telnet/Makefile
+++ b/kerberosIV/usr.bin/telnet/Makefile
@@ -2,17 +2,18 @@
PROG= telnet
-CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
- -DENCRYPTION -DAUTHENTICATION -DKRB4 \
- -I${TELNETDIR} -DIPSEC -DINET6
+CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
+ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+ -I${TELNETDIR}
+CFLAGS+= -DKRB4
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
-DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
- ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
-LDADD= -ltermcap ${LIBTELNET} -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec ${MINUSLPAM}
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBKRB} \
+ ${LIBCRYPT} ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
+LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto \
+ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index a3aa74cf17dd..a6f15de72504 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR= libcipher
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4)
+.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
SUBDIR+=libtelnet
.endif
.if !defined(NO_OPENSSL)
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 4eda977e702f..c19cfb8092a1 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -9,8 +9,8 @@ NOPIC= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
-CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -DSRA -I${TELNETDIR}
+CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
+ -DSRA -I${TELNETDIR}
INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index c5992e6bcf53..cd8405bbac94 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
SUBDIR= telnetd
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 56f7a7e8b899..f5fe1997d3a4 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -2,9 +2,9 @@
PROG= telnet
-CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
- -DENCRYPTION -DAUTHENTICATION -I${TELNETDIR}
-CFLAGS+= -DIPSEC -DINET6
+CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
+ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+ -I${TELNETDIR}
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:48:52 +0000