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/sbin/ping/Makefile
head/usr.bin/telnet/Makefile
head/usr.sbin/inetd/Makefile
Modified: head/sbin/ping/Makefile
==============================================================================
--- head/sbin/ping/Makefile Mon Jul 15 08:39:52 2019 (r349995)
+++ head/sbin/ping/Makefile Mon Jul 15 14:19:39 2019 (r349996)
@@ -19,9 +19,7 @@ LIBADD+= cap_dns
CFLAGS+=-DWITH_CASPER
.endif
-.if !defined(RELEASE_CRUNCH)
CFLAGS+=-DIPSEC
LIBADD+= ipsec
-.endif
.include <bsd.prog.mk>
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
.if ${MK_OPENSSL} != "no"
SRCS+= authenc.c
Modified: head/usr.sbin/inetd/Makefile
==============================================================================
--- head/usr.sbin/inetd/Makefile Mon Jul 15 08:39:52 2019
(r349995)
+++ head/usr.sbin/inetd/Makefile Mon Jul 15 14:19:39 2019
(r349996)
@@ -24,10 +24,7 @@ CFLAGS+= -DLIBWRAP
LIBADD+= wrap
.endif
-# XXX for src/release/picobsd
-.if !defined(RELEASE_CRUNCH)
CFLAGS+= -DIPSEC
LIBADD+= ipsec
-.endif
.include <bsd.prog.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
