From owner-freebsd-ports@freebsd.org Mon Jan 4 17:59:05 2021 Return-Path: Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F8254DE24B for ; Mon, 4 Jan 2021 17:59:05 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8k083xnxz3NJQ; Mon, 4 Jan 2021 17:59:03 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 832bca42; Mon, 4 Jan 2021 17:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180501; bh=wnwm9b3K 2XzPHZ//I56MV/UAYD8=; b=blDn9oqc4v0yT7J+2KcDgvQs8HdL2UWFUenU3IrH FmenErhKCO1aMs+WBIIHyKQnus/eCRvr5jYMfwT1+XwsH3IXhaMweO0bKDLke6hc Y/en6URXrqZycADTv3Wt5nfxXSwIWChIjzXMjR7NPFP45+O49na/i17vEUsWyg0V dHUhrCU5+eXNvP6w50ZVepO3s2it53S9+jQf/Vw7p0ZiH+bHbfXP3yAfX7sFsoze HIENG5OtmUAjq8BVoi2SgpVmXr1Hqar27rmZiEt+zcqYd9mmjjYCFHaZBlCMsaOt x8cQZdUjU2NKfQYfb4Nu/fnA5TrTOMRn7a0hqzW/KD6I7A== DomainKey-Signature: a=rsa-sha1; c=nofws; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=20180501; b=IM XG8FwtNoifgrp5lmSlXIyONfUMajQGVOW6s2KYS7EFmyMZIsJYKKiWuMvucoZvNM G+EUOyuFejgWF6TFbud67KzwB/Al2VelW/URqkFmFvZ1KlldXWfoohbviuTT1t8x eORVOZLxGx+8dkU+tIak/Cg1i3dPfd0SPe5xN5HXKK89WfrgBqslzK7Mk1T5Ukgf 5jnfnybdTnA7hGrlPSRj4bmEEIptru9l01rD8IcUiUPvp9gwFM+QCHl4kkOIsuOq /4gQshpMOnVk1ClPwKPxrhvdqBFQUaZMqBM9irl+4NlLodx8UuGLRCGS7k+Q2a8C xlTxOQfF6wpQgd32Ryhg== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id 0e2a141d (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 4 Jan 2021 17:58:59 +0000 (UTC) Date: Mon, 4 Jan 2021 18:58:51 +0100 From: Michael Gmelin To: "freebsd-ports@freebsd.org" Cc: Steve Wills Subject: Re: REINPLACE_CMD QA causing pkg-fallout Message-ID: <20210104185851.5556e4d9@bsd64.grem.de> In-Reply-To: <20210104185631.19742845@bsd64.grem.de> References: <20210102183312.2d39afa1@bsd64.grem.de> <20210104185631.19742845@bsd64.grem.de> X-Face: $wrgCtfdVw_H9WAY?S&9+/F"!41z'L$uo*WzT8miX?kZ~W~Lr5W7v?j0Sde\mwB&/ypo^}> +a'4xMc^^KroE~+v^&^#[B">soBo1y6(TW6#UZiC]o>C6`ej+i Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWJBwe5BQDl LASZU0/LTEWEfHbyj0Txi32+sKrp1Mv944X8/fm1rS+cAAAACXBIWXMAAAsTAAAL EwEAmpwYAAAAB3RJTUUH3wESCxwC7OBhbgAAACFpVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIFRoZSBHSU1QbbCXAAAAAghJREFUOMu11DFvEzEUAGCfEhBVFzuq AKkLd0O6VrIQsLXVSZXoWE5N1K3DobBBA9fQpRWc8OkWouaIjedWKiyREOKs+3PY fvalCNjgLVHeF7/3bMtBzV8C/VsQ8tecEgCcDgrzjekwKZ7TwsJZd/ywEKwwP+ZM 8P3drTsAwWn2mpWuDDuYiK1bFs6De0KUUFw0tWxm+D4AIhuuvZqtyWYeO7jQ4Aea 7jUqI+ixhQoHex4WshEvSXdood7stlv4oSuFOC4tqGcr0NjEqXgV4mMJO38nld4+ xKNxRDon7khyKVqY7YR4d+Cg0OMrkWXZOM7YDkEfKiilCn1qYv4mighZiynuHHOA Wq9QJq+BIES7lMFUtcikMnkDGHUoncA+uHgrP0ctIEqfwLHzeSo+eUA66AqzwN6n 2ZHJhw6Qh/PoyC/QENyEyC/AyNjq74Bs+3UH0xYwzDUC4B97HgLocg1QLYgDDO1v f3UX9Y307Ew4AHh67YAFFsxEpkXwpXY3eIgMhAAE3R19L919nNnuD2wlPcDE3UeT L2ytEICQib9BXgS2fU8PrD82ToYO1OEmMSnYTjSqSv9wdC0tPYC+rQRQD9ESnldF CyqfmiYW+tlALt8gH2xrMdC/youbjzPXEun+/ReXsMCDyve3dZc09fn2Oas8oXGc Jj6/fOeK5UmSMPmf/jL+GD8BEj0k/Fn6IO4AAAAASUVORK5CYII= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D8k083xnxz3NJQ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=grem.de header.s=20180501 header.b=blDn9oqc; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@grem.de designates 213.239.217.29 as permitted sender) smtp.mailfrom=freebsd@grem.de X-Spamd-Result: default: False [-3.49 / 15.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_ALLOW(-0.20)[grem.de:s=20180501]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:213.239.217.29/32:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grem.de]; NEURAL_HAM_LONG(-1.00)[-1.000]; SPAMHAUS_ZRD(0.00)[213.239.217.29:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DKIM_TRACE(0.00)[grem.de:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.99)[-0.987]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[213.239.217.29:from]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-ports] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 17:59:05 -0000 On Mon, 4 Jan 2021 18:56:31 +0100 Michael Gmelin wrote: > On Sat, 2 Jan 2021 18:33:12 +0100 > Michael Gmelin wrote: > > > Hi, > > > > I updated the devel/phabricator port yesterday, which included > > running the usual QA steps (`poudriere testport', also running "make > > check-plist" on a local ports tree). > > > > Later, after committing the change and when updating on a production > > machine, I noticed a problem with the package list, which I first > > corrected in-place and then committed the corrections. Today I > > started receiving pkg-fallout messages - seems like timing was quite > > unfortunate. Those messages motivated me to look into the issue > > and I figured out why it failed: > > > > It turns out that if DEVELOPER is set, it worked fine (which is > > also what is set when `poudriere testport' is run). Without > > DEVELOPER set (e.g., in `poudriere bulk') it failed. > > > > The reason is that this port sets REINPLACE_ARGS to override the > > "-i" argument to $REINPLACE_CMD like this: > > > > REINPLACE_ARGS= -i "" > > > > which seems to be the intended use of this variable, according to > > bsd.port.mk: > > > > # Macro for doing in-place file editing using regexps. > > # REINPLACE_ARGS may only be used to set or override the -i > > # argument. Any other use is considered invalid. > > > > Now, since r522484[0], reviewed in [1], REINPLACE_CMD is set to > > sed_checked.sh (which now is ${SCRIPTSDIR}/sed_checked.sh), which > > hardcodes the call to `/usr/bin/sed -i.bak "$@"'. > > > > Therefore, this is what made me create the broken pkg-plist: > > - I had "DEVELOPER=yes" in /etc/make.conf. > > - I used `make makeplist' to create a new pkg-list. > > - The new pkg-plist contained .bak files created by sed_checked.sh > > without me noticing. > > - `make stage-qa' and `poudriere testport' worked just fine, as the > > .bak files are created there as well. > > - Once building without "DEVELOPER" set (production server with > > ports tree, `poudriere bulk', project build servers), it failed, as > > sed_checked.sh isn't involved there, so no .bak files are created, > > as REINPLACE_ARGS is applied. > > > > To keep supporting overriding "-i" and making sure that DEVELOPER > > builds are the same as non-DEVELOPER builds, I would suggest to > > modify sed_checked.sh like this: > > > > - Change the call to sed: /usr/bin/sed -i.sedcheck "$@" > > - Move the backup file back to the original file after checking: > > mv "$@".sedcheck "$@" > > - Run sed again, this time passing $REINPLACE_ARGS > > > > Maybe @swills has time to look into this, if not, I'll try to find > > the time to come up with a patch and open a review. > > > > Cheers, > > Michael > > > > [0] https://svnweb.freebsd.org/ports?view=revision&revision=522484 > > [1] https://reviews.freebsd.org/D22174 > > > > I implemented a simple fix and opened a review: > https://lists.freebsd.org/pipermail/freebsd-ports/2021-January/119978.html > > -m > Breaking the recursion, here's the correct link to the review: https://reviews.freebsd.org/D27954 -m -- Michael Gmelin