From owner-svn-src-head@freebsd.org Tue Jun 2 15:08:41 2020 Return-Path: Delivered-To: svn-src-head@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 2E77B2F1E56; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bwRF0Shjz44cc; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 0B29F1BB06; Tue, 2 Jun 2020 15:08:41 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id b27so12812870qka.4; Tue, 02 Jun 2020 08:08:41 -0700 (PDT) X-Gm-Message-State: AOAM530uqdyt1yMjQ9MHrDMpnePE+rtQEluevaHWDhIzCi8SG2LNaUdy 5EiZpZ1jW9ARd8am3On4JlhzJKF0fHwFVPwgsJo= X-Google-Smtp-Source: ABdhPJwWEJ4VbaqVPcX15hnJ2+ZEW5CWH5Wu/xm/CuMwXf/JkPyZotQ+dd+8zJpZsBX0qcbBFGsMeaRJF79Gv1n8i+w= X-Received: by 2002:a37:a3ce:: with SMTP id m197mr25457881qke.493.1591110520590; Tue, 02 Jun 2020 08:08:40 -0700 (PDT) MIME-Version: 1.0 References: <202006020032.0520Wbke002516@repo.freebsd.org> <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> In-Reply-To: <1b2dbc65-197d-a62b-3ba7-2cf78819277c@FreeBSD.org> From: Kyle Evans Date: Tue, 2 Jun 2020 10:08:27 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361712 - in head/sys/modules: . tcp To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:08:41 -0000 On Tue, Jun 2, 2020 at 10:07 AM John Baldwin wrote: > > On 6/1/20 5:32 PM, Kyle Evans wrote:> > Author: kevans > > Date: Tue Jun 2 00:32:36 2020 > > New Revision: 361712 > > URL: https://svnweb.freebsd.org/changeset/base/361712 > > > > Log: > > modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC > > > > IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, > > not both. Refrain from building if IPSEC is set, as the resulting module > > won't be able to load anyways if it's built into the kernel. > > > > KERN_OPTS is safe here; for tied modules, it will reflect the kernel > > configuration. For untied modules, it will defer to whatever is set in > > ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter > > situation has some risk to it for uncommon scenarios, but such is the life > > of untied kernel modules. > > > > Reported by: jenkins (a lot), O. Hartmann (once) > > Generally discussed with: imp, jhb > > > > Modified: > > head/sys/modules/Makefile > > head/sys/modules/tcp/Makefile > > > > Modified: head/sys/modules/Makefile > > ============================================================================== > > --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) > > +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) > > @@ -427,7 +427,7 @@ _if_enc= if_enc > > _if_gif= if_gif > > _if_gre= if_gre > > _ipfw_pmod= ipfw_pmod > > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > > _ipsec= ipsec > > .endif > > .endif > > > > Modified: head/sys/modules/tcp/Makefile > > ============================================================================== > > --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 (r361711) > > +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 (r361712) > > @@ -16,7 +16,7 @@ _tcp_rack= rack > > > > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > > defined(ALL_MODULES) > > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > > Thanks. > > Was finally getting back to this this morning. This one should be TCP_SIGNATURE, > not IPSEC. (This would break for a kernel which doesn't have IPSEC but does > have TCP_SIGNATURE.) > Whoops. =-(