From owner-svn-src-releng@FreeBSD.ORG Thu Nov 28 22:12:51 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F5D1FF; Thu, 28 Nov 2013 22:12:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E9881837; Thu, 28 Nov 2013 22:12:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rASMCpb2028169; Thu, 28 Nov 2013 22:12:51 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rASMCm57028151; Thu, 28 Nov 2013 22:12:48 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201311282212.rASMCm57028151@svn.freebsd.org> From: Xin LI Date: Thu, 28 Nov 2013 22:12:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r258725 - in releng: 8.3 8.3/sys/conf 8.3/usr.sbin/freebsd-update 8.4 8.4/sys/conf 8.4/usr.sbin/freebsd-update 9.1 9.1/sys/conf 9.1/usr.sbin/freebsd-update 9.2 9.2/sys/conf 9.2/usr.sbin... 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.16 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, 28 Nov 2013 22:12:51 -0000 Author: delphij Date: Thu Nov 28 22:12:48 2013 New Revision: 258725 URL: http://svnweb.freebsd.org/changeset/base/258725 Log: MFC r257879: Fix typo in r256646: We want to generate lists of directories in INDEX-OLD and INDEX-NEW and compare them, not generate the same list of directories from INDEX-OLD twice... Pointy hats to: cperciva & everybody who didn't proofread EN-13:04 enough Errata Notice: FreeBSD-EN-13:05.freebsd-update Approved by: so Modified: releng/8.3/UPDATING releng/8.3/sys/conf/newvers.sh releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh releng/8.4/UPDATING releng/8.4/sys/conf/newvers.sh releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh releng/9.1/UPDATING releng/9.1/sys/conf/newvers.sh releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh releng/9.2/UPDATING releng/9.2/sys/conf/newvers.sh releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Modified: releng/8.3/UPDATING ============================================================================== --- releng/8.3/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20131128: p13 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p12 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/8.3/sys/conf/newvers.sh ============================================================================== --- releng/8.3/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2835,8 +2835,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/8.4/UPDATING ============================================================================== --- releng/8.4/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20131128: p6 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p5 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/8.4/sys/conf/newvers.sh ============================================================================== --- releng/8.4/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2835,8 +2835,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/9.1/UPDATING ============================================================================== --- releng/9.1/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -9,6 +9,9 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20131128: p9 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p8 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/9.1/sys/conf/newvers.sh ============================================================================== --- releng/9.1/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.1" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2884,8 +2884,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/9.2/UPDATING ============================================================================== --- releng/9.2/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -11,6 +11,9 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20131128: p2 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p1 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/9.2/sys/conf/newvers.sh ============================================================================== --- releng/9.2/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.2" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2884,8 +2884,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1