From owner-svn-src-all@freebsd.org Wed Feb 1 20:50:45 2017 Return-Path: Delivered-To: svn-src-all@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 F2AB1CCC1D6; Wed, 1 Feb 2017 20:50:45 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF3B8C39; Wed, 1 Feb 2017 20:50:45 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11KoiNV079339; Wed, 1 Feb 2017 20:50:44 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11KoinW079338; Wed, 1 Feb 2017 20:50:44 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201702012050.v11KoinW079338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 1 Feb 2017 20:50:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r313053 - vendor/tcpdump X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 01 Feb 2017 20:50:46 -0000 Author: glebius Date: Wed Feb 1 20:50:44 2017 New Revision: 313053 URL: https://svnweb.freebsd.org/changeset/base/313053 Log: Document tcpdump update procedure used. Added: vendor/tcpdump/FreeBSD-upgrade Added: vendor/tcpdump/FreeBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcpdump/FreeBSD-upgrade Wed Feb 1 20:50:44 2017 (r313053) @@ -0,0 +1,40 @@ +The last import of tcpdump 4.9.0 documentation. + +In vendor/tcpdump checkout: + +# tar xzvf tcpdump-4.9.0.tar.gz +# mv tcpdump-4.9.0 4.9.0 +# svn add 4.9.0/ +# svn propdel -R svn:keywords 4.9.0 +# svn commit 4.9.0 +# cd 4.9.0 +# rsync --archive --delete . ../dist/ +# cd ../dist/ +# svn rm $(svn stat | awk '$1 == "!" { print $2 }') +# svn add $(svn stat | awk '$1 == "?" { print $2 }') +# svn propdel -R svn:keywords . +# svn commit + +Get revision from the last command. + +In head checkout: +# cd contrib/tcpdump +# svn merge -c ${rev} svn+ssh://repo.freebsd.org/base/vendor/tcpdump/dist + +Resolve conflicts. + +Our exclusion list is: + +aclocal.m4 +Readme.Win32 +tests +win32 + +In head checkout: + +# cd usr.sbin/tcpdump + +Update Makefile if needed, and config.h. Compare to config.h generated by +configure. + +Run 'make worlds' to test that everything is compilable. Commit.