From owner-svn-src-vendor@freebsd.org Mon May 30 06:21:22 2016 Return-Path: Delivered-To: svn-src-vendor@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 E99C4B54B69 for ; Mon, 30 May 2016 06:21:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm28.bullet.mail.bf1.yahoo.com (nm28.bullet.mail.bf1.yahoo.com [98.139.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B15071EBB for ; Mon, 30 May 2016 06:21:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1464548947; bh=sY0nK/SK6S9rc4aitQ7VywsaFNVuA1CyoybVKs3F30E=; h=Subject:To:References:Cc:From:Date:In-Reply-To:From:Subject; b=JHJ0UxTsbKvW+WZHq0y9VUBa5YQOVWe1vOyxpl24El579rqDOQZfzoOgZS7ND3rRLP+PAzMtUccGoC8pP/1ngeYqkn0O1BbtGCqx0+TVWjR3tsFR6KUrrNQyi386K9EMqlN6MC+XNpLZAYufGeZLyqlz2B4Li/zC7yb1Y/dGIxERcxBleXnPhkkeCxXhlNPz3kKzBADMMjSN4Qa/liFmhb5URagVunJbRo4puahmwLJRts1bCBRHsmveAVf3NGxsxuasoqC06DVR0S9BSrhgz4NzZwp41zwEJ3mX21EGdqfFInvqVqy972hUc671uOapx6HNgTaqmiJ6AKDs/blprg== Received: from [98.139.170.181] by nm28.bullet.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:09:07 -0000 Received: from [98.139.211.162] by tm24.bullet.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:09:07 -0000 Received: from [127.0.0.1] by smtp219.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:09:07 -0000 X-Yahoo-Newman-Id: 307398.34735.bm@smtp219.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: YVbSxnAVM1mRjuz03NjBQ6Q4j55Kghjdc73OaxqB_q7LiKu sb3RmC5.wy6D29SS1K5OBuhdYhjNaAvezMl7RfrZW17sFF7ni5NR4.oJYj79 tbCVWZL_xrPlo1Xm0m40ASxynF_vPiMZ7vvK8o6tVbOY6TtYoRjRfI0MTam4 SaWo0nrGVgnwpuOUJG32ezFEuI2WPo7LqvAltkV6TkDJ.IYTgRiJ..XT3NSk k.ytARFdRcEdllw_SybOsoc8T0soQOoZZdY.oPvXzaYfa_y.fWKXSbhN6A6g sBFYPHf0O2A0e04nGkEWvQxUSyK0MWRWoWE5m6UQU.i0AOFtdq5ZHcrC6Awg diTlvl010VqdvVZu5ksimexPUmkeuf_vemzdWeJVE.09ouPu3XULIGqcQxKT 2RX.rI3i2cSV1gjODsrY7w3T71SB7sOLtS9iw8C_SLAx.yiWvBSU1EpfALWG cKrHKOoXCezH3mR7N3tWIttipgFwFG.3GYV57zCzwIk1pTC8Xvp0_laa9Jxd Hd5hG_yH9uQbdKtVf6vikdKbtJyvRx9_6 X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r300961 - vendor/one-true-awk/dist To: Cy Schubert References: <201605291817.u4TIHnN7040344@slippy.cwsent.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org From: Pedro Giffuni Message-ID: <574B3E4B.2020501@FreeBSD.org> Date: Sun, 29 May 2016 14:08:59 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <201605291817.u4TIHnN7040344@slippy.cwsent.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2016 06:21:23 -0000 On 29/05/2016 13:17, Cy Schubert wrote: > In message <574B2EAC.3010908@FreeBSD.org>, Pedro Giffuni writes: >> >> >> On 29/05/2016 12:37, Cy Schubert wrote: >>> In message <201605291618.u4TGItNJ024583@repo.freebsd.org>, "Pedro F. >>> Giffuni" w >>> rites: >>>> Author: pfg >>>> Date: Sun May 29 16:18:55 2016 >>>> New Revision: 300961 >>>> URL: https://svnweb.freebsd.org/changeset/base/300961 >>>> >>>> Log: >>>> one-true-awk: replace 0 with NULL for pointers >>>> >>>> Also remove a redundant semicolon. >>>> Submitted upstream already. >>>> >>>> Modified: >>>> vendor/one-true-awk/dist/b.c >>>> vendor/one-true-awk/dist/lex.c >>>> vendor/one-true-awk/dist/maketab.c >>>> vendor/one-true-awk/dist/parse.c >>>> vendor/one-true-awk/dist/run.c >>>> vendor/one-true-awk/dist/tran.c >>>> >>> Was this commit and r300962 obtained from the upline or vendor or were >>> these commits local to FreeBSD only? >>> >>> >> There is no public awk public repository AFAICT, but bwk acknowledged >> the submission. >> >> The change to openresolv was merged to the public repository. > As they've acknowledged the submissions, can you please tag the new > versions of awk and openresolve with the correct upstream version numbers, > please? > That's an impossible request as there are no "correct upstream version numbers". In the case of openresolv, I included the repository revision, but checksums have no chronological sense and should be avoided for tags. In this case using tags for anything other than official releases would be a mess. As stated in our subversion primer (5.4.4): "Vendor patches should be committed to the vendor branch, and merged from there to head. If the patch addresses an issue in a new release that is currently being imported, it /must not/ be committed along with the new release: the release must be imported and tagged first, then the patch can be applied and committed. There is no need to re-tag the vendor sources after committing the patch." Pedro.