From nobody Wed Nov 30 00:03:03 2022 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 4NMKCq5v5xz4hwSW; Wed, 30 Nov 2022 00:03:03 +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 4NMKCq5QnVz433C; Wed, 30 Nov 2022 00:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669766583; 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=wMXRIi5hZGuhLWXsegmY4D0EwcXkJSPkVI8N27Xcm3M=; b=pK6VjIN1tZdxJIykDMJEQ3OuPszwYVALHu3zGsqrddWV14A6eO3+yjGzoutyuLCD633Xcl Eb/qtdEcoF8+WaGOMWkcgZ1oZDHHhsJ++vKjP/VvEitOSYl8kER4bozRO55L/WDsUaalj6 JRoAAEGMlgy3D5I7N6FHrNYNJ9A1PydMCN7pxTAOUVs9EOgT7TA5C2p3h+qb8VTSS5E5G0 Gbp7BWjtE201TM3TY445znU21QN6vJ9vt/QKND5elhWcSLsp8Eh0I61pzl3q06vNlqY3bV aEidd2f3HvbhRlo2+GPqeykGFNOUKKVMeC7DCwJi0UZ2Jrs0LhfKE5YP002+RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669766583; 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=wMXRIi5hZGuhLWXsegmY4D0EwcXkJSPkVI8N27Xcm3M=; b=iUBu9qL41wHCBlSNV+bslqMVnO9fNEZFgdPVG0xpXej1qkwNqwW79He2llZ3x7Om7NjAQo O15s0367dj559ch/qUSysm+6ISaocFfpBOztWb+uKHkfbyysNTrxBQoS/PUTcmWJ6OKfad eqWx/bk2b/CzhjtgdHv+o5kCM02WqzHwDn8KXUIwSb3pFoZlenlw+PD8joWUnVz3j+8Pk+ jaciXSFoaOqu4VCvQAbrf8eF5I6cip88pwcZRihZJGE837hcTMfvYYvgLsPS6ZHIqSlvPG Rzfjcb7ZVGiT3RFn28Lv0Q7/VsSge9USRqXOjAPhCTFMkAxc1C8T6X5atIUPTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669766583; a=rsa-sha256; cv=none; b=C0IOQBShZoNGHrfFj8UUm34un+k4dppsMmlDUsdz+UH8g/0XV4iH/yzBDVLME3kDOC2NVR 4Zn1J4SB3U8IWLXQnFUekfE1Yue1ABVMmaRrj4fpzMFlg/0FaZAT2c9ArHd2wpWy7qERQ4 sOQYsQExOOtrrSuK5GkmM3tWwvXtwUmB5WwCHXRsyyd/RA+giri0QiXsypshvXRbthav9b 4C6gMdvGnfsCvhW/FkTqhPxhU+HH9EgX0txaC6uyQ4nsPwMlzYRGzxtWc1cQ0AzbK9rUTE 4LiMUWKo/ARDaB8KDLlQh9okU4Qs0NJErsk91WkSZBMfmOzhFL9CA8Q1ZQYofQ== 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 4NMKCq4S3xzc6b; Wed, 30 Nov 2022 00:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AU033sh099907; Wed, 30 Nov 2022 00:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AU0330b099906; Wed, 30 Nov 2022 00:03:03 GMT (envelope-from git) Date: Wed, 30 Nov 2022 00:03:03 GMT Message-Id: <202211300003.2AU0330b099906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: f2877ac4fb03 - releng/12.4 - release: update to -RELEASE 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: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: f2877ac4fb03265070b1cf97a07eb0e265bcaff9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=f2877ac4fb03265070b1cf97a07eb0e265bcaff9 commit f2877ac4fb03265070b1cf97a07eb0e265bcaff9 Author: Glen Barber AuthorDate: 2022-11-30 00:02:48 +0000 Commit: Glen Barber CommitDate: 2022-11-30 00:02:48 +0000 release: update to -RELEASE - Switch releng/12.4 from RC2 to RELEASE. - Add the anticipated 12.4-RELEASE date to UPDATING. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC ("Netgate") --- UPDATING | 3 +++ lib/csu/common/crtbrand.c | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index c6745a82d6eb..49888b0fde9c 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20221205: + 12.4-RELEASE. + 20221129: 12.4-RC2-p2 FreeBSD-SA-22:15.ping FreeBSD-EN-22:28.heimdal diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index f8fb0024db24..3651da861971 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -65,7 +65,7 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1204000 }; static const struct { diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 54f36bab7778..5c58afc6eac4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RC2-p2" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi