Skip to content

Commit

Permalink
Remove all the RELEASE_CRUNCH instances that partially disable IPSEC
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bsdimp committed Jul 15, 2019
1 parent 163feb2 commit 0119a1b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
2 changes: 0 additions & 2 deletions sbin/ping/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ LIBADD+= cap_dns
CFLAGS+=-DWITH_CASPER
.endif

.if !defined(RELEASE_CRUNCH)
CFLAGS+=-DIPSEC
LIBADD+= ipsec
.endif

.include <bsd.prog.mk>
6 changes: 0 additions & 6 deletions usr.bin/telnet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions usr.sbin/inetd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 0119a1b

Please sign in to comment.