From owner-svn-src-all@freebsd.org Fri Nov 23 16:32:28 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 219E2114B824; Fri, 23 Nov 2018 16:32:28 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE1AF6B490; Fri, 23 Nov 2018 16:32:27 +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 A0A1621310; Fri, 23 Nov 2018 16:32:27 +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 wANGWRTJ030599; Fri, 23 Nov 2018 16:32:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANGWRQ1030598; Fri, 23 Nov 2018 16:32:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201811231632.wANGWRQ1030598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 23 Nov 2018 16:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r340839 - in releng/12.0: release/pkg_repos sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.0: release/pkg_repos sys/conf X-SVN-Commit-Revision: 340839 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BE1AF6B490 X-Spamd-Result: default: False [0.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.13)[-0.133,0]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_MEDIUM(0.72)[0.721,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 16:32:28 -0000 Author: gjb Date: Fri Nov 23 16:32:27 2018 New Revision: 340839 URL: https://svnweb.freebsd.org/changeset/base/340839 Log: - Update releng/12.0 from RC1 to RC2 as part of the 12.0-RELEASE cycle. - Update the dvd1.iso pkg(8) configuration to use the release_0 package set to populate the dvd. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/12.0/release/pkg_repos/release-dvd.conf releng/12.0/sys/conf/newvers.sh Modified: releng/12.0/release/pkg_repos/release-dvd.conf ============================================================================== --- releng/12.0/release/pkg_repos/release-dvd.conf Fri Nov 23 16:18:36 2018 (r340838) +++ releng/12.0/release/pkg_repos/release-dvd.conf Fri Nov 23 16:32:27 2018 (r340839) @@ -1,6 +1,6 @@ # $FreeBSD$ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_0", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", Modified: releng/12.0/sys/conf/newvers.sh ============================================================================== --- releng/12.0/sys/conf/newvers.sh Fri Nov 23 16:18:36 2018 (r340838) +++ releng/12.0/sys/conf/newvers.sh Fri Nov 23 16:32:27 2018 (r340839) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.0" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi