From owner-svn-src-releng@freebsd.org Fri Jun 1 00:22:50 2018 Return-Path: Delivered-To: svn-src-releng@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 D5D15FDB84C; Fri, 1 Jun 2018 00:22:50 +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 85EB46911C; Fri, 1 Jun 2018 00:22:50 +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 670E821779; Fri, 1 Jun 2018 00:22:50 +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 w510MorX025752; Fri, 1 Jun 2018 00:22:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w510MoJx025750; Fri, 1 Jun 2018 00:22:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806010022.w510MoJx025750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 1 Jun 2018 00:22:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334459 - in releng/11.2/sys: conf sys X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.2/sys: conf sys X-SVN-Commit-Revision: 334459 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.26 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, 01 Jun 2018 00:22:51 -0000 Author: gjb Date: Fri Jun 1 00:22:49 2018 New Revision: 334459 URL: https://svnweb.freebsd.org/changeset/base/334459 Log: Copy stable/11@r334458 to releng/11.2 as part of the 11.2-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: - copied from r334458, stable/11/ Directory Properties: releng/11.2/ (props changed) Modified: releng/11.2/sys/conf/newvers.sh releng/11.2/sys/sys/param.h Modified: releng/11.2/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Thu May 31 23:55:59 2018 (r334458) +++ releng/11.2/sys/conf/newvers.sh Fri Jun 1 00:22:49 2018 (r334459) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="BETA3" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.2/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Thu May 31 23:55:59 2018 (r334458) +++ releng/11.2/sys/sys/param.h Fri Jun 1 00:22:49 2018 (r334459) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1101516 /* Master, propagated to newvers */ +#define __FreeBSD_version 1102000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-releng@freebsd.org Fri Jun 1 01:33:49 2018 Return-Path: Delivered-To: svn-src-releng@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 93562EFD2ED; Fri, 1 Jun 2018 01:33:49 +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 4677F6CBD7; Fri, 1 Jun 2018 01:33:49 +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 28FD7222BF; Fri, 1 Jun 2018 01:33:49 +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 w511Xmbe061074; Fri, 1 Jun 2018 01:33:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w511XmQ2061073; Fri, 1 Jun 2018 01:33:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806010133.w511XmQ2061073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 1 Jun 2018 01:33:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334468 - releng/11.2/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/sys/conf X-SVN-Commit-Revision: 334468 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.26 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, 01 Jun 2018 01:33:49 -0000 Author: gjb Date: Fri Jun 1 01:33:48 2018 New Revision: 334468 URL: https://svnweb.freebsd.org/changeset/base/334468 Log: Rename releng/11.2 back to BETA3 temporarily, as I missed a file that needs updating when branching, because I am an idiot. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.2/sys/conf/newvers.sh Modified: releng/11.2/sys/conf/newvers.sh ============================================================================== --- releng/11.2/sys/conf/newvers.sh Fri Jun 1 01:05:34 2018 (r334467) +++ releng/11.2/sys/conf/newvers.sh Fri Jun 1 01:33:48 2018 (r334468) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="RC1" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Jun 1 01:34:37 2018 Return-Path: Delivered-To: svn-src-releng@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 DDE54EFD4AF; Fri, 1 Jun 2018 01:34:37 +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 8CB086CD61; Fri, 1 Jun 2018 01:34:37 +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 6F45F222C0; Fri, 1 Jun 2018 01:34:37 +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 w511YbiR061151; Fri, 1 Jun 2018 01:34:37 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w511YbM2061150; Fri, 1 Jun 2018 01:34:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806010134.w511YbM2061150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 1 Jun 2018 01:34:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334469 - releng/11.2/release/pkg_repos X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/release/pkg_repos X-SVN-Commit-Revision: 334469 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.26 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, 01 Jun 2018 01:34:38 -0000 Author: gjb Date: Fri Jun 1 01:34:37 2018 New Revision: 334469 URL: https://svnweb.freebsd.org/changeset/base/334469 Log: Switch the dvd1 pkg(8) configuration to use the quarterly branch, as part of the BETA->RC switch. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.2/release/pkg_repos/release-dvd.conf Modified: releng/11.2/release/pkg_repos/release-dvd.conf ============================================================================== --- releng/11.2/release/pkg_repos/release-dvd.conf Fri Jun 1 01:33:48 2018 (r334468) +++ releng/11.2/release/pkg_repos/release-dvd.conf Fri Jun 1 01:34:37 2018 (r334469) @@ -1,6 +1,6 @@ # $FreeBSD$ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From owner-svn-src-releng@freebsd.org Fri Jun 1 01:35:55 2018 Return-Path: Delivered-To: svn-src-releng@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 167DBEFD7B8; Fri, 1 Jun 2018 01:35:55 +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 B8AEF6CF48; Fri, 1 Jun 2018 01:35:54 +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 9B137222C1; Fri, 1 Jun 2018 01:35:54 +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 w511ZsEE061246; Fri, 1 Jun 2018 01:35:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w511Zs50061245; Fri, 1 Jun 2018 01:35:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806010135.w511Zs50061245@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 1 Jun 2018 01:35:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334470 - releng/11.2/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/sys/conf X-SVN-Commit-Revision: 334470 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.26 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, 01 Jun 2018 01:35:55 -0000 Author: gjb Date: Fri Jun 1 01:35:54 2018 New Revision: 334470 URL: https://svnweb.freebsd.org/changeset/base/334470 Log: Switch releng/11.2 back to RC1 following r334469. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.2/sys/conf/newvers.sh Modified: releng/11.2/sys/conf/newvers.sh ============================================================================== --- releng/11.2/sys/conf/newvers.sh Fri Jun 1 01:34:37 2018 (r334469) +++ releng/11.2/sys/conf/newvers.sh Fri Jun 1 01:35:54 2018 (r334470) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="BETA3" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi