From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:30 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 256629B22F9; Mon, 3 Aug 2015 19:08:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15FE08CD; Mon, 3 Aug 2015 19:08:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8TBP059632; Mon, 3 Aug 2015 19:08:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8TWm059631; Mon, 3 Aug 2015 19:08:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8TWm059631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286245 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:30 -0000 Author: gjb Date: Mon Aug 3 19:08:29 2015 New Revision: 286245 URL: https://svnweb.freebsd.org/changeset/base/286245 Log: Document r278407, r279924, uart(4) updates for ThinkPad AMT serial devices. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 18:47:45 2015 (r286244) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:29 2015 (r286245) @@ -548,7 +548,14 @@ Hardware Support -   + The &man.uart.4; driver has been updated + to include support for the AMT serial + interface found on the Lenovo® ThinkPad™ T61. + + The &man.uart.4; driver has been updated + to include support for the AMT serial + interface found on the Lenovo® ThinkPad™ + T400. From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:32 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 595E79B231A; Mon, 3 Aug 2015 19:08:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A6968CE; Mon, 3 Aug 2015 19:08:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8Wvx059673; Mon, 3 Aug 2015 19:08:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8WsC059672; Mon, 3 Aug 2015 19:08:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8WsC059672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286246 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:32 -0000 Author: gjb Date: Mon Aug 3 19:08:31 2015 New Revision: 286246 URL: https://svnweb.freebsd.org/changeset/base/286246 Log: Document r281963, snd_hda(4) support for ThinkPad X1 20BS model. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:29 2015 (r286245) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:31 2015 (r286246) @@ -556,6 +556,10 @@ to include support for the AMT serial interface found on the Lenovo® ThinkPad™ T400. + + The &man.snd.hda.4; driver has been + updated to support the Lenovo® ThinkPad™ X1 20BS + model. From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:34 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBA719B2355; Mon, 3 Aug 2015 19:08:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DA58944; Mon, 3 Aug 2015 19:08:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8Ywq059716; Mon, 3 Aug 2015 19:08:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8YnO059715; Mon, 3 Aug 2015 19:08:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8YnO059715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286247 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:34 -0000 Author: gjb Date: Mon Aug 3 19:08:33 2015 New Revision: 286247 URL: https://svnweb.freebsd.org/changeset/base/286247 Log: Document r284879, htp27xx(4) updated to version 1.2.7. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:31 2015 (r286246) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:33 2015 (r286247) @@ -503,6 +503,9 @@ The &man.hptnr.4; driver has been updated to version 1.1.1. + + The &man.hpt27xx.4; driver has been + updated to version 1.2.7. From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:39 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACF109B2396; Mon, 3 Aug 2015 19:08:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C9C3AF8; Mon, 3 Aug 2015 19:08:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8dTS059800; Mon, 3 Aug 2015 19:08:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8dj0059799; Mon, 3 Aug 2015 19:08:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8dj0059799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286249 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:39 -0000 Author: gjb Date: Mon Aug 3 19:08:38 2015 New Revision: 286249 URL: https://svnweb.freebsd.org/changeset/base/286249 Log: Document r283990, mpr(4) updated to version 9.255.01.00-fbsd. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:35 2015 (r286248) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:38 2015 (r286249) @@ -501,6 +501,9 @@ Storage Drivers + The &man.mpr.4; driver has been + updated to version 9.255.01.00-fbsd. + The &man.hpt27xx.4; driver has been updated to version 1.2.7. From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:37 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3105A9B236B; Mon, 3 Aug 2015 19:08:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF5B7A2B; Mon, 3 Aug 2015 19:08:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8anH059759; Mon, 3 Aug 2015 19:08:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8aCE059758; Mon, 3 Aug 2015 19:08:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8aCE059758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286248 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:37 -0000 Author: gjb Date: Mon Aug 3 19:08:35 2015 New Revision: 286248 URL: https://svnweb.freebsd.org/changeset/base/286248 Log: Document r284935, hptnr(4) updated to version 1.1.4. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:33 2015 (r286247) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:35 2015 (r286248) @@ -501,11 +501,11 @@ Storage Drivers - The &man.hptnr.4; driver has been - updated to version 1.1.1. - The &man.hpt27xx.4; driver has been updated to version 1.2.7. + + The &man.hptnr.4; driver has been + updated to version 1.1.4. From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:41 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C17A89B23AC; Mon, 3 Aug 2015 19:08:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A9667B9D; Mon, 3 Aug 2015 19:08:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8fSL059844; Mon, 3 Aug 2015 19:08:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8fPJ059843; Mon, 3 Aug 2015 19:08:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8fPJ059843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286250 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:41 -0000 Author: gjb Date: Mon Aug 3 19:08:40 2015 New Revision: 286250 URL: https://svnweb.freebsd.org/changeset/base/286250 Log: Add a ports-versions section. Document a few interesting package versions for 10.2-RELEASE. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:38 2015 (r286249) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:40 2015 (r286250) @@ -856,6 +856,32 @@ Collection, package infrastructure, and package maintenance and installation tools. + + Ports and Package Versions + + The ports-mgmt/pkg + package has been updated to version 1.5.4 in the + quarterly branch, and version 1.5.5 in the + head branch. + + The x11-servers/xorg-server package + for &os; &release.current; has been updated to version + 1.14.7_5. + + The x11/xorg package + for &os; &release.current; has been updated to version + 7.7_2. + + The x11/gnome3 package + for &os; &release.current; has been updated to version + 3.14.2. + + The x11/kde4 package + for &os; &release.current; has been updated to version + 4.14.3. + + Infrastructure Changes From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:49 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 343EA9B2415; Mon, 3 Aug 2015 19:08:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0E6FDAF; Mon, 3 Aug 2015 19:08:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8mw4059970; Mon, 3 Aug 2015 19:08:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8mBn059969; Mon, 3 Aug 2015 19:08:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8mBn059969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286253 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:49 -0000 Author: gjb Date: Mon Aug 3 19:08:47 2015 New Revision: 286253 URL: https://svnweb.freebsd.org/changeset/base/286253 Log: Remove another stray empty section. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:45 2015 (r286252) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:47 2015 (r286253) @@ -755,12 +755,6 @@ ttyu2, and ttyu3 by default, if the callin port is an active console port. - - - Boot Menu Changes - -   - From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:44 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 451159B23DF; Mon, 3 Aug 2015 19:08:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FFCBC50; Mon, 3 Aug 2015 19:08:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8hON059885; Mon, 3 Aug 2015 19:08:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8hMx059884; Mon, 3 Aug 2015 19:08:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8hMx059884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286251 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:44 -0000 Author: gjb Date: Mon Aug 3 19:08:43 2015 New Revision: 286251 URL: https://svnweb.freebsd.org/changeset/base/286251 Log: Remove a few empty sections. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:40 2015 (r286250) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:43 2015 (r286251) @@ -881,37 +881,6 @@ for &os; &release.current; has been updated to version 4.14.3. - - - Infrastructure Changes - -   - - - - Packaging Changes - -   - - - - - Documentation - - This section covers changes to the &os; Documentation - Project sources and toolchain. - - - Documentation Source Changes - -   - - - - Documentation Toolchain Changes - -   - From owner-svn-src-releng@freebsd.org Mon Aug 3 19:08:46 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3D279B2402; Mon, 3 Aug 2015 19:08:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8685CD01; Mon, 3 Aug 2015 19:08:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73J8klM059927; Mon, 3 Aug 2015 19:08:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73J8ktf059926; Mon, 3 Aug 2015 19:08:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508031908.t73J8ktf059926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Aug 2015 19:08:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286252 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Mon, 03 Aug 2015 19:08:46 -0000 Author: gjb Date: Mon Aug 3 19:08:45 2015 New Revision: 286252 URL: https://svnweb.freebsd.org/changeset/base/286252 Log: Fix a whitespace nit. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:43 2015 (r286251) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 3 19:08:45 2015 (r286252) @@ -845,7 +845,6 @@ - From owner-svn-src-releng@freebsd.org Tue Aug 4 00:11:40 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10F4E9B2973; Tue, 4 Aug 2015 00:11:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01ECD8E7; Tue, 4 Aug 2015 00:11:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t740BdB8088002; Tue, 4 Aug 2015 00:11:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t740Bdab087979; Tue, 4 Aug 2015 00:11:39 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201508040011.t740Bdab087979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 4 Aug 2015 00:11:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286264 - in releng/10.2/sys/dev/pms/freebsd/driver: common ini/src X-SVN-Group: releng 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.20 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: Tue, 04 Aug 2015 00:11:40 -0000 Author: imp Date: Tue Aug 4 00:11:38 2015 New Revision: 286264 URL: https://svnweb.freebsd.org/changeset/base/286264 Log: MF-stable/10 r286263: Only match devices that belong to this driver. Approved by: re@ (gjb@) Modified: releng/10.2/sys/dev/pms/freebsd/driver/common/lxutil.c releng/10.2/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/sys/dev/pms/freebsd/driver/common/lxutil.c ============================================================================== --- releng/10.2/sys/dev/pms/freebsd/driver/common/lxutil.c Mon Aug 3 23:12:29 2015 (r286263) +++ releng/10.2/sys/dev/pms/freebsd/driver/common/lxutil.c Tue Aug 4 00:11:38 2015 (r286264) @@ -19,6 +19,7 @@ *SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE ******************************************************************************/ +/* $FreeBSD$ */ /****************************************************************************** This program is part of PMC-Sierra initiator/target device driver. The functions here are commonly used by different type of drivers that support @@ -756,37 +757,30 @@ STATIC int agtiapi_ProbeCard( device_t d int thisCard ) { int idx; - static U32 cardMap[4] = { 0, 0, 0, 0 }; + u_int16_t agtiapi_vendor; // PCI vendor ID u_int16_t agtiapi_dev; // PCI device ID AGTIAPI_PRINTK("agtiapi_ProbeCard: start\n"); - if ( ! atomic_cmpset_32( &cardMap[thisCard], 0, 5 ) ) { // card already ran - AGTIAPI_PRINTK( "We'll only ID this card once -- %d\n", thisCard ); - return 2; // error return value; card already ran this function - } - else { - agtiapi_dev = pci_get_device( dev ); // get PCI device ID - for( idx = 0; idx < COUNT(ag_card_type); idx++ ) - { - if( ag_card_type[idx].deviceId == agtiapi_dev ) - { // device ID match - memset( (void *)&agCardInfoList[ thisCard ], 0, - sizeof(ag_card_info_t) ); - thisCardInst->cardIdIndex = idx; - thisCardInst->pPCIDev = dev; - thisCardInst->cardNameIndex = ag_card_type[idx].cardNameIndex; - thisCardInst->cardID = - pci_read_config( dev, ag_card_type[idx].membar, 4 ); // memAddr - AGTIAPI_PRINTK("agtiapi_ProbeCard: We've got PMC SAS, probe successful %p / %p\n", - thisCardInst->pPCIDev, thisCardInst ); - device_printf( dev, - "agtiapi PCI Probe Vendor ID : 0x%x Device ID : 0x%x\n", - pci_get_vendor(dev), agtiapi_dev ); - device_set_desc( dev, ag_card_names[ag_card_type[idx].cardNameIndex] ); - return 0; - } + agtiapi_vendor = pci_get_vendor( dev ); // get PCI vendor ID + agtiapi_dev = pci_get_device( dev ); // get PCI device ID + for( idx = 0; idx < COUNT(ag_card_type); idx++ ) + { + if ( ag_card_type[idx].deviceId == agtiapi_dev && + ag_card_type[idx].vendorId == agtiapi_vendor) + { // device ID match + memset( (void *)&agCardInfoList[ thisCard ], 0, + sizeof(ag_card_info_t) ); + thisCardInst->cardIdIndex = idx; + thisCardInst->pPCIDev = dev; + thisCardInst->cardNameIndex = ag_card_type[idx].cardNameIndex; + thisCardInst->cardID = + pci_read_config( dev, ag_card_type[idx].membar, 4 ); // memAddr + AGTIAPI_PRINTK("agtiapi_ProbeCard: We've got PMC SAS, probe successful %p / %p\n", + thisCardInst->pPCIDev, thisCardInst ); + device_set_desc( dev, ag_card_names[ag_card_type[idx].cardNameIndex] ); + return 0; } } - return 7; + return 1; } Modified: releng/10.2/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c ============================================================================== --- releng/10.2/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c Mon Aug 3 23:12:29 2015 (r286263) +++ releng/10.2/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c Tue Aug 4 00:11:38 2015 (r286264) @@ -214,7 +214,6 @@ STATIC void agtiapi_CheckIOTimeout(void -static unsigned char cardMap[AGTIAPI_MAX_CARDS] = { 0, 0, 0, 0 }; static ag_card_info_t agCardInfoList[ AGTIAPI_MAX_CARDS ]; // card info list static void agtiapi_cam_action( struct cam_sim *, union ccb * ); static void agtiapi_cam_poll( struct cam_sim * ); @@ -695,37 +694,20 @@ Note: static int agtiapi_probe( device_t dev ) { int retVal; - - if ( pci_get_vendor(dev) == PCI_VENDOR_ID_PMC_SIERRA || - pci_get_vendor(dev) == PCI_VENDOR_ID_HIALEAH ) + int thisCard; + ag_card_info_t *thisCardInst; + + thisCard = device_get_unit( dev ); + if ( thisCard >= AGTIAPI_MAX_CARDS ) { - int thisCard = device_get_unit( dev ); -// AGTIAPI_PRINTK("agtiapi_probe: thisCard %d\n", thisCard); - if( thisCard >= AGTIAPI_MAX_CARDS) - { - device_printf( dev, "Too many PMC-Sierra cards detected ERROR!\n" ); - return (ENXIO); // maybe change to different return value? - } - ag_card_info_t *thisCardInst = &agCardInfoList[ thisCard ]; - retVal = agtiapi_ProbeCard( dev, thisCardInst, thisCard ); - if ( retVal ) { - // error on probe - if( retVal == 2 ) return 0; // another thread ran probe on this card - device_printf( dev, - "agtiapi_probe: PCI DEVICE NOT SUPPORTED by this driver!!" - "Vendor ID : 0x%x Device ID : 0x%x\n", - pci_get_vendor(dev), pci_get_device( dev ) ); - return (ENXIO); // maybe change to different return value? - } - else { - // AGTIAPI_PRINTK( "agtiapi_ProbeCard: returned with pointer values " - // "%p / %p\n", - // thisCardInst->pPCIDev, thisCardInst ); - cardMap[thisCard] = 11; // record this card is present - return( BUS_PROBE_DEFAULT ); // successful probe - } + device_printf( dev, "Too many PMC-Sierra cards detected ERROR!\n" ); + return (ENXIO); // maybe change to different return value? } - return (ENXIO); + thisCardInst = &agCardInfoList[ thisCard ]; + retVal = agtiapi_ProbeCard( dev, thisCardInst, thisCard ); + if ( retVal ) + return (ENXIO); // maybe change to different return value? + return( BUS_PROBE_DEFAULT ); // successful probe } From owner-svn-src-releng@freebsd.org Tue Aug 4 05:18:26 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C6C79B3DD3; Tue, 4 Aug 2015 05:18:26 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 308AE109E; Tue, 4 Aug 2015 05:18:26 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t745IQM5011649; Tue, 4 Aug 2015 05:18:26 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t745IPiF011646; Tue, 4 Aug 2015 05:18:25 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201508040518.t745IPiF011646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 4 Aug 2015 05:18:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286276 - releng/10.2/sys/vm X-SVN-Group: releng 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.20 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: Tue, 04 Aug 2015 05:18:26 -0000 Author: kib Date: Tue Aug 4 05:18:24 2015 New Revision: 286276 URL: https://svnweb.freebsd.org/changeset/base/286276 Log: MFC r285878 (stable/10 r286145): Revert r173708's modifications to vm_object_page_remove(). This fixes inconsistencies encountered by vm_object_unwire() or by the buffer cache when the file is truncated. Approved by: re (gjb) Modified: releng/10.2/sys/vm/vm_object.c releng/10.2/sys/vm/vm_object.h Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/sys/vm/vm_object.c ============================================================================== --- releng/10.2/sys/vm/vm_object.c Tue Aug 4 04:30:54 2015 (r286275) +++ releng/10.2/sys/vm/vm_object.c Tue Aug 4 05:18:24 2015 (r286276) @@ -1063,9 +1063,9 @@ vm_object_sync(vm_object_t object, vm_oo */ flags = OBJPR_NOTMAPPED; else if (old_msync) - flags = OBJPR_NOTWIRED; + flags = 0; else - flags = OBJPR_CLEANONLY | OBJPR_NOTWIRED; + flags = OBJPR_CLEANONLY; vm_object_page_remove(object, OFF_TO_IDX(offset), OFF_TO_IDX(offset + size + PAGE_MASK), flags); } @@ -1894,7 +1894,6 @@ vm_object_page_remove(vm_object_t object int options) { vm_page_t p, next; - int wirings; VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->flags & OBJ_UNMANAGED) == 0 || @@ -1928,15 +1927,9 @@ again: VM_OBJECT_WLOCK(object); goto again; } - if ((wirings = p->wire_count) != 0 && - (wirings = pmap_page_wired_mappings(p)) != p->wire_count) { - if ((options & (OBJPR_NOTWIRED | OBJPR_NOTMAPPED)) == - 0) { + if (p->wire_count != 0) { + if ((options & OBJPR_NOTMAPPED) == 0) pmap_remove_all(p); - /* Account for removal of wired mappings. */ - if (wirings != 0) - p->wire_count -= wirings; - } if ((options & OBJPR_CLEANONLY) == 0) { p->valid = 0; vm_page_undirty(p); @@ -1957,19 +1950,8 @@ again: if (p->dirty) goto next; } - if ((options & OBJPR_NOTMAPPED) == 0) { - if ((options & OBJPR_NOTWIRED) != 0 && wirings != 0) - goto next; + if ((options & OBJPR_NOTMAPPED) == 0) pmap_remove_all(p); - /* Account for removal of wired mappings. */ - if (wirings != 0) { - KASSERT(p->wire_count == wirings, - ("inconsistent wire count %d %d %p", - p->wire_count, wirings, p)); - p->wire_count = 0; - atomic_subtract_int(&cnt.v_wire_count, 1); - } - } vm_page_free(p); next: vm_page_unlock(p); Modified: releng/10.2/sys/vm/vm_object.h ============================================================================== --- releng/10.2/sys/vm/vm_object.h Tue Aug 4 04:30:54 2015 (r286275) +++ releng/10.2/sys/vm/vm_object.h Tue Aug 4 05:18:24 2015 (r286276) @@ -207,7 +207,6 @@ struct vm_object { */ #define OBJPR_CLEANONLY 0x1 /* Don't remove dirty pages. */ #define OBJPR_NOTMAPPED 0x2 /* Don't unmap pages. */ -#define OBJPR_NOTWIRED 0x4 /* Don't remove wired pages. */ TAILQ_HEAD(object_q, vm_object); From owner-svn-src-releng@freebsd.org Tue Aug 4 13:42:45 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CFA69B2F6A; Tue, 4 Aug 2015 13:42:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2DBA8190E; Tue, 4 Aug 2015 13:42:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t74Dgj2d017774; Tue, 4 Aug 2015 13:42:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t74DgjOJ017773; Tue, 4 Aug 2015 13:42:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508041342.t74DgjOJ017773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 4 Aug 2015 13:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286287 - releng/10.2/usr.sbin/bsdinstall/scripts X-SVN-Group: releng 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.20 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: Tue, 04 Aug 2015 13:42:45 -0000 Author: gjb Date: Tue Aug 4 13:42:44 2015 New Revision: 286287 URL: https://svnweb.freebsd.org/changeset/base/286287 Log: MFS r286286: MFC r286285: Ensure the local MANIFEST is always used when verifying remote distribution sets. Approved by: re (glebius) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/usr.sbin/bsdinstall/scripts/auto Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- releng/10.2/usr.sbin/bsdinstall/scripts/auto Tue Aug 4 13:41:37 2015 (r286286) +++ releng/10.2/usr.sbin/bsdinstall/scripts/auto Tue Aug 4 13:42:44 2015 (r286287) @@ -258,7 +258,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then DISTDIR_IS_UNIONFS=1 mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR" else - export DISTRIBUTIONS="MANIFEST $ALL_DISTRIBUTIONS" + export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" fi From owner-svn-src-releng@freebsd.org Tue Aug 4 19:43:49 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 536739B34F7; Tue, 4 Aug 2015 19:43:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37E74D6C; Tue, 4 Aug 2015 19:43:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t74Jhnul069675; Tue, 4 Aug 2015 19:43:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t74JhnH5069674; Tue, 4 Aug 2015 19:43:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508041943.t74JhnH5069674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 4 Aug 2015 19:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286295 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Tue, 04 Aug 2015 19:43:49 -0000 Author: gjb Date: Tue Aug 4 19:43:48 2015 New Revision: 286295 URL: https://svnweb.freebsd.org/changeset/base/286295 Log: Cleanup pass through the relnotes file: - Reword a few entries for consistency throughout the document. - Remove the 'role="arm"' from the arm-specific section, as it is redundant. - s/&man.geom.4;/GEOM/ in a title, because it looks ridiculous. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 4 19:04:02 2015 (r286294) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 4 19:43:48 2015 (r286295) @@ -194,9 +194,9 @@ has been fixed. A new flag, -R, has - been added to the &man.netstat.8; utility, which is used to - dump RSS/flow information. + sponsor="&limelight;">The &man.netstat.8; utility has been + updated to include a new flag, -R, which is + used to dump RSS/flow information. The &man.ar.1; utility has been updated to set @@ -230,9 +230,10 @@ compatibility with the GNU &man.date.1; utility behavior. - A new flag, -c, has - been added to the &man.mkimg.1; utility, which allows - specifying the capacity of the target disk image. + The &man.mkimg.1; utility has been + updated to include a new flag, -c, which + allows specifying the capacity of the target disk + image. The &man.pw.8; utility has been updated with a new flag, -R, that sets the root @@ -613,16 +614,15 @@ ARM Support - Support to turn off the - BeagleBone Black system with the &man.shutdown.8; - -p flag or by invoking &man.poweroff.8; has - been added. + Support to turn off the BeagleBone Black + system with the &man.shutdown.8; -p flag or + by invoking &man.poweroff.8; has been added. - Support for the Exynos 5420 - Octa system has been added. + Support for the Exynos 5420 Octa system + has been added. - The SMP - option has been enabled for all Exynos 5 systems supported by + The SMP option has + been enabled for all Exynos 5 systems supported by &os;. The bcm2835_cpufreq @@ -630,11 +630,11 @@ frequency and voltage control on the Raspberry Pi SOC. - Support for the Toradex - Apalis i.MX6 development board has been added. + Support for the Toradex Apalis i.MX6 + development board has been added. - Audio transmission drivers - have been added for Digital Audio Multiplexer + Audio transmission drivers have been + added for Digital Audio Multiplexer (AUDMUXM), Smart Direct Memory Access Controller (SDMA), and Syncronous Serial Interface (SSI). @@ -684,10 +684,11 @@ targets and portals without requiring active discovery. - Support + The + &man.mount.nfs.8; utility has been updated to include support for the timeo, actimeo, - noac, and proto options - have been added to &man.mount.nfs.8;. + noac, and proto + options. @@ -707,7 +708,7 @@ - &man.geom.4; + GEOM The &man.ctl.4; subsystem has been updated, increasing the ports @@ -715,10 +716,11 @@ and LUN limit from 256 to 1024. - Support for the + The &man.gpart.8; utility has been + updated to include support for the apple-boot, apple-hfs, and apple-ufs MBR - partitioning schemes have been added to &man.gpart.8;. + partitioning schemes. From owner-svn-src-releng@freebsd.org Wed Aug 5 16:58:05 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E050A9B4D28; Wed, 5 Aug 2015 16:58:05 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D17942DF; Wed, 5 Aug 2015 16:58:05 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75Gw5Ub020574; Wed, 5 Aug 2015 16:58:05 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75Gw52l020573; Wed, 5 Aug 2015 16:58:05 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201508051658.t75Gw52l020573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 5 Aug 2015 16:58:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286326 - releng/10.2/sys/kern X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 16:58:06 -0000 Author: trasz Date: Wed Aug 5 16:58:04 2015 New Revision: 286326 URL: https://svnweb.freebsd.org/changeset/base/286326 Log: MFS r286322: Make the kern.racct.enable tunable actually work. This is a direct commit to 10-STABLE - 11-CURRENT is not affected, because tunables are automatically fetched there. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/sys/kern/kern_racct.c Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/sys/kern/kern_racct.c ============================================================================== --- releng/10.2/sys/kern/kern_racct.c Wed Aug 5 16:53:49 2015 (r286325) +++ releng/10.2/sys/kern/kern_racct.c Wed Aug 5 16:58:04 2015 (r286326) @@ -78,6 +78,7 @@ int racct_enable = 1; #endif SYSCTL_NODE(_kern, OID_AUTO, racct, CTLFLAG_RW, 0, "Resource Accounting"); +TUNABLE_INT("kern.racct.enable", &racct_enable); SYSCTL_UINT(_kern_racct, OID_AUTO, enable, CTLFLAG_RDTUN, &racct_enable, 0, "Enable RACCT/RCTL"); SYSCTL_UINT(_kern_racct, OID_AUTO, pcpu_threshold, CTLFLAG_RW, &pcpu_threshold, From owner-svn-src-releng@freebsd.org Wed Aug 5 19:56:24 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36B7E9B46F7; Wed, 5 Aug 2015 19:56:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27B3B1DD9; Wed, 5 Aug 2015 19:56:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75JuOXG008553; Wed, 5 Aug 2015 19:56:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75JuORw008552; Wed, 5 Aug 2015 19:56:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508051956.t75JuORw008552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 5 Aug 2015 19:56:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286339 - releng/10.2/release/pkg_repos X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 19:56:24 -0000 Author: gjb Date: Wed Aug 5 19:56:23 2015 New Revision: 286339 URL: https://svnweb.freebsd.org/changeset/base/286339 Log: Switch the pkg(8) repository to use the release package set to populate dvd1.iso. This is a direct commit to releng/10.2. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/pkg_repos/release-dvd.conf Modified: releng/10.2/release/pkg_repos/release-dvd.conf ============================================================================== --- releng/10.2/release/pkg_repos/release-dvd.conf Wed Aug 5 19:45:11 2015 (r286338) +++ releng/10.2/release/pkg_repos/release-dvd.conf Wed Aug 5 19:56:23 2015 (r286339) @@ -1,6 +1,6 @@ # $FreeBSD$ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_2", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From owner-svn-src-releng@freebsd.org Wed Aug 5 22:05:14 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54BAD9B4835; Wed, 5 Aug 2015 22:05:14 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 303701C30; Wed, 5 Aug 2015 22:05:14 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75M5EYH063507; Wed, 5 Aug 2015 22:05:14 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75M5Dqk063502; Wed, 5 Aug 2015 22:05:13 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508052205.t75M5Dqk063502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 5 Aug 2015 22:05:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286350 - in releng/10.2: sbin/routed usr.bin/patch X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 22:05:14 -0000 Author: delphij Date: Wed Aug 5 22:05:12 2015 New Revision: 286350 URL: https://svnweb.freebsd.org/changeset/base/286350 Log: Fix patch(1) shell injection vulnerability via ed(1). [SA-15:18] Fix routed remote denial of service vulnerability. [SA-15:19] Approved by: re (so blanket) Modified: releng/10.2/sbin/routed/input.c releng/10.2/usr.bin/patch/pathnames.h releng/10.2/usr.bin/patch/pch.c Modified: releng/10.2/sbin/routed/input.c ============================================================================== --- releng/10.2/sbin/routed/input.c Wed Aug 5 22:05:07 2015 (r286349) +++ releng/10.2/sbin/routed/input.c Wed Aug 5 22:05:12 2015 (r286350) @@ -160,6 +160,12 @@ input(struct sockaddr_in *from, /* rece trace_rip("Recv", "from", from, sifp, rip, cc); + if (sifp == 0) { + trace_pkt(" discard a request from an indirect router" + " (possibly an attack)"); + return; + } + if (rip->rip_vers == 0) { msglim(&bad_router, FROM_NADDR, "RIP version 0, cmd %d, packet received from %s", Modified: releng/10.2/usr.bin/patch/pathnames.h ============================================================================== --- releng/10.2/usr.bin/patch/pathnames.h Wed Aug 5 22:05:07 2015 (r286349) +++ releng/10.2/usr.bin/patch/pathnames.h Wed Aug 5 22:05:12 2015 (r286350) @@ -9,4 +9,4 @@ #include -#define _PATH_ED "/bin/ed" +#define _PATH_RED "/bin/red" Modified: releng/10.2/usr.bin/patch/pch.c ============================================================================== --- releng/10.2/usr.bin/patch/pch.c Wed Aug 5 22:05:07 2015 (r286349) +++ releng/10.2/usr.bin/patch/pch.c Wed Aug 5 22:05:12 2015 (r286350) @@ -1,4 +1,3 @@ - /*- * Copyright 1986, Larry Wall * @@ -1409,13 +1408,14 @@ do_ed_script(void) char *t; off_t beginning_of_this_line; FILE *pipefp = NULL; + int continuation; if (!skip_rest_of_patch) { if (copy_file(filearg[0], TMPOUTNAME) < 0) { unlink(TMPOUTNAME); fatal("can't create temp file %s", TMPOUTNAME); } - snprintf(buf, buf_size, "%s%s%s", _PATH_ED, + snprintf(buf, buf_size, "%s%s%s", _PATH_RED, verbose ? " " : " -s ", TMPOUTNAME); pipefp = popen(buf, "w"); } @@ -1433,7 +1433,19 @@ do_ed_script(void) (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) { if (pipefp != NULL) fputs(buf, pipefp); - if (*t != 'd') { + if (*t == 's') { + for (;;) { + continuation = 0; + t = strchr(buf, '\0') - 1; + while (--t >= buf && *t == '\\') + continuation = !continuation; + if (!continuation || + pgets(true) == 0) + break; + if (pipefp != NULL) + fputs(buf, pipefp); + } + } else if (*t != 'd') { while (pgets(true)) { p_input_line++; if (pipefp != NULL) From owner-svn-src-releng@freebsd.org Wed Aug 5 22:05:20 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D83E39B4866; Wed, 5 Aug 2015 22:05:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A99071DC7; Wed, 5 Aug 2015 22:05:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75M5K86063560; Wed, 5 Aug 2015 22:05:20 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75M5IBd063552; Wed, 5 Aug 2015 22:05:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508052205.t75M5IBd063552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 5 Aug 2015 22:05:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286351 - in releng/10.1: . sbin/routed sys/conf usr.bin/patch X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 22:05:21 -0000 Author: delphij Date: Wed Aug 5 22:05:18 2015 New Revision: 286351 URL: https://svnweb.freebsd.org/changeset/base/286351 Log: Fix patch(1) shell injection vulnerability via ed(1). [SA-15:18] Fix routed remote denial of service vulnerability. [SA-15:19] Approved by: so Modified: releng/10.1/UPDATING releng/10.1/sbin/routed/input.c releng/10.1/sys/conf/newvers.sh releng/10.1/usr.bin/patch/pathnames.h releng/10.1/usr.bin/patch/pch.c Modified: releng/10.1/UPDATING ============================================================================== --- releng/10.1/UPDATING Wed Aug 5 22:05:12 2015 (r286350) +++ releng/10.1/UPDATING Wed Aug 5 22:05:18 2015 (r286351) @@ -16,6 +16,14 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150805: p17 FreeBSD-SA-15:18.bsdpatch + FreeBSD-SA-15:19.routed + + Fix patch(1) shell injection vulnerability via ed(1). + [SA-15:18] + + Fix routed remote denial of service vulnerability. [SA-15:19] + 20150728: p16 FreeBSD-SA-15:14.bsdpatch FreeBSD-SA-15:15.tcp FreeBSD-SA-15:16.openssh Modified: releng/10.1/sbin/routed/input.c ============================================================================== --- releng/10.1/sbin/routed/input.c Wed Aug 5 22:05:12 2015 (r286350) +++ releng/10.1/sbin/routed/input.c Wed Aug 5 22:05:18 2015 (r286351) @@ -160,6 +160,12 @@ input(struct sockaddr_in *from, /* rece trace_rip("Recv", "from", from, sifp, rip, cc); + if (sifp == 0) { + trace_pkt(" discard a request from an indirect router" + " (possibly an attack)"); + return; + } + if (rip->rip_vers == 0) { msglim(&bad_router, FROM_NADDR, "RIP version 0, cmd %d, packet received from %s", Modified: releng/10.1/sys/conf/newvers.sh ============================================================================== --- releng/10.1/sys/conf/newvers.sh Wed Aug 5 22:05:12 2015 (r286350) +++ releng/10.1/sys/conf/newvers.sh Wed Aug 5 22:05:18 2015 (r286351) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.1" -BRANCH="RELEASE-p16" +BRANCH="RELEASE-p17" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.1/usr.bin/patch/pathnames.h ============================================================================== --- releng/10.1/usr.bin/patch/pathnames.h Wed Aug 5 22:05:12 2015 (r286350) +++ releng/10.1/usr.bin/patch/pathnames.h Wed Aug 5 22:05:18 2015 (r286351) @@ -9,4 +9,4 @@ #include -#define _PATH_ED "/bin/ed" +#define _PATH_RED "/bin/red" Modified: releng/10.1/usr.bin/patch/pch.c ============================================================================== --- releng/10.1/usr.bin/patch/pch.c Wed Aug 5 22:05:12 2015 (r286350) +++ releng/10.1/usr.bin/patch/pch.c Wed Aug 5 22:05:18 2015 (r286351) @@ -1,4 +1,3 @@ - /*- * Copyright 1986, Larry Wall * @@ -1400,13 +1399,14 @@ do_ed_script(void) char *t; long beginning_of_this_line; FILE *pipefp = NULL; + int continuation; if (!skip_rest_of_patch) { if (copy_file(filearg[0], TMPOUTNAME) < 0) { unlink(TMPOUTNAME); fatal("can't create temp file %s", TMPOUTNAME); } - snprintf(buf, buf_size, "%s%s%s", _PATH_ED, + snprintf(buf, buf_size, "%s%s%s", _PATH_RED, verbose ? " " : " -s ", TMPOUTNAME); pipefp = popen(buf, "w"); } @@ -1424,7 +1424,19 @@ do_ed_script(void) *t == 'd' || *t == 'i' || *t == 's')) { if (pipefp != NULL) fputs(buf, pipefp); - if (*t != 'd') { + if (*t == 's') { + for (;;) { + continuation = 0; + t = strchr(buf, '\0') - 1; + while (--t >= buf && *t == '\\') + continuation = !continuation; + if (!continuation || + pgets(true) == 0) + break; + if (pipefp != NULL) + fputs(buf, pipefp); + } + } else if (*t != 'd') { while (pgets(true)) { p_input_line++; if (pipefp != NULL) From owner-svn-src-releng@freebsd.org Wed Aug 5 22:05:26 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9863C9B4896; Wed, 5 Aug 2015 22:05:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D2181E9B; Wed, 5 Aug 2015 22:05:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75M5PuZ063608; Wed, 5 Aug 2015 22:05:25 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75M5PxG063604; Wed, 5 Aug 2015 22:05:25 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508052205.t75M5PxG063604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 5 Aug 2015 22:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286352 - in releng/9.3: . sbin/routed sys/conf X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 22:05:26 -0000 Author: delphij Date: Wed Aug 5 22:05:24 2015 New Revision: 286352 URL: https://svnweb.freebsd.org/changeset/base/286352 Log: Fix routed remote denial of service vulnerability. [SA-15:19] Approved by: so Modified: releng/9.3/UPDATING releng/9.3/sbin/routed/input.c releng/9.3/sys/conf/newvers.sh Modified: releng/9.3/UPDATING ============================================================================== --- releng/9.3/UPDATING Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/UPDATING Wed Aug 5 22:05:24 2015 (r286352) @@ -11,6 +11,10 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20150805: p22 FreeBSD-SA-15:19.routed + + Fix routed remote denial of service vulnerability. + 20150728: p21 FreeBSD-SA-15:15.tcp FreeBSD-SA-15:16.openssh FreeBSD-SA-15:17.bind Modified: releng/9.3/sbin/routed/input.c ============================================================================== --- releng/9.3/sbin/routed/input.c Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/sbin/routed/input.c Wed Aug 5 22:05:24 2015 (r286352) @@ -160,6 +160,12 @@ input(struct sockaddr_in *from, /* rece trace_rip("Recv", "from", from, sifp, rip, cc); + if (sifp == 0) { + trace_pkt(" discard a request from an indirect router" + " (possibly an attack)"); + return; + } + if (rip->rip_vers == 0) { msglim(&bad_router, FROM_NADDR, "RIP version 0, cmd %d, packet received from %s", Modified: releng/9.3/sys/conf/newvers.sh ============================================================================== --- releng/9.3/sys/conf/newvers.sh Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/sys/conf/newvers.sh Wed Aug 5 22:05:24 2015 (r286352) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.3" -BRANCH="RELEASE-p21" +BRANCH="RELEASE-p22" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Wed Aug 5 22:31:42 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CFA49B41B0; Wed, 5 Aug 2015 22:31:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D1DF1454; Wed, 5 Aug 2015 22:31:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75MVgOF076227; Wed, 5 Aug 2015 22:31:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75MVgRj076226; Wed, 5 Aug 2015 22:31:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508052231.t75MVgRj076226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 5 Aug 2015 22:31:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286356 - releng/10.2/release/doc/share/xml X-SVN-Group: releng 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.20 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: Wed, 05 Aug 2015 22:31:42 -0000 Author: gjb Date: Wed Aug 5 22:31:41 2015 New Revision: 286356 URL: https://svnweb.freebsd.org/changeset/base/286356 Log: Document SA-15:18, SA-15:19. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/share/xml/security.xml Modified: releng/10.2/release/doc/share/xml/security.xml ============================================================================== --- releng/10.2/release/doc/share/xml/security.xml Wed Aug 5 22:30:49 2015 (r286355) +++ releng/10.2/release/doc/share/xml/security.xml Wed Aug 5 22:31:41 2015 (r286356) @@ -155,6 +155,21 @@ 28 July 2015 Multiple vulnerabilities + + + FreeBSD-SA-15:18.bsdpatch + 5 August 2015 + Shell injection vulnerability + + + + FreeBSD-SA-15:19.routed + 5 August 2015 + Remote denial of service + vulnerability + From owner-svn-src-releng@freebsd.org Thu Aug 6 01:39:24 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26FFB9B1F86; Thu, 6 Aug 2015 01:39:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18912B6B; Thu, 6 Aug 2015 01:39:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t761dNDP050532; Thu, 6 Aug 2015 01:39:23 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t761dNfq050531; Thu, 6 Aug 2015 01:39:23 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508060139.t761dNfq050531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 6 Aug 2015 01:39:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286357 - releng/10.2/usr.sbin/pw X-SVN-Group: releng 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.20 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: Thu, 06 Aug 2015 01:39:24 -0000 Author: gjb Date: Thu Aug 6 01:39:23 2015 New Revision: 286357 URL: https://svnweb.freebsd.org/changeset/base/286357 Log: MFS r286340 (bapt): Fix segfault in pw(8) when modifying the UID of a user. PR: 202111 Approved by: re (delphij) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/usr.sbin/pw/pw_user.c Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/usr.sbin/pw/pw_user.c ============================================================================== --- releng/10.2/usr.sbin/pw/pw_user.c Wed Aug 5 22:31:41 2015 (r286356) +++ releng/10.2/usr.sbin/pw/pw_user.c Thu Aug 6 01:39:23 2015 (r286357) @@ -388,7 +388,7 @@ pw_user(int mode, char *name, long id, s edited = 1; } - if (id > 0 && isdigit((unsigned char)*arg->val)) { + if (id > 0) { pwd->pw_uid = (uid_t)id; edited = 1; if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0) From owner-svn-src-releng@freebsd.org Thu Aug 6 14:13:45 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3ACC09B4121; Thu, 6 Aug 2015 14:13:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BC32F94; Thu, 6 Aug 2015 14:13:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t76EDjLw061892; Thu, 6 Aug 2015 14:13:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t76EDjaX061891; Thu, 6 Aug 2015 14:13:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508061413.t76EDjaX061891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 6 Aug 2015 14:13:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286365 - releng/10.2/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng 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.20 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: Thu, 06 Aug 2015 14:13:45 -0000 Author: gjb Date: Thu Aug 6 14:13:44 2015 New Revision: 286365 URL: https://svnweb.freebsd.org/changeset/base/286365 Log: Fix a typo. Submitted by: pkelsey Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Aug 6 14:13:01 2015 (r286364) +++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Aug 6 14:13:44 2015 (r286365) @@ -766,7 +766,7 @@ &os;. - Network Procols + Network Protocols Support for PLPMTUD From owner-svn-src-releng@freebsd.org Thu Aug 6 19:52:29 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4904C9B4078; Thu, 6 Aug 2015 19:52:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A314EC7; Thu, 6 Aug 2015 19:52:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t76JqT64001140; Thu, 6 Aug 2015 19:52:29 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t76JqTnR001139; Thu, 6 Aug 2015 19:52:29 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508061952.t76JqTnR001139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 6 Aug 2015 19:52:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286386 - releng/10.2/etc X-SVN-Group: releng 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.20 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: Thu, 06 Aug 2015 19:52:29 -0000 Author: delphij Date: Thu Aug 6 19:52:28 2015 New Revision: 286386 URL: https://svnweb.freebsd.org/changeset/base/286386 Log: MFS r286384: MFC r286375: Now that stable/8 is EOL, stop building INDEX-8. Approved by: re (gjb) Modified: releng/10.2/etc/portsnap.conf Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/etc/portsnap.conf ============================================================================== --- releng/10.2/etc/portsnap.conf Thu Aug 6 19:47:04 2015 (r286385) +++ releng/10.2/etc/portsnap.conf Thu Aug 6 19:52:28 2015 (r286386) @@ -30,6 +30,5 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddb # REFUSE korean polish portuguese russian ukrainian vietnamese # List of INDEX files to build and the DESCRIBE file to use for each -INDEX INDEX-8 DESCRIBE.8 INDEX INDEX-9 DESCRIBE.9 INDEX INDEX-10 DESCRIBE.10 From owner-svn-src-releng@freebsd.org Thu Aug 6 22:01:10 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FCE29B51BD; Thu, 6 Aug 2015 22:01:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E6141BDF; Thu, 6 Aug 2015 22:01:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t76M1Aug054836; Thu, 6 Aug 2015 22:01:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t76M1A4F054835; Thu, 6 Aug 2015 22:01:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508062201.t76M1A4F054835@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 6 Aug 2015 22:01:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286391 - releng/10.2/sys/conf X-SVN-Group: releng 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.20 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: Thu, 06 Aug 2015 22:01:10 -0000 Author: gjb Date: Thu Aug 6 22:01:09 2015 New Revision: 286391 URL: https://svnweb.freebsd.org/changeset/base/286391 Log: Update releng/10.2 to RC2 in preparation for the next set of builds. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/sys/conf/newvers.sh Modified: releng/10.2/sys/conf/newvers.sh ============================================================================== --- releng/10.2/sys/conf/newvers.sh Thu Aug 6 21:27:50 2015 (r286390) +++ releng/10.2/sys/conf/newvers.sh Thu Aug 6 22:01:09 2015 (r286391) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.2" -BRANCH="RC2" +BRANCH="RC3" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Thu Aug 6 22:05:34 2015 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 840B19B52A4; Thu, 6 Aug 2015 22:05:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 72C791EEA; Thu, 6 Aug 2015 22:05:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id D8FDC1C12; Thu, 6 Aug 2015 22:05:33 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Thu, 6 Aug 2015 22:05:32 +0000 From: Glen Barber To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: Re: svn commit: r286391 - releng/10.2/sys/conf Message-ID: <20150806220532.GZ1484@FreeBSD.org> References: <201508062201.t76M1A4F054835@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nwrnLigiJ19QsFfd" Content-Disposition: inline In-Reply-To: <201508062201.t76M1A4F054835@repo.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 06 Aug 2015 22:05:34 -0000 --nwrnLigiJ19QsFfd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 06, 2015 at 10:01:10PM +0000, Glen Barber wrote: > Author: gjb > Date: Thu Aug 6 22:01:09 2015 > New Revision: 286391 > URL: https://svnweb.freebsd.org/changeset/base/286391 >=20 > Log: > Update releng/10.2 to RC2 in preparation for the next set of builds. > =20 Sigh. RC3, of course... Glen > Approved by: re (implicit) > Sponsored by: The FreeBSD Foundation >=20 > Modified: > releng/10.2/sys/conf/newvers.sh >=20 > Modified: releng/10.2/sys/conf/newvers.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- releng/10.2/sys/conf/newvers.sh Thu Aug 6 21:27:50 2015 (r286390) > +++ releng/10.2/sys/conf/newvers.sh Thu Aug 6 22:01:09 2015 (r286391) > @@ -32,7 +32,7 @@ > =20 > TYPE=3D"FreeBSD" > REVISION=3D"10.2" > -BRANCH=3D"RC2" > +BRANCH=3D"RC3" > if [ "X${BRANCH_OVERRIDE}" !=3D "X" ]; then > BRANCH=3D${BRANCH_OVERRIDE} > fi >=20 --nwrnLigiJ19QsFfd Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVw9osAAoJEAMUWKVHj+KThFUP/25duAiarDOh8mGt3vQSWfMW l4iGwSFwD6IM9pMK68LbRd43wl3uKBCJC32yp1xE4LcC7NqhWZtMQFjg14J2+J/F ERP4JoTjkG+idpVNs6fo5YTZiqa1ihyxEVnGj2lPY5Aw0unbQBkJpQYvMOSEQmMQ 72xtklNN+vBuYj++dGNXxplT9aCtBrafpTkwmlu6MIZYyNp1G8yYzYBe8IuJc4k3 js8QKZVyE/vskegeI8Kzy1xiadlDCFbOh5IHdlUvzgQftrgJuwQdML9K99wGKj9V d+prhhgQMei0T+a0VW2v4aLfK6r3SazOC8sfyVRPeOQs8tilcODYha8YHPr+ZDH+ yDe686PkmFumFbiRB4od5FePoPoHUMYphFT2o51uBo4F7pu2InPuA82qIULvBnpY RN2IVctnMbfoA1WHJUTqPvfmPJ3nc+Z0odJFGLoK+L+VD+xLFwFh3FdSbe3DqqhS aqXhTclihh1Ci9AYbL0qPvVoDVUFS0XAABlATj99Rk/6RmXXOVp3ujbcA/AevvKZ p95TfDA0tobIAmvjpLrovJUrpiKu48XoCthNzDqTN7dR3wFnU8PIg+SsPZuiXWaa 2c0rRbr9xmmyedlMAFtGyADsuQAGAluE1KQGo0sw3xOY+tn4KblsCoRRovnWJrnF LdSmOaiCleXbcNM1bU5L =9OEP -----END PGP SIGNATURE----- --nwrnLigiJ19QsFfd--