From nobody Thu May 12 00:00:36 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 B237D1AC025D; Thu, 12 May 2022 00:00:36 +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 4KzBkD4Lsbz3mZv; Thu, 12 May 2022 00:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652313636; 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=+Ig0N6vfe9ZwhWEQAa9RVab3RU9yLdwpFAJjHF9mWNE=; b=ojF/GErgAptChvlnIGJTLjieVBfJrHeWVAWo1P2nCz29H4PVRA1FqN2NySbOEmGY3Ypj8H oApUGyELF+s3jx+cad9tmWwyuCW84tkghYh4RdKlQrTQRnilEtajxvVYHmLe9HHfHeyzyO fVejGZHgg3Bh/5uQsNYE1r/bQP6lS5+IY3et1V0rZ2OGO7zEflOXsEpmuggNhAAwujIA8y XuaWjyG0S0k91y90maYpX+IFB1KI/jJZ2SDLgm0fUSxZEWufgK0ZD/ZpnWYNaJm7mfYlWI TqmvOLyjmXtHE8/v8F15wBxdqBQtixhw2ztYH41MrIbWE2xNndnHlvpV7C1cIw== 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 7642523A03; Thu, 12 May 2022 00:00:36 +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 24C00afQ063640; Thu, 12 May 2022 00:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24C00aqV063639; Thu, 12 May 2022 00:00:36 GMT (envelope-from git) Date: Thu, 12 May 2022 00:00:36 GMT Message-Id: <202205120000.24C00aqV063639@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: fc952ac2212b - releng/13.1 - Update in preparation of 13.1-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/13.1 X-Git-Reftype: branch X-Git-Commit: fc952ac2212b121aa6eefc273f5960ec3e0a466d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652313636; 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=+Ig0N6vfe9ZwhWEQAa9RVab3RU9yLdwpFAJjHF9mWNE=; b=TOvE96hgm4/d8obV/djvKyfjuP5cukTD/QwSM5MwQHlnFesyl/Drgm1KBIwDT72Wm7jJyl pEIuIgFvw2jUosFhaP6PMBMasi7aSre/waAfyKYcZJU/DbmlR7ZDtlH4slV0hpxUZvuamk wndziEblMi5FJH4pELhoIj7mWNvsaHRH7m/ncCqZ3j/OCx5oPFNUotx6+AI2CmTguM2AS2 jCJQXCARdQA7fZyyTmSKiY8LlFVmwv89MSPHcvsAy0s74PfoyKVYNd4ZI7OE0V4XIsuIh7 0iX+evvfupN3zVn6cKSKFZCmiqHDONpqK9yi7DaUMtLH0QQ8uHraeYI8WJlaxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652313636; a=rsa-sha256; cv=none; b=UIibnrC+Jg5wXFWAekWopiahHyzv+gb1PZJLltINeiGyPttbcbmaK7A6udp25Qsm4L11rH 7iswdsgmqPXiOANfrhDp5p/gdmImmswHcCbONEPm4onVSgWBVZ4whwOLTYWplPTdvjSsIu +Kf+KlkNz6aJlKV9zcEua8IeBB3/FV3qWEvuuGIcZk+WM8NHferZf4Tvemn3xsvP6r5aX0 SM1bvZ7PFb/pNYaBMaJPVsFxOV3uM4QDaBiDA4QpSLiKNzGHfHeBPI23P5NFTN9ScyAYQT ZXU836+NqRhFzoLKUf86zaCvn6QJwofiS+3D0mpmowYEX5gbso95tr7y9ltRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=fc952ac2212b121aa6eefc273f5960ec3e0a466d commit fc952ac2212b121aa6eefc273f5960ec3e0a466d Author: Glen Barber AuthorDate: 2022-05-11 23:59:24 +0000 Commit: Glen Barber CommitDate: 2022-05-11 23:59:24 +0000 Update in preparation of 13.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC ("Netgate") --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 2f187e2b2913..cf87aedb8121 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20220516: + 13.1-RELEASE. + 20220123: For 64-bit architectures the base system is now built with Position Independent Executable (PIE) support enabled by default. It may be diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index bf223d84bc12..8a4bfdc154bf 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -45,5 +45,5 @@ __FBSDID("$FreeBSD$"); .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1301000 4: diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index e2f2bcdd6e55..c594724d814f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.1" -BRANCH="RC6" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi