From owner-svn-src-all@freebsd.org Mon Jul 15 14:19:40 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F35A9BB1B7; Mon, 15 Jul 2019 14:19:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CFBA292DF5; Mon, 15 Jul 2019 14:19:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA9441EC53; Mon, 15 Jul 2019 14:19:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6FEJe2X097265; Mon, 15 Jul 2019 14:19:40 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6FEJeLf097263; Mon, 15 Jul 2019 14:19:40 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201907151419.x6FEJeLf097263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 15 Jul 2019 14:19:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349996 - in head: sbin/ping usr.bin/telnet usr.sbin/inetd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: sbin/ping usr.bin/telnet usr.sbin/inetd X-SVN-Commit-Revision: 349996 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CFBA292DF5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2019 14:19:41 -0000 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 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