Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code was syntax checked, not run checked.
This commit is contained in:
parent
2154a1eed3
commit
dbf104e68d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=114709
@ -7,17 +7,6 @@ KPROGS= lib/libpam secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
|
|||||||
|
|
||||||
# This target is used to rebuild these programs WITH Kerberos.
|
# This target is used to rebuild these programs WITH Kerberos.
|
||||||
kerberize:
|
kerberize:
|
||||||
.for entry in ${KPROGS}
|
|
||||||
cd ${.CURDIR}/../${entry}; \
|
|
||||||
${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 cleandir; \
|
|
||||||
${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 obj; \
|
|
||||||
${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 depend; \
|
|
||||||
${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 all; \
|
|
||||||
${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 install
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
# This target is used to rebuild these programs WITHOUT Kerberos.
|
|
||||||
dekerberize:
|
|
||||||
.for entry in ${KPROGS}
|
.for entry in ${KPROGS}
|
||||||
cd ${.CURDIR}/../${entry}; \
|
cd ${.CURDIR}/../${entry}; \
|
||||||
${MAKE} ${MFLAGS} cleandir; \
|
${MAKE} ${MFLAGS} cleandir; \
|
||||||
@ -27,4 +16,15 @@ dekerberize:
|
|||||||
${MAKE} ${MFLAGS} install
|
${MAKE} ${MFLAGS} install
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
# This target is used to rebuild these programs WITHOUT Kerberos.
|
||||||
|
dekerberize:
|
||||||
|
.for entry in ${KPROGS}
|
||||||
|
cd ${.CURDIR}/../${entry}; \
|
||||||
|
${MAKE} ${MFLAGS} -DNO_KERBEROS cleandir; \
|
||||||
|
${MAKE} ${MFLAGS} -DNO_KERBEROS obj; \
|
||||||
|
${MAKE} ${MFLAGS} -DNO_KERBEROS depend; \
|
||||||
|
${MAKE} ${MFLAGS} -DNO_KERBEROS all; \
|
||||||
|
${MAKE} ${MFLAGS} -DNO_KERBEROS install
|
||||||
|
.endfor
|
||||||
|
|
||||||
.include <bsd.subdir.mk>
|
.include <bsd.subdir.mk>
|
||||||
|
@ -80,7 +80,7 @@ _libdisk= libdisk
|
|||||||
.if defined(RELEASEDIR) || \
|
.if defined(RELEASEDIR) || \
|
||||||
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
||||||
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
||||||
(defined(NOSECURE) && !defined(MAKE_KERBEROS5))
|
(defined(NOSECURE) && defined(NO_KERBEROS))
|
||||||
_libtelnet= libtelnet
|
_libtelnet= libtelnet
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ MODULES += pam_exec
|
|||||||
MODULES += pam_ftp
|
MODULES += pam_ftp
|
||||||
MODULES += pam_ftpusers
|
MODULES += pam_ftpusers
|
||||||
MODULES += pam_group
|
MODULES += pam_group
|
||||||
.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||||
MODULES += pam_krb5
|
MODULES += pam_krb5
|
||||||
MODULES += pam_ksu
|
MODULES += pam_ksu
|
||||||
.endif
|
.endif
|
||||||
|
@ -41,7 +41,7 @@ SUBDIR+=mail.local smrsh
|
|||||||
.if defined(RELEASEDIR) || \
|
.if defined(RELEASEDIR) || \
|
||||||
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
||||||
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
||||||
(defined(NOSECURE) && !defined(MAKE_KERBEROS5))
|
(defined(NOSECURE) && defined(NO_KERBEROS))
|
||||||
# make release needs both
|
# make release needs both
|
||||||
SUBDIR+=telnetd
|
SUBDIR+=telnetd
|
||||||
.endif
|
.endif
|
||||||
|
@ -220,14 +220,10 @@ DISKLABEL?= disklabel
|
|||||||
|
|
||||||
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
|
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
|
||||||
|
|
||||||
# Things that need to be recompiled with Kerberos support.
|
|
||||||
.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
|
|
||||||
K5PROGS!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
|
|
||||||
.endif
|
|
||||||
|
|
||||||
# Things that need to be compiled without crypto support in releases
|
# Things that need to be compiled without crypto support in releases
|
||||||
.if !defined(FIXCRYPTO)
|
.if !defined(FIXCRYPTO)
|
||||||
FIXCRYPTO= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
|
FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
|
||||||
|
FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
|
||||||
lib/libfetch usr.bin/fetch
|
lib/libfetch usr.bin/fetch
|
||||||
.if !defined(NO_SENDMAIL)
|
.if !defined(NO_SENDMAIL)
|
||||||
FIXCRYPTO+= usr.sbin/sendmail
|
FIXCRYPTO+= usr.sbin/sendmail
|
||||||
@ -424,7 +420,6 @@ release rerelease:
|
|||||||
MAKE_ISOS \
|
MAKE_ISOS \
|
||||||
NOCDROM \
|
NOCDROM \
|
||||||
NODOC \
|
NODOC \
|
||||||
NOKERBEROS \
|
|
||||||
NOPORTS \
|
NOPORTS \
|
||||||
NOSHARED \
|
NOSHARED \
|
||||||
NOSRC \
|
NOSRC \
|
||||||
@ -520,13 +515,6 @@ release.3:
|
|||||||
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
|
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
|
||||||
SUBDIR_OVERRIDE="${FIXCRYPTO}" \
|
SUBDIR_OVERRIDE="${FIXCRYPTO}" \
|
||||||
buildworld distributeworld DISTDIR=${RD}/trees
|
buildworld distributeworld DISTDIR=${RD}/trees
|
||||||
.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
|
|
||||||
cd ${.CURDIR}/..; \
|
|
||||||
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \
|
|
||||||
SUBDIR_OVERRIDE="kerberos5 ${K5PROGS}" \
|
|
||||||
buildworld distributeworld DISTDIR=${RD}/trees
|
|
||||||
rm -f ${RD}/trees/krb5/usr/share/info/dir
|
|
||||||
.endif
|
|
||||||
-chflags -R noschg ${RD}/trees
|
-chflags -R noschg ${RD}/trees
|
||||||
touch release.3
|
touch release.3
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ SUBDIR+=libcrypto libssl
|
|||||||
.if !defined(NO_OPENSSH)
|
.if !defined(NO_OPENSSH)
|
||||||
SUBDIR+=libssh
|
SUBDIR+=libssh
|
||||||
.endif
|
.endif
|
||||||
.if !defined(MAKE_KERBEROS5)
|
.if defined(NO_KERBEROS)
|
||||||
SUBDIR+=libtelnet
|
SUBDIR+=libtelnet
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
@ -19,7 +19,7 @@ SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
CFLAGS+= -I${SSHDIR}
|
CFLAGS+= -I${SSHDIR}
|
||||||
.if defined(MAKE_KERBEROS5)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DKRB5 -DHEIMDAL
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ SUBDIR=
|
|||||||
.if !defined(NO_OPENSSH)
|
.if !defined(NO_OPENSSH)
|
||||||
SUBDIR+=sftp-server ssh-keysign
|
SUBDIR+=sftp-server ssh-keysign
|
||||||
.endif
|
.endif
|
||||||
.if !defined(MAKE_KERBEROS5)
|
.if defined(NO_KERBEROS)
|
||||||
SUBDIR+=telnetd
|
SUBDIR+=telnetd
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
@ -6,7 +6,7 @@ SUBDIR+=openssl
|
|||||||
.if !defined(NO_OPENSSH)
|
.if !defined(NO_OPENSSH)
|
||||||
SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
|
SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
|
||||||
.endif
|
.endif
|
||||||
.if !defined(MAKE_KERBEROS5)
|
.if defined(NO_KERBEROS)
|
||||||
SUBDIR+=telnet
|
SUBDIR+=telnet
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
@ -10,7 +10,7 @@ MLINKS= ssh.1 slogin.1
|
|||||||
SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
|
SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
|
||||||
sshconnect.c sshconnect1.c sshconnect2.c
|
sshconnect.c sshconnect1.c sshconnect2.c
|
||||||
|
|
||||||
.if defined(MAKE_KERBEROS5)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DKRB5 -DHEIMDAL
|
||||||
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
|
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
|
||||||
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
|
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
|
||||||
|
@ -16,7 +16,7 @@ SRCS+= loginrec.c
|
|||||||
MAN= sshd.8 sshd_config.5
|
MAN= sshd.8 sshd_config.5
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
.if defined(MAKE_KERBEROS5)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DKRB5 -DHEIMDAL
|
||||||
SRCS+= auth-krb5.c
|
SRCS+= auth-krb5.c
|
||||||
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
|
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
|
||||||
|
@ -202,9 +202,9 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Kerberos 5
|
# Kerberos 5
|
||||||
# If you want Kerberos 5 (KTH Heimdal), define this:
|
# If you do not want Kerberos 5 (KTH Heimdal), define this:
|
||||||
#
|
#
|
||||||
#MAKE_KERBEROS5= yes
|
#NO_KERBEROS= yes
|
||||||
#
|
#
|
||||||
# Kerberos 5 su (k5su)
|
# Kerberos 5 su (k5su)
|
||||||
# If you want to use the k5su utility, define this to have it installed
|
# If you want to use the k5su utility, define this to have it installed
|
||||||
|
@ -409,13 +409,9 @@ This code is patented in the USA and many European countries.
|
|||||||
It is
|
It is
|
||||||
.Em "YOUR RESPONSIBILITY"
|
.Em "YOUR RESPONSIBILITY"
|
||||||
to determine if you can legally use IDEA.
|
to determine if you can legally use IDEA.
|
||||||
.It Va MAKE_KERBEROS5
|
.It Va NO_KERBEROS
|
||||||
.Pq Vt bool
|
.Pq Vt bool
|
||||||
Set this to build Kerberos5 (KTH Heimdal).
|
Set this if you do not want to build Kerberos 5 (KTH Heimdal).
|
||||||
.Em WARNING !
|
|
||||||
This is still experimental code.
|
|
||||||
If you need stable Kerberos5, use the
|
|
||||||
port(s).
|
|
||||||
.It Va ENABLE_SUID_K5SU
|
.It Va ENABLE_SUID_K5SU
|
||||||
.Pq Vt bool
|
.Pq Vt bool
|
||||||
Set this if you wish to use the ksu utility.
|
Set this if you wish to use the ksu utility.
|
||||||
|
@ -71,7 +71,7 @@ LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a
|
|||||||
LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a
|
LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a
|
||||||
MINUSLPAM?= -lpam
|
MINUSLPAM?= -lpam
|
||||||
.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
|
.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
|
||||||
.if defined(MAKE_KERBEROS5)
|
.if !defined(NO_KERBEROS)
|
||||||
LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN}
|
LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN}
|
||||||
MINUSLPAM+= -lkrb5 -lasn1 -lroken
|
MINUSLPAM+= -lkrb5 -lasn1 -lroken
|
||||||
LIBPAM+= ${LIBCOM_ERR}
|
LIBPAM+= ${LIBCOM_ERR}
|
||||||
|
@ -50,7 +50,7 @@ my %CONFIGS = (
|
|||||||
'ia64' => [ 'ia64' ],
|
'ia64' => [ 'ia64' ],
|
||||||
'sparc64' => [ 'sparc64' ],
|
'sparc64' => [ 'sparc64' ],
|
||||||
},
|
},
|
||||||
'ENV' => [ 'MAKE_KERBEROS5=YES', 'BOOT2_UFS=UFS1_ONLY' ],
|
'ENV' => [ 'BOOT2_UFS=UFS1_ONLY' ],
|
||||||
},
|
},
|
||||||
# 4-STABLE tinderbox
|
# 4-STABLE tinderbox
|
||||||
'triangle' => {
|
'triangle' => {
|
||||||
@ -61,7 +61,7 @@ my %CONFIGS = (
|
|||||||
'alpha' => [ 'alpha' ],
|
'alpha' => [ 'alpha' ],
|
||||||
'i386' => [ 'i386', 'pc98' ],
|
'i386' => [ 'i386', 'pc98' ],
|
||||||
},
|
},
|
||||||
'ENV' => [ 'MAKE_KERBEROS5=YES' ],
|
'ENV' => [ ],
|
||||||
},
|
},
|
||||||
# Test setup
|
# Test setup
|
||||||
'9ball' => {
|
'9ball' => {
|
||||||
@ -71,8 +71,7 @@ my %CONFIGS = (
|
|||||||
'amd64' => [ 'amd64' ],
|
'amd64' => [ 'amd64' ],
|
||||||
'powerpc' => [ 'powerpc' ],
|
'powerpc' => [ 'powerpc' ],
|
||||||
},
|
},
|
||||||
'ENV' => [ 'MAKE_KERBEROS5=YES',
|
'ENV' => [ 'NOLIBC_R=YES', 'NOFORTH=YES' ],
|
||||||
'NOLIBC_R=YES', 'NOFORTH=YES' ],
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
my %CONFIG = ();
|
my %CONFIG = ();
|
||||||
|
@ -219,7 +219,7 @@ SUBDIR= alias \
|
|||||||
.if defined(RELEASEDIR) || \
|
.if defined(RELEASEDIR) || \
|
||||||
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
|
||||||
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
defined(NOCRYPT) || defined(NO_OPENSSL) || \
|
||||||
(defined(NOSECURE) && !defined(MAKE_KERBEROS5))
|
(defined(NOSECURE) && defined(NO_KERBEROS))
|
||||||
# make release needs both
|
# make release needs both
|
||||||
SUBDIR+=telnet
|
SUBDIR+=telnet
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user