From owner-svn-src-all@freebsd.org Wed Sep 2 19:02:49 2020 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 444B23C66C0; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BhYGx142Sz457P; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@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 07CFCF0CB; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082J2mw5036166; Wed, 2 Sep 2020 19:02:48 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082J2mw8036163; Wed, 2 Sep 2020 19:02:48 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009021902.082J2mw8036163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 19:02:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365270 - in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Commit-Revision: 365270 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Wed, 02 Sep 2020 19:02:49 -0000 Author: jhb Date: Wed Sep 2 19:02:48 2020 New Revision: 365270 URL: https://svnweb.freebsd.org/changeset/base/365270 Log: MFC 361632: Honor opt_ipsec.h from kernel builds. To make this simpler, set the default contents of opt_ipsec.h for standalone modules in sys/conf/config.mk. Modified: stable/12/sys/conf/config.mk stable/12/sys/modules/ipsec/Makefile stable/12/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/conf/config.mk stable/11/sys/modules/ipsec/Makefile stable/11/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/conf/config.mk ============================================================================== --- stable/12/sys/conf/config.mk Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/conf/config.mk Wed Sep 2 19:02:48 2020 (r365270) @@ -19,6 +19,8 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +opt_ipsec.h: + @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} .if ${MK_RATELIMIT} != "no" opt_ratelimit.h: @echo "#define RATELIMIT 1" > ${.TARGET} Modified: stable/12/sys/modules/ipsec/Makefile ============================================================================== --- stable/12/sys/modules/ipsec/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/modules/ipsec/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -8,7 +8,4 @@ SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ip opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h SRCS.INET= udpencap.c -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include Modified: stable/12/sys/modules/tcp/tcpmd5/Makefile ============================================================================== --- stable/12/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -5,7 +5,4 @@ KMOD= tcpmd5 SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include