From owner-svn-src-all@FreeBSD.ORG Sat Jul 16 02:13:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D71B0106564A; Sat, 16 Jul 2011 02:13:03 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ACFD48FC0A; Sat, 16 Jul 2011 02:13:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6G2D3TZ005366; Sat, 16 Jul 2011 02:13:03 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6G2D3SO005364; Sat, 16 Jul 2011 02:13:03 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201107160213.p6G2D3SO005364@svn.freebsd.org> From: Doug Barton Date: Sat, 16 Jul 2011 02:13:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224075 - vendor/bind9/dist-9.6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2011 02:13:03 -0000 Author: dougb Date: Sat Jul 16 02:13:03 2011 New Revision: 224075 URL: http://svn.freebsd.org/changeset/base/224075 Log: Update dist -> dist-9.6 Modified: vendor/bind9/dist-9.6/FREEBSD-Upgrade Modified: vendor/bind9/dist-9.6/FREEBSD-Upgrade ============================================================================== --- vendor/bind9/dist-9.6/FREEBSD-Upgrade Sat Jul 16 01:55:51 2011 (r224074) +++ vendor/bind9/dist-9.6/FREEBSD-Upgrade Sat Jul 16 02:13:03 2011 (r224075) @@ -7,32 +7,32 @@ 2) Check out the head of the subversion "vendor branch" - svn co $REPO/vendor/bind9/dist + svn co $REPO/vendor/bind9/dist-9.6 3) Unpack the tarball in a suitable directory: - tar zxvf bind-9..tar.gz -X dist/FREEBSD-Xlist + tar zxvf bind-9..tar.gz -X dist-9.6/FREEBSD-Xlist Check to see if any files have been added or deleted using - diff -ur dist bind-9. -x \.svn | grep 'Only in' + diff -ur dist-9.6 bind-9. -x \.svn | grep 'Only in' 4) Copy new files over the old ones: - cp -Rp bind-9./* dist/ + cp -Rp bind-9./* dist-9.6/ 5) Double-check for changes using 'svn status' 6) Use 'svn add' and 'svn rm' to bring dist up to date for files found above. Update FREEBSD-Xlist as needed. - The files in vendor/bind9/dist should now look exactly like those in the + The files in vendor/bind9/dist-9.6 should now look exactly like those in the ISC sources, minus the files/directories in FREEBSD-Xlist above. Carefully check the output of 'svn status' and 'svn diff' It's not if you're paranoid, it's if you are paranoid enough 7) Commit the update to the vendor files: - cd dist ; svn ci -m "Vendor import of BIND 9.X.Y" - svn cp $REPO/vendor/bind9/dist $REPO/vendor/bind9/${version} + cd dist-9.6 ; svn ci -m "Vendor import of BIND 9.X.Y" + svn cp $REPO/vendor/bind9/dist-9.6 $REPO/vendor/bind9/${version} (this is a server-side operation, you dont have to check it out) 8) Update the files in src/contrib/bind9: @@ -42,7 +42,7 @@ Make sure you are up to date: svn update ; svn status - svn merge $REPO/vendor/bind9/dist . + svn merge $REPO/vendor/bind9/dist-9.6 . Resolve conflicts (if any) Carefully check the output of 'svn status' and 'svn diff'