svn commit: r349996 - in head: sbin/ping usr.bin/telnet usr.sbin/inetd

[Enji Cooper (yaneurabeya)]

> On Jul 15, 2019, at 07:19, Warner Losh <imp at freebsd.org> wrote:
> 
> Author: imp
> Date: Mon Jul 15 14:19:39 2019
> New Revision: 349996
> URL: https://svnweb.freebsd.org/changeset/base/349996
> 
> Log:
>  Remove all the RELEASE_CRUNCH instances that partially disable IPSEC
> 
>  We remove IPSEC only in parts of the tree, and not others. RELEASE_CRUNCH to
>  disable it has not kept up with all its uses. Remove it. Should there be a real
>  need to disable IPSEC, one that hasn't shown up in the base system to date,
>  it can be re-added behind a WITHOUT_IPSEC build option.

…

> Modified: head/usr.bin/telnet/Makefile
> ==============================================================================
> --- head/usr.bin/telnet/Makefile	Mon Jul 15 08:39:52 2019	(r349995)
> +++ head/usr.bin/telnet/Makefile	Mon Jul 15 14:19:39 2019	(r349996)
> @@ -21,14 +21,8 @@ WARNS?=		2
> 
> LIBADD=		telnet ncursesw
> 
> -.if !defined(RELEASE_CRUNCH)
> CFLAGS+=	-DIPSEC
> LIBADD+=	ipsec
> -.else
> -.PATH:         ${TELNETDIR}/libtelnet
> -SRCS+=		genget.c getent.c misc.c
> -CFLAGS+=	-DHAS_CGETENT
> -.endif

Hmmm… this is interesting. Why was cgetent/ipsec support mutually exclusive…

Thanks for cleaning this up :)!
-Enji