From owner-svn-src-releng@freebsd.org Fri Jun 12 11:41:40 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 9D989337F7C; Fri, 12 Jun 2020 11:41:40 +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 49jzMm3jNqz4NVq; Fri, 12 Jun 2020 11:41:40 +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 7A9198BED; Fri, 12 Jun 2020 11:41:40 +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 05CBfesB011816; Fri, 12 Jun 2020 11:41:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05CBfdJU011814; Fri, 12 Jun 2020 11:41:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006121141.05CBfdJU011814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Jun 2020 11:41:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362092 - in releng/11.4: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.4: . lib/csu/common sys/conf X-SVN-Commit-Revision: 362092 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, 12 Jun 2020 11:41:40 -0000 Author: gjb Date: Fri Jun 12 11:41:39 2020 New Revision: 362092 URL: https://svnweb.freebsd.org/changeset/base/362092 Log: Revert r362079 in order to correct an issue that triggered a build failure in 11.4-RELEASE builds. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/UPDATING releng/11.4/lib/csu/common/crtbrand.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/UPDATING Fri Jun 12 11:41:39 2020 (r362092) @@ -16,9 +16,6 @@ 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. -20200616: - 11.4-RELEASE. - 20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb Fix USB HID descriptor parsing error. [SA-20:17.usb] Modified: releng/11.4/lib/csu/common/crtbrand.c ============================================================================== --- releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 11:41:39 2020 (r362092) @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = 1104001 + .desc = __FreeBSD_version }; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/sys/conf/newvers.sh Fri Jun 12 11:41:39 2020 (r362092) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RELEASE" +BRANCH="RC2-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi