From nobody Thu Mar 21 05:51:59 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 4V0ZNH2Bvmz5FCV5; Thu, 21 Mar 2024 05:51:59 +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 4V0ZNH1nH9z4Ykg; Thu, 21 Mar 2024 05:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000319; 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=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=EMUC2236N2+9M6qfhzez85s6w9brdULs8WTtuCF2hU39JJYZfAabRRI+1K/AOMd3jiXtCr t7C6UraFJu1b+vaRwTxpL7H3Ab5NBBp4vFvxX+ouJs6WvvJrOhDURK+p+DROap3FbEp+oC b0kZJztTedaZhUDGMzb1vurK8iW0tZmg6iBWLp5hWbBYzEYQonRLXrKrz7J5ZaQ+manQSU C3knveMwm64+WJvb99D1FWAr5wCWdyWSqi4yrvXyqGgOLNhRpQQt1UhW6iDVK8qm5oIXG7 lOJJN9PyGWEHAfnN1xshXJAzltgMS/+Dpod86veIAzlZ6Mc1b8R1vKvYraIeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711000319; a=rsa-sha256; cv=none; b=QiVcwCdcsTCuI++MfGUYTWpCk9ZYeonDW8LUdQmJQK0zr5dUUzny2f5ZtRyNELdEJgSXHU WG7NJZZD7xwUYa4AirzNjQ4LqLV/wj4WjaKibIrLOa4hAhS8JWSDfDioEcKrIgYwH8Q5Uy hbRnq2FPqOO25KsAerImbT/V6tZZSgglbeVL+kDP3A6f+4lYXgc/zyqGV037EmftkSp0wV Yrj4dzxdRt1s9Nctup2sr8Sz75hCYakwejG3MT3AiIAThMVkJF0/eif+j9MUl28i/6urnC tUUVxEDNtGWhb8p2NymkJtRLgtDbUCQ8Ouc489oaWSSJzOluvuc8ChQZFn7JCA== 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=1711000319; 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=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=IvhJJhICzFkdvAEGDQvcXKHzseKTlSKJwA7ZUdfb/SO61PLwSg6plvXzDR2nP7iRbSt9be o042mOBJs9sep5mGb0wmeybP1O/EVh0Vd3CbkLjUxXGuNr5UASosFkh3ik5ahMcbOvEH6M Nv1HnJViO6/H/dSSa0Y7oo7TUKNmmwhXTXL6SQn2kYRH1CBoXTV0FrVrQh8fVFR1rgT6q1 KEeDaRHxCFfgakgJhJUEsJjTVsaVWnxbHLZKhemUNfhz/8jmM5wV10tt/CrnLlBPs7o1py 01RXMgwkFk3hTxobZ9MWcHlYYoN0xJ7aAcHb1E3c+M+t6Y6gQrBtjPZ0QePcOA== 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 4V0ZNH1NmjzN4n; Thu, 21 Mar 2024 05:51:59 +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 42L5pxg2086956; Thu, 21 Mar 2024 05:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L5pxwK086953; Thu, 21 Mar 2024 05:51:59 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:51:59 GMT Message-Id: <202403210551.42L5pxwK086953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 550eedaee1c7 - stable/13 - OpenBSM: Remove $FreeSBD$ tags from the configuration files 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=550eedaee1c7c28234c87d7703c0aaa4432ffc92 commit 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Author: Gordon Bergling AuthorDate: 2024-03-14 06:02:44 +0000 Commit: Gordon Bergling CommitDate: 2024-03-21 05:51:52 +0000 OpenBSM: Remove $FreeSBD$ tags from the configuration files In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration files were taken off the vendor branch to help mergemaster comparing them. Since mergemaster will be deprecated and $FreeBSD$ tags aren't used anymore, remove them. While here, sync audit_filter with upstream commit 5e6da76 (typo). Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D44318 (cherry picked from commit 6a6ec90681cf30eac2512ab96362a35e259fab62) --- contrib/openbsm/etc/audit_class | 3 --- contrib/openbsm/etc/audit_control | 3 --- contrib/openbsm/etc/audit_event | 5 +---- contrib/openbsm/etc/audit_filter | 3 --- contrib/openbsm/etc/audit_user | 3 --- contrib/openbsm/etc/audit_warn | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class index 47868b17d5da..4fdb14efeea0 100644 --- a/contrib/openbsm/etc/audit_class +++ b/contrib/openbsm/etc/audit_class @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# 0x00000000:no:invalid class 0x00000001:fr:file read 0x00000002:fw:file write diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control index d71b9a817452..aec726820f1e 100644 --- a/contrib/openbsm/etc/audit_control +++ b/contrib/openbsm/etc/audit_control @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# dir:/var/audit dist:off flags:lo,aa diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event index be3557597eee..31b4adc221a6 100644 --- a/contrib/openbsm/etc/audit_event +++ b/contrib/openbsm/etc/audit_event @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, # and programs, such as the kernel, may need to be recompiled to recognize @@ -442,7 +439,7 @@ 43079:AUE_CAPGET:capget(2):pc 43080:AUE_CAPSET:capset(2):pc 43081:AUE_PIVOT_ROOT:pivot_root(2):pc -43082:AUE_RTPRIO::rtprio(2):pc +43082:AUE_RTPRIO:rtprio(2):pc 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter index d0dc1c0baa5c..8e3fa719d232 100644 --- a/contrib/openbsm/etc/audit_filter +++ b/contrib/openbsm/etc/audit_filter @@ -1,5 +1,2 @@ -# -# $FreeBSD$ -# # modulename:various arguments here # diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user index 035066228e91..303b0c137efd 100644 --- a/contrib/openbsm/etc/audit_user +++ b/contrib/openbsm/etc/audit_user @@ -1,4 +1 @@ -# -# $FreeBSD$ -# root:lo:no diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn index 4b8498ea4144..8feb0fa4954f 100644 --- a/contrib/openbsm/etc/audit_warn +++ b/contrib/openbsm/etc/audit_warn @@ -1,6 +1,3 @@ #!/bin/sh -# -# $FreeBSD$ -# logger -p security.warning "audit warning: $@"