From nobody Thu Mar 21 16:07:47 2024 X-Original-To: dev-commits-src-main@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 4V0r2w276Gz5Dxp3; Thu, 21 Mar 2024 16:07:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0r2w0xfHz4plN; Thu, 21 Mar 2024 16:07:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711037272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B53MJSoCyvB/v+aS3XAVbTJ9MEYx9hXxUlvD3zhGdMM=; b=Aj5q6vIXmvPxQQbdBWSGIuyf0NCITTsZkChzrioJoZSN40bSOdesVKVxCUddQ8mLgJSRoA XNw96myDv3rGMugP+6xF9iyBJ8aur0YYWcSx9+nUtgTR0WfAAkyCLmb2D2xrG691XMZnf5 n9SIj8MCvQexXaR63IC64XsY6IdvjUnx34nwsqT8k7ectiSVqbx7WBAL3ACkSsD/Rf2zLy kgvwmieeIoyS9go+KXK4+2l3lY3M8HrZby0pyA3eYYdwsj2GfnUAYOdo4egUo3n4Syau2d uI0ex+xY6pvzpTvC2lgFwxJ1y238GhN9+MpK324Y6hEf3Ty0+cIngiYF/LYc+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711037272; a=rsa-sha256; cv=none; b=Q7eb7kpcWLHpTMcy+MJ3vCS6XZBOnwdT3K+QIv0UD7n3fngQ+RsC2Bq81pUDGMldDAnJ0/ 4zPZRmEVydmP+sbKSrTaPViZVUgU1/bRuhYUWr1Xgguzg/WNNinlusftP+eGMMcXAxO80Q crsUpEGnhDv85U/wlF6Au7qS/HKCr3BcALmR/wz45I/seB0f0Tn2cz6qmzp2tuMLIETUah i25QUZN/bPlsNLlD1sCLJrpC875/G6R05yqRq+xchQzweaRrKHVSXIZFOw6ptt9Lw/uNZT i2cHHjuqwAp8/zhyW2HPeba3gawU718JS7sgmru6Q+XCUWbUy3SUNLSTQoBZ8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711037272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B53MJSoCyvB/v+aS3XAVbTJ9MEYx9hXxUlvD3zhGdMM=; b=Ggwxz+TWnBbxiz1pMVnKhhTS3z72c/Vl2vib2bOSjUsKis8DHO62GT0vSDwdjdkheo28Pu LhbTHFMXf6lXhTgOnOLBCEaUMXFTrQrgUEnRnZF2+ZAe293jvjQOqJb+f5o1WlHRzw/M9W XGfevec0EW/t+/h1pYeoPZnj/h20KHIxfYBhyctiLCSS0+mMurk04fmEMu4tUWQZcu8Pq/ UYMJcwb/dDJmdGt1kXIiXR75r/oYvma8UHvHYUhLNGdw3uXptD0wDhsZbZQBD0uofOuEUE slUC86YbJwVXB1J3i1n+fLIVVrjJ2CdNnDPvxE8XNz5Prl2EYU7JRuDRfO5TWQ== Received: from [128.232.109.28] (user-109-28.vpn.cl.cam.ac.uk [128.232.109.28]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V0r2t6DL3z14Rc; Thu, 21 Mar 2024 16:07:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 21 Mar 2024 09:07:47 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 6b3db5d7793f - main - libsysdecode: fix build after 3d0a736796a9 Content-Language: en-US To: Kyle Evans , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403210316.42L3G8F8022017@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202403210316.42L3G8F8022017@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/20/24 8:16 PM, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6b3db5d7793f57fa0020a78d61aae7ec318557cc > > commit 6b3db5d7793f57fa0020a78d61aae7ec318557cc > Author: Kyle Evans > AuthorDate: 2024-03-21 03:14:49 +0000 > Commit: Kyle Evans > CommitDate: 2024-03-21 03:14:49 +0000 > > libsysdecode: fix build after 3d0a736796a9 > > TCP_USE_DDP is a kernel-only macro, so we must exclude it in > libsysdecode to avoid breaking the build. > > Fixes: 3d0a736796a9 ("tcp: Add a new kernel-only TCP_USE_DDP [...]") Oops, thanks for fixing. > --- > lib/libsysdecode/mktables | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables > index beb18e97f898..8a990e0408d5 100644 > --- a/lib/libsysdecode/mktables > +++ b/lib/libsysdecode/mktables > @@ -141,7 +141,7 @@ gen_table "sockopt" "SO_[A-Z_]+[[:space:]]+0x[0-9]+" "sys/ > gen_table "sockoptip" "(IP_[[:alnum:]_]+|MCAST_[[:alnum:]_]+_GROUP)[[:space:]]+" "netinet/in.h" "IP_DEFAULT|IP_MIN|IP_MAX|IP_PORTRANGE" > gen_table "sockoptipv6" "IPV6_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet6/in6.h" "IPV6_ADDR_|IPV6_TAG_DIRECT|IPV6_OPTIONS|IPV6_RECVOPTS|IPV6_RECVRETOPTS|IPV6_RECVDSTADDR|IPV6_RETOPTS|IPV6_2292|IPV6_RECVRTHDRDSTOPTS|IPV6_REACHCONF|IPV6_PKTOPTIONS" > gen_table "sockoptsctp" "SCTP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/sctp.h" > -gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN" > +gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN|TCP_USE_DDP" > gen_table "sockoptudp" "UDP_[[:alnum:]]+[[:space:]]+[0-9]+" "netinet/udp.h" "UDP_ENCAP_" > gen_table "sockoptudplite" "UDPLITE_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/udplite.h" > gen_table "socktype" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h" -- John Baldwin