From nobody Fri Oct 11 15:26:19 2024 X-Original-To: dev-commits-src-branches@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 4XQ9Sq4Gnrz5Z2F6; Fri, 11 Oct 2024 15:26:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9Sq3p0Sz4nly; Fri, 11 Oct 2024 15:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660379; 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=O4bvVizXYiHO0w8WcBJ010brsyehAvwBi/cOLY4W6Vg=; b=jljE+q313rIvARctx0/tvx29gJynW6B7z4fQj54GkArCHnL6mIk5WxhCxFJImWcaw57IuN zZTaox4b0kJTTWZoUQ8D2POT0zaU9+8BlH3qhY5murz5RXj9qK+knTP1c029wav9JixVX+ CdEEpFqqhzQrdVoJbL4gZ3jKS5Yq2dOVWwxRqOcCcDUj8JNA+iVmRqyUTS+0+F7RHy03Sj erL54Pt+vf4zVfbANl/ugXWBnSrzbJ+LncORpPzypzIHYD0eeGu9IljD2L+aALNssUiJh8 rkZhCZfJueCqpZZ2OM8pOLvLElogGbpxrpYLXsCRZztOEf29yHEaIp+rVXF9jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660379; 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=O4bvVizXYiHO0w8WcBJ010brsyehAvwBi/cOLY4W6Vg=; b=vVu+qzhJfMDB6mH8Kh1NdXadVNIFkNhXSUNh4RZ3Re32JnIK1yOo6PvIDLGXN0ecw1l/Z9 w4883XgQXWN7glmbgzCEwLeprOLrPtx948MVL5/X6/NRmujvNTCw2Q340MJ2WVLRfBPPd3 a1Cl7KFgxzNy8W6I3NkwaCkvEmL/Ir9N28f4rFBy/++KKoYKL/bFZNnKgoq5N75JTjZeCB qL0YNvS44M+5UCo7DEfNb0q+T1V9dImPXB4I2Ka7z1u4dkskWiFc+Sb4JKJkM0bKhuDqdk A1l0o0at4ZMKSUKIV8MNhS5QXYfLomO39yKLj1CjGDQZY0crQ9z31XgHkkgVuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728660379; a=rsa-sha256; cv=none; b=A4ydkpCXKKcq7PxdNEueD7GGUJEyrY3YBqGzny2EVuAFgmXMik9iLRlE95ghFtr5cCCgbF CKiWBOlH4RLDM2+vqw9ltizKBXMLH4ry/HDpoU6vAzlUOj4dWVotYGYDO5hIzkLC1UufFK DqPP7aT0VEcECtCWoAqj1PnmJ5ivV5TXuAlXBBjCUQXpugZSRyimWC86SkYne7ph+XO1VN ut1r7xlBe19h2SCPNgrni4put4ShbGU63i2fFkkXBzsbTnyV0UA1DFKPkUa1fhfzhkmJu/ hkRM0cbTnIgyzftia3N2fnAjNMskJ8lc+15bM2Iw9vxtuToOtOFfjBuEHzBn6A== 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 4XQ9Sq3Pc7zmx9; Fri, 11 Oct 2024 15:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BFQJwp037804; Fri, 11 Oct 2024 15:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFQJbv037801; Fri, 11 Oct 2024 15:26:19 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:26:19 GMT Message-Id: <202410111526.49BFQJbv037801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a8458496b4d9 - stable/14 - capsicum-test: include SCTP tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8458496b4d98962ca194e93b039dba172d7753d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a8458496b4d98962ca194e93b039dba172d7753d commit a8458496b4d98962ca194e93b039dba172d7753d Author: Ed Maste AuthorDate: 2024-10-07 19:18:33 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:24:55 +0000 capsicum-test: include SCTP tests HAVE_SCTP is #defined in syscalls.h, so move the #ifdef after the inclusion of the header that #defines it. Issue https://github.com/google/capsicum-test/issues/60 is open upstream in case a slightly different version is needed for Linux. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46995 (cherry picked from commit e4550c9aa06af54d066c794f1da14f7c91bb5bc0) --- contrib/capsicum-test/sctp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/capsicum-test/sctp.cc b/contrib/capsicum-test/sctp.cc index 76302059fa19..c8c642454a80 100644 --- a/contrib/capsicum-test/sctp.cc +++ b/contrib/capsicum-test/sctp.cc @@ -1,6 +1,5 @@ // Tests of SCTP functionality // Requires: libsctp-dev package on Debian Linux, CONFIG_IP_SCTP in kernel config -#ifdef HAVE_SCTP #include #include #include @@ -12,6 +11,7 @@ #include "capsicum.h" #include "capsicum-test.h" +#ifdef HAVE_SCTP static cap_rights_t r_ro; static cap_rights_t r_wo; static cap_rights_t r_rw;