From nobody Sat Sep 09 05:38:00 2023 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 4RjMFj1PD2z4sfsF; Sat, 9 Sep 2023 05:38:01 +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 4RjMFh6VQzz4RrL; Sat, 9 Sep 2023 05:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694237881; 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=Q8IVt12aVq2QzcOEz+Zq4SviK8xa0NphFVZie8kW7Fc=; b=RJIvaxqO1V+3dNVPRetxP5dLYrgvduh6aACrO0+KcgSvfzm6yEC5JNe70VWqX0C8FUt+zk IDErQpXrwPEHlxpdNtb7bqNZnfCESu05uqNDngMFBN1O1fqHT5u28wCamEi2aUsjr3wiMC ARMd/gYC5DwAXAH/6tUioM6uOJwqrI4+RSrfrBoCO0TybXLRdjaVpb2cpbfPy6k/bkkwkr 34zPY6MeRyThlU52gpjDeITy1q9M1HINxBA/CXcYmSrjd8Fn26ale5mIVKIOrOuE7ymA0u VtiR49xhp2Qb+Ge0PzfBmTNRLzcf93vATaXfiaaI2o4mDwYt+9ms8UXsYfuvmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694237881; a=rsa-sha256; cv=none; b=raUne3kLjQ3mH9ODxnrWKOpPv1+8s7VX/nPkDB6eVVyrnbZsRwRI9QtPSFekAVyf9mT8hA MOY3zDN5984HgOp+dKleMIrftX6n6IbV2oAaBT3fTFBwysMjZQyXuxhXkI3McwEPxiYWFI ZE2Rs2MuYObPT2EqpZUXZRIVhADod5kbEthXdROeKPPvbTg04Qp5faqqKmLl6TcRulCA4m qTdnkTVVK1owMLXj2tjQQufnsjZWbwQ7P1CUBgCm/DPI4zms8wDbUK4PMmHxag5Y581yFv lAHFlG4pBM+yGZZZUikO/m8tFpbp9vxdHL+TM1FhVhqRV9s2unBgyt80ScYKJw== 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=1694237881; 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=Q8IVt12aVq2QzcOEz+Zq4SviK8xa0NphFVZie8kW7Fc=; b=XYfXvmjmEPvbbl0MfFDhG5LSCJmYFMStgun8hNIXexc0udlCjDrDBEuU8uoLCUxsvqEz2U 6RNQ+SBgRkBlj8kQKqNHPDlHCpEA6zIA35W/LRvyRPERWrzKSGMigjtoVj2XqcUBZS8wDm YLXAFzS7J1j7spMJPiiWNlRrOoSXPRXdE9HjjTly90I4sGAvRDysL6s0bmF9XxZ5MO/Pg9 +1kqnxXP00zs42g+PHriYL93Gh9+mtPhOwbk2l8tP3AhVZpJWkwtrBl43faugXE2Ra5IqT wRpepI53+yKOeICHJce0HKWTJzpyhh4tQE/im7N3QcKaerChF8Yo6e3D5sYwng== 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 4RjMFh3NZbz1BcZ; Sat, 9 Sep 2023 05:38:00 +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 3895c0Gx069844; Sat, 9 Sep 2023 05:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3895c0VM069841; Sat, 9 Sep 2023 05:38:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 05:38:00 GMT Message-Id: <202309090538.3895c0VM069841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b06aed1e7810 - stable/12 - caroot: add a primitive script to re-stamp certs 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b06aed1e781051a55e11a04408ea14a95e079e34 Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b06aed1e781051a55e11a04408ea14a95e079e34 commit b06aed1e781051a55e11a04408ea14a95e079e34 Author: Kyle Evans AuthorDate: 2023-09-09 05:34:31 +0000 Commit: Kyle Evans CommitDate: 2023-09-09 05:34:31 +0000 caroot: add a primitive script to re-stamp certs The tooling in main isn't stamping output with $FreeBSD$ strings going forward, so we need to remember to do that in this branch with each update. Add a stupid simple script that we can just run every time we MFC an update without having to put much thought into it. Direct commit to stable/12 because we don't need this in stable/13 or stable/14. --- secure/caroot/stamp-certs.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/secure/caroot/stamp-certs.sh b/secure/caroot/stamp-certs.sh new file mode 100755 index 000000000000..8e702cd56668 --- /dev/null +++ b/secure/caroot/stamp-certs.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +scriptdir=$(dirname $(realpath "$0")) + +files=$(grep -Lr '$FreeBSD' "$scriptdir"/*/*.pem) + +if [ -z "$files" ]; then + 1>&2 echo "No certs to stamp." + exit 0 +fi + +for f in $files; do + echo "Stamping $f" + sed -i.bak -e $'/Extracted from/a\\\n## with $FreeBSD$' "$f" && \ + rm "$f.bak" +done + +1>&2 echo "Done."