From owner-svn-src-releng@freebsd.org Fri Oct 23 00:00:54 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 03CBE42DEA3; Fri, 23 Oct 2020 00:00:54 +0000 (UTC) (envelope-from gjb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CHPWn6Pzzz4dN0; Fri, 23 Oct 2020 00:00:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF6081EE8E; Fri, 23 Oct 2020 00:00:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09N00reZ084659; Fri, 23 Oct 2020 00:00:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09N00rC3084656; Fri, 23 Oct 2020 00:00:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202010230000.09N00rC3084656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 23 Oct 2020 00:00:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r366954 - in releng/12.2: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.2: . lib/csu/common sys/conf X-SVN-Commit-Revision: 366954 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2020 00:00:54 -0000 Author: gjb Date: Fri Oct 23 00:00:52 2020 New Revision: 366954 URL: https://svnweb.freebsd.org/changeset/base/366954 Log: - Switch releng/12.2 from RC3 to RELEASE. - Add the anticipated 12.2-RELEASE date to UPDATING. Fix a missing colon in the previous UPDATING entry while here. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/12.2/UPDATING releng/12.2/lib/csu/common/crtbrand.c releng/12.2/sys/conf/newvers.sh Modified: releng/12.2/UPDATING ============================================================================== --- releng/12.2/UPDATING Thu Oct 22 20:26:27 2020 (r366953) +++ releng/12.2/UPDATING Fri Oct 23 00:00:52 2020 (r366954) @@ -16,7 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 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. -20200915 p1 FreeBSD-SA-20:27.ure +20201027: + 12.2-RELEASE. + +20200915: p1 FreeBSD-SA-20:27.ure FreeBSD-SA-20:28.bhyve_vmcs FreeBSD-SA-20:29.bhyve_svm FreeBSD-SA-20:30.ftpd Modified: releng/12.2/lib/csu/common/crtbrand.c ============================================================================== --- releng/12.2/lib/csu/common/crtbrand.c Thu Oct 22 20:26:27 2020 (r366953) +++ releng/12.2/lib/csu/common/crtbrand.c Fri Oct 23 00:00:52 2020 (r366954) @@ -65,7 +65,7 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1202000 }; static const struct { Modified: releng/12.2/sys/conf/newvers.sh ============================================================================== --- releng/12.2/sys/conf/newvers.sh Thu Oct 22 20:26:27 2020 (r366953) +++ releng/12.2/sys/conf/newvers.sh Fri Oct 23 00:00:52 2020 (r366954) @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.2" -BRANCH="RC3" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi