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.

kerberos5/Makefile

@@ -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.
 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}
 	cd ${.CURDIR}/../${entry}; \
 	${MAKE} ${MFLAGS} cleandir; \
@@ -27,4 +16,15 @@ dekerberize:
 	${MAKE} ${MFLAGS} install
 .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>

lib/Makefile

@@ -80,7 +80,7 @@ _libdisk=	libdisk
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
     defined(NOCRYPT) || defined(NO_OPENSSL) || \
-    (defined(NOSECURE) && !defined(MAKE_KERBEROS5))
+    (defined(NOSECURE) && defined(NO_KERBEROS))
 _libtelnet=	libtelnet
 .endif
 

lib/libpam/modules/modules.inc

@@ -8,7 +8,7 @@ MODULES		+= pam_exec
 MODULES		+= pam_ftp
 MODULES		+= pam_ftpusers
 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_ksu
 .endif

libexec/Makefile

@@ -41,7 +41,7 @@ SUBDIR+=mail.local smrsh
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
     defined(NOCRYPT) || defined(NO_OPENSSL) || \
-    (defined(NOSECURE) && !defined(MAKE_KERBEROS5))
+    (defined(NOSECURE) && defined(NO_KERBEROS))
 # make release needs both
 SUBDIR+=telnetd
 .endif

release/Makefile

@@ -220,14 +220,10 @@ DISKLABEL?=		disklabel
 
 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
 .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
 .if !defined(NO_SENDMAIL)
 FIXCRYPTO+=	usr.sbin/sendmail
@@ -424,7 +420,6 @@ release rerelease:
 	MAKE_ISOS \
 	NOCDROM \
 	NODOC \
-	NOKERBEROS \
 	NOPORTS \
 	NOSHARED \
 	NOSRC \
@@ -520,13 +515,6 @@ release.3:
 	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
 	    SUBDIR_OVERRIDE="${FIXCRYPTO}" \
 	    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
 	touch release.3
 

secure/lib/Makefile

@@ -6,7 +6,7 @@ SUBDIR+=libcrypto libssl
 .if !defined(NO_OPENSSH)
 SUBDIR+=libssh
 .endif
-.if !defined(MAKE_KERBEROS5)
+.if defined(NO_KERBEROS)
 SUBDIR+=libtelnet
 .endif
 .endif

secure/lib/libssh/Makefile

@@ -19,7 +19,7 @@ SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
 
 CFLAGS+= -I${SSHDIR}
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 CFLAGS+= -DKRB5 -DHEIMDAL
 .endif
 

secure/libexec/Makefile

@@ -5,7 +5,7 @@ SUBDIR=
 .if !defined(NO_OPENSSH)
 SUBDIR+=sftp-server ssh-keysign
 .endif
-.if !defined(MAKE_KERBEROS5)
+.if defined(NO_KERBEROS)
 SUBDIR+=telnetd
 .endif
 .endif

secure/usr.bin/Makefile

@@ -6,7 +6,7 @@ SUBDIR+=openssl
 .if !defined(NO_OPENSSH)
 SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif
-.if !defined(MAKE_KERBEROS5)
+.if defined(NO_KERBEROS)
 SUBDIR+=telnet
 .endif
 .endif

secure/usr.bin/ssh/Makefile

@@ -10,7 +10,7 @@ MLINKS=	ssh.1 slogin.1
 SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c
 
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 CFLAGS+= -DKRB5 -DHEIMDAL
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
 DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}

secure/usr.sbin/sshd/Makefile

@@ -16,7 +16,7 @@ SRCS+=	loginrec.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 CFLAGS+= -DKRB5 -DHEIMDAL
 SRCS+=	auth-krb5.c
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken

share/examples/etc/make.conf

@@ -202,9 +202,9 @@
 #
 #
 # 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)
 # If you want to use the k5su utility, define this to have it installed

share/man/man5/make.conf.5

@@ -409,13 +409,9 @@ This code is patented in the USA and many European countries.
 It is
 .Em "YOUR RESPONSIBILITY"
 to determine if you can legally use IDEA.
-.It Va MAKE_KERBEROS5
+.It Va NO_KERBEROS
 .Pq Vt bool
-Set this to build Kerberos5 (KTH Heimdal).
-.Em WARNING !
-This is still experimental code.
-If you need stable Kerberos5, use the
-port(s).
+Set this if you do not want to build Kerberos 5 (KTH Heimdal).
 .It Va ENABLE_SUID_K5SU
 .Pq Vt bool
 Set this if you wish to use the ksu utility.

share/mk/bsd.libnames.mk

@@ -71,7 +71,7 @@ LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 MINUSLPAM?=	-lpam
 .if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 LIBPAM+=	${LIBKRB5} ${LIBASN1} ${LIBROKEN}
 MINUSLPAM+=	-lkrb5 -lasn1 -lroken
 LIBPAM+=	${LIBCOM_ERR}

tools/tools/tinderbox/tbmaster.pl

@@ -50,7 +50,7 @@ my %CONFIGS	= (
 	    'ia64'	=> [ 'ia64' ],
 	    'sparc64'	=> [ 'sparc64' ],
 	},
-	'ENV'		=> [ 'MAKE_KERBEROS5=YES', 'BOOT2_UFS=UFS1_ONLY' ],
+	'ENV'		=> [ 'BOOT2_UFS=UFS1_ONLY' ],
     },
     # 4-STABLE tinderbox
     'triangle' => {
@@ -61,7 +61,7 @@ my %CONFIGS	= (
 	    'alpha'	=> [ 'alpha' ],
 	    'i386'	=> [ 'i386', 'pc98' ],
 	},
-	'ENV'		=> [ 'MAKE_KERBEROS5=YES' ],
+	'ENV'		=> [ ],
     },
     # Test setup
     '9ball' => {
@@ -71,8 +71,7 @@ my %CONFIGS	= (
 	    'amd64'	=> [ 'amd64' ],
 	    'powerpc'	=> [ 'powerpc' ],
 	},
-	'ENV'		=> [ 'MAKE_KERBEROS5=YES',
-			     'NOLIBC_R=YES', 'NOFORTH=YES' ],
+	'ENV'		=> [ 'NOLIBC_R=YES', 'NOFORTH=YES' ],
     },
 );
 my %CONFIG = ();

usr.bin/Makefile

@@ -219,7 +219,7 @@ SUBDIR=	alias \
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
     defined(NOCRYPT) || defined(NO_OPENSSL) || \
-    (defined(NOSECURE) && !defined(MAKE_KERBEROS5))
+    (defined(NOSECURE) && defined(NO_KERBEROS))
 # make release needs both
 SUBDIR+=telnet
 .endif