From nobody Tue Nov 1 08:19:08 2022 X-Original-To: freebsd-arch@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N1jbr5vH0z4ggTY for ; Tue, 1 Nov 2022 08:19:20 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-vk1-xa34.google.com (mail-vk1-xa34.google.com [IPv6:2607:f8b0:4864:20::a34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N1jbq6LHbz3CgR for ; Tue, 1 Nov 2022 08:19:19 +0000 (UTC) (envelope-from dfr@rabson.org) Received: by mail-vk1-xa34.google.com with SMTP id g16so6569598vkl.11 for ; Tue, 01 Nov 2022 01:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=P/ya/yOr+jXSpc3+RNJWMRYgrtTDS/r9a7u0SK7Dv94=; b=Py5ZI2xl8iabMp29BXUahM0u7Vyz0W9RPzDdVQprNQ626cgrF0X481duqRXlZ5IqVD 2+15jIY85AQaafo0aetCNcxCpt6W3VGhWZ0/oDzoOzS+wNt5Vjj7GKaMJIZoiS2lgECB 4Blu7mZpaPis2BQVUYLWmHv4d2z99iDfogi5+4ghcFJaxOC8HHM7TA/G+SibsRCByaTq SkXjME1h3h2wQI1nsl0J9s7VDU01938W/AhU8fSPQJ++X074mnGbIVR2AIPe0ST03YAK JtIC/CscTDJEcwrwW/7n8XeCismMseALb+PHXyb1OzDGeprRvjvBpLGZRm+P0OvewIGf AGxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P/ya/yOr+jXSpc3+RNJWMRYgrtTDS/r9a7u0SK7Dv94=; b=z/9zdiceJBlBiDfq5yBHZvwBpESK+q+ZGtdPImgSaRJiRig1WtdVKBsraJmcKLQ7s6 5+NEQXaq9Ynh/ORItTpK6/PDL4zUWV2OFQuHJFZiiqq5pE1l6/nQ0zJv1/cTrmrQISa8 AU80ndlIsq/PNSyFH1j5k1satJKDbjS7ni91LXIkQZB8urqyI4atHvQmN1fYBbj0mxvd ejAy222J2n9000soHIuwa5JDrdDws2NjuT1RwL1lg8Rl/iNw0dhKv2WkdUkXcgRlDkku qiD+gUp4eUqP/Y7/BmgdDFAHmvBJgbnhLOS956Stiq9GUD50bsFmWIRRPo3p5ML18psw /hyg== X-Gm-Message-State: ACrzQf1uaRilQlmbtUbF2SVie5nU+2AgtC/gJNTVwrI/1QyTs7mrQsdt K0i4/wTa5SK6gCLfBbuHKaXu4FSxS+7pq06dCdurdA== X-Google-Smtp-Source: AMsMyM7ma2jaKUXXgcslI1eqkInrclCZy4cXmReFVwOIKxWXjnHOU5JGBvAwl5U7kWoK9Ib3L8pwrYGe55sj7RvEAQc= X-Received: by 2002:a1f:3445:0:b0:3ab:c197:8f4f with SMTP id b66-20020a1f3445000000b003abc1978f4fmr6870511vka.13.1667290759091; Tue, 01 Nov 2022 01:19:19 -0700 (PDT) List-Id: Discussion related to FreeBSD architecture List-Archive: https://lists.freebsd.org/archives/freebsd-arch List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-arch@freebsd.org MIME-Version: 1.0 References: <742c4fe8-4c25-d7e5-1df3-b2851d90e630@FreeBSD.org> <81989eb2-75e2-b779-0c4b-99cd07d99218@FreeBSD.org> In-Reply-To: <81989eb2-75e2-b779-0c4b-99cd07d99218@FreeBSD.org> From: Doug Rabson Date: Tue, 1 Nov 2022 08:19:08 +0000 Message-ID: Subject: Re: Re-importing WireGuard driver and utilities To: John Baldwin Cc: Evilham , freebsd-arch@freebsd.org Content-Type: multipart/alternative; boundary="0000000000006eec2a05ec6461e4" X-Rspamd-Queue-Id: 4N1jbq6LHbz3CgR X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=rabson-org.20210112.gappssmtp.com header.s=20210112 header.b=Py5ZI2xl; dmarc=none; spf=pass (mx1.freebsd.org: domain of dfr@rabson.org designates 2607:f8b0:4864:20::a34 as permitted sender) smtp.mailfrom=dfr@rabson.org X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[rabson-org.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a34:from]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-arch@freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[rabson-org.20210112.gappssmtp.com:+]; DMARC_NA(0.00)[rabson.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[dfr]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[freebsd-arch@freebsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --0000000000006eec2a05ec6461e4 Content-Type: text/plain; charset="UTF-8" On Mon, 31 Oct 2022 at 18:02, John Baldwin wrote: > On 10/30/22 1:02 PM, Evilham wrote: > > Hey, > > > > On dj., oct. 13 2022, John Baldwin wrote: > > > >> Over the past several months, I have spent some time reviewing > >> the > >> WireGuard driver including its interactions with the rest of the > >> kernel and its use of crypto in the kernel. This work was > >> sponsored > >> by the FreeBSD Foundation and had a few goals: > > > > Thanks for all the work, I noticed something that might be related > > to how these changes interact with pkgbase: > > > > On pkg upgrade: > > > > - FreeBSD-runtime-dev-14.snap20221029192512 [evilham-base] > > conflicts with FreeBSD-runtime-14.snap20221029192512 > > [evilham-base] on /usr/include/dev/wg/if_wg.h > > > > Aka: the if_wg.h headers are included on both packages, how is > > this fixed? :-D would love to learn that. > > I have no idea. I can't figure out how it ended up in runtime-dev > reading include/Makefile which has a default PACKAGES of runtime. > Include files for PACKAGE=foo end up in a sibling package foo-dev. Not sure exactly where this happens - bsd.incs.mk is confusing me. --0000000000006eec2a05ec6461e4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, 31 Oct 2022 at 18:02, John Ba= ldwin <jhb@freebsd.org> wrote:=
On 10/30/22 1:02 PM, Evilham wrote:
> Hey,
>
> On dj., oct. 13 2022, John Baldwin wrote:
>
>> Over the past several months, I have spent some time reviewing
>> the
>> WireGuard driver including its interactions with the rest of the >> kernel and its use of crypto in the kernel.=C2=A0 This work was >> sponsored
>> by the FreeBSD Foundation and had a few goals:
>
> Thanks for all the work, I noticed something that might be related
> to how these changes interact with pkgbase:
>
> On pkg upgrade:
>
>=C2=A0 =C2=A0 - FreeBSD-runtime-dev-14.snap20221029192512 [evilham-base= ]
>=C2=A0 =C2=A0 conflicts with FreeBSD-runtime-14.snap20221029192512
>=C2=A0 =C2=A0 [evilham-base] on /usr/include/dev/wg/if_wg.h
>
> Aka: the if_wg.h headers are included on both packages, how is
> this fixed? :-D would love to learn that.

I have no idea.=C2=A0 I can't figure out how it ended up in runtime-dev=
reading include/Makefile which has a default PACKAGES of runtime.

Include files for PACKAGE=3Dfoo end up in a sibl= ing package foo-dev. Not sure exactly where this happens - bsd.incs.mk is confusing me.

<= /div> --0000000000006eec2a05ec6461e4--