aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2019-07-15 14:19:39 +0000
committerWarner Losh <imp@FreeBSD.org>2019-07-15 14:19:39 +0000
commit01b01229540bfa1a250973da7c8a1a3d84853ca5 (patch)
treefbeb903ac2547438fc13e056b1e685af9e725746
parentad038195bd69aaf35c4bde17e73a847ad47ccbf9 (diff)
downloadsrc-01b01229540bfa1a250973da7c8a1a3d84853ca5.tar.gz
src-01b01229540bfa1a250973da7c8a1a3d84853ca5.zip
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.
Notes
Notes: svn path=/head/; revision=349996
-rw-r--r--sbin/ping/Makefile2
-rw-r--r--usr.bin/telnet/Makefile6
-rw-r--r--usr.sbin/inetd/Makefile3
3 files changed, 0 insertions, 11 deletions
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 8308528ad2e9..3147376b80ff 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -19,9 +19,7 @@ LIBADD+= cap_dns
CFLAGS+=-DWITH_CASPER
.endif
-.if !defined(RELEASE_CRUNCH)
CFLAGS+=-DIPSEC
LIBADD+= ipsec
-.endif
.include <bsd.prog.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 28a793be1ae6..cb5d886e9d36 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -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
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 4a3c0a42efae..3f5b1895d9b0 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -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>