From nobody Fri Apr 12 21:31:31 2024 X-Original-To: dev-commits-src-all@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 4VGVBC5wl2z5G9dX; Fri, 12 Apr 2024 21:31:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VGVBC3bJmz4jhH; Fri, 12 Apr 2024 21:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712957491; 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; bh=BDyucATqazpz98zEWUUeawtNzXNMjltbADC4L34WiBo=; b=Zf6jgmPo5qKzB7tdVOFTIyA7GAclGQj6vgjtDxdNkQWoq85IT1pB3DID+2dO0MlfqywZ1p A8PobC7mTJWWOqNewe0y0Eh9oY/eh2jzL6jsuucaDoizfTNOVlbzNYkn+AqPE9roDB9YQA Z13B+N8aYqjmsuudKef+Kb8WPFPmist8wp7jgAyyFjwlCYvr0WwPFMD8tMnk7aZIeRR2pf eBSr8YLDHHBbPzN72EuvWo8imC1crS9pEs+VfELvtzAH+MbvUKi9b/gp9vvmEgkR1jkeh6 g3ci/qP+DFMt48G+lYNTfkBBXEBOjIban0eh/YFSiKi6N4tsysF11avipm7NRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712957491; a=rsa-sha256; cv=none; b=FlEie8ZvS8UbHOAXF3lub079D6CVjotzCXNwCH+KYOFMuTNmbvhUkU/QqFlJly6c4fKVUU bsVH8yZfj65TvYqmFxd+z6W9h11LnkXUpkrYadGRdX9hbTlSo4cAAo+7WmXDbUMV9YPGVw acgaQQTwQhGjmYEtP06maMRzqQWT6KQ1wrj3qvt+GavmZxxU9yw5N5b+mPNmhi4nz4HSTD ja+GE+Oh6W2He5BP3gqt1BHG3ZCtZta4czKovkgRMfy44EjEEe7eTMU823heSvP0d2Dqct ML4CK9GdmdgyMkRdCkePBsBKpOKz4hrwFrSrLB7oT44P9qz0NQfPksPx5lDnzg== 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=1712957491; 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; bh=BDyucATqazpz98zEWUUeawtNzXNMjltbADC4L34WiBo=; b=B2Un3dQIes21Oa4RTehKrgR+OpbbsmefkkatSnwdEkMwmAyO2/kHzGx8i9xWD7s4SvFmRp jeIc1pf25Xnl1uym4pElb43XqcF9QvT7Z4WcafXbCfxX/hWYENSWzX6bZv32gtz/VDGylX ms8O0b74YRzMflOV7AY9cU2nipCEBijUCI8UPzTjz+eDqChgCcMQIr8imOGqIiPTJDjhx5 +ubHyr+nUXWdr6n+oFTBpCl+QO/TaVXa+CeW3yzqz6SZSqICr2koT9BUgFaTZYYuuluCQk ABIruO4Kd5EO4lv+z8S9GN84KEJ5zzNcsEXWrvLIyGV82RdDY9KCm39HiKPijQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VGVBC3Cpfz15ct; Fri, 12 Apr 2024 21:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43CLVVNu011878; Fri, 12 Apr 2024 21:31:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CLVVdO011875; Fri, 12 Apr 2024 21:31:31 GMT (envelope-from git) Date: Fri, 12 Apr 2024 21:31:31 GMT Message-Id: <202404122131.43CLVVdO011875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 50f771371356 - stable/14 - libsysdecode: fix build after 3d0a736796a9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50f7713713560f93a18a97b70105e303718f1c40 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=50f7713713560f93a18a97b70105e303718f1c40 commit 50f7713713560f93a18a97b70105e303718f1c40 Author: Kyle Evans AuthorDate: 2024-03-21 03:14:49 +0000 Commit: John Baldwin CommitDate: 2024-04-12 20:14:35 +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 [...]") (cherry picked from commit 6b3db5d7793f57fa0020a78d61aae7ec318557cc) --- 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"