From nobody Sat Sep 10 17:44:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MQ0c0707Lz4bYyS; Sat, 10 Sep 2022 17:44:32 +0000 (UTC) (envelope-from leres@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MQ0c06XLBz3XXr; Sat, 10 Sep 2022 17:44:32 +0000 (UTC) (envelope-from leres@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662831872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LQLGbr9fXJ3btSYZOs03K+bujxC6YWX5cx5TBF15nUw=; b=qtoGM/sBm6M4DyKFRlWi/7PovNu60cFthkUhF9BeRAnqvDTqvUXcXXwxgR8MCIq535rwzV U7F5dm3i+SFfC459qjiQakEGNtWeRKdXkMO/ZKWSDXFk0s9HLSZpEBbaEAIZ72ynXVMEXz 6Rm2goN2O18hM4aEnoHFelHkE4dGLuyLnuZDQYQ2Nb3RN/Ru8mmxnJOrdRe8TqIvAmaBvf Fzl7FfqU9aoAz5aADiTFu3wXHiToOyQr3aGV3ml+5e4ZpTexWgvTjmW+U3zYMmQd2vy1PB 9L9jSWF3sRdwyAUuOvEHySQBFsasvcZvSwtEVCbQcCHsgJ8bIqaHyIEk4AqeSw== Received: from [IPV6:fd:1965::2] (unknown [IPv6:2600:1700:a570:e20::38]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: leres) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MQ0c01dqMz1L0P; Sat, 10 Sep 2022 17:44:32 +0000 (UTC) (envelope-from leres@freebsd.org) Message-ID: <738f0c74-a762-aa74-9045-1d5f14a04876@freebsd.org> Date: Sat, 10 Sep 2022 10:44:30 -0700 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: git: ddd0e820c8eb - main - Mk/bsd.ports.mk: Add suppport for WWW in Makefiles Content-Language: en-US To: =?UTF-8?Q?Stefan_E=c3=9fer?= Cc: ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Antoine Brodin References: <202209071941.287JfCRU062079@gitrepo.freebsd.org> <5fae27be-d529-9e28-faa3-b88ed19b94c1@freebsd.org> From: Craig Leres In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662831872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LQLGbr9fXJ3btSYZOs03K+bujxC6YWX5cx5TBF15nUw=; b=HQbPdc/qBrmbMJDdX4QKwSabGkHtLBP5Ghx1Mp4M734Q0E692ZaFRSGmInov5Iiz9WgEXL rMiTWIGKyDRf0+NBK/R7j7elC+QV4G+yVOQMAjyCb+NGBP5E4OpJC6CrZDyzRmZBGvIzF9 FWlGTMySc4ozlMNfAa2izUAk+hWeGzN+5a0aeKVpiwAN22z1EolCBZT7EPZ7bd1Oof8MB1 OEGhYO5cngVzPWRZa7MJ/QIAjnzQrpGDR6Sv+qLbC4s1I4GectozvGKK7RlLMBWOBujXUB rR1Sq7SSaA5aOH+fDLN+wC0wWQOnZRoH4z/8PIrXk26GoNL6eFJxO+l5WqZRCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662831872; a=rsa-sha256; cv=none; b=ob5bMzLIevFomlVj1l8K2luy4ozXq9rEm5ICAFU76dypaFK47PlVi0aX9DlTwojgSTCfgQ 4n8ZPabaRZzzJDW9pk9Y6j2plSdWF2iHOopgP7t35RStU10Ybf3O9dxq7vm+uZHC3Sefix JG/FEd/UJHEsTNh6xKaHAqVlpIyx6WssSbv4xIk6p9kuQ5xdgWhDV/Zuj0BmsY95JX7+5l 11Wco8Ut4qXIRXYVj/UIL0JfQMgIANvL9SUjWaTFs9LXaENIQrL8UGOBk1u3HTgmMzUc2P iajZjp/SrWQrczd3rT1NWDzIPlIwbvTdfLMefUEegroqGO6IgZZlbXntjRG5VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 9/9/22 12:17, Stefan Eßer wrote: > Am 09.09.22 um 20:01 schrieb Craig Leres: >> On 9/8/22 23:40, Antoine Brodin wrote: >>> Another regression,  now some ports fail because the manifest is not >>> valid. >>> For >>> instance:http://gohan03.nyi.freebsd.org/data/main-amd64-default-baseline/p3af3d0f1a1c9_s1494f4776a/logs/errors/linux_base-c7-7.9.2009.log >>> >> >> I'm seeing this as well since this change. I started a poudriere jail, >> built the port and the poked around in the work directory and noticed >> that line 11, column 55 of .metadir/+MANIFEST is a comma: >> >>      name: "linux_base-c7" >>      version: "7.9.2009" >>      origin: emulators/linux_base-c7 >>      comment: <>      Base set of packages needed in Linux mode (Linux CentOS 7.9.2009) >>      EOD >>      maintainer: emulation@FreeBSD.org >>      prefix: /compat/linux >>      categories: [ emulators, linux, ] >>      licenselogic: single >>      www: http://mirror.centos.org/%SUBDIR%/:DEFAULT,aarch64,amd64,i386 >>      deps: { >>      } >>      options: { >>       DOCS: off, >>       NLS: off, >>      } > > This was a side effect of the decision to use the first element of > MASTER_SITE > as a default value for WWW. > > I have committed two changes (0d7e17c121bb, 1c4cfbf076f6) to fix this > issue: > > 1) The www field in the manifest is now set to a string in double quotes to >    prevent commas in the URL from being treated as a field separator. > > 2) There is no longer a default value in case of no explicit WWW parameter. > >> I noticed that the port makefile does not define WWW. When I add one >> the port successfully packages. >> >>          Craig >> >> zinc 55 # pwd >> /usr/ports/emulators/linux_base-c7 >> zinc 56 # git diff . >> diff --git a/emulators/linux_base-c7/Makefile >> b/emulators/linux_base-c7/Makefile >> index 142e4e9267..276453f1a1 100644 >> --- a/emulators/linux_base-c7/Makefile >> +++ b/emulators/linux_base-c7/Makefile >> @@ -6,6 +6,7 @@ EXTRACT_ONLY= >> ${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//} >> >>   MAINTAINER=    emulation@FreeBSD.org >>   COMMENT=       Base set of packages needed in Linux mode (Linux >> CentOS ${LINUX_DIST_VER}) >> +WWW=           http://127.0.0.1/ >> >>   USES=          linux:c7 >>   USE_LINUX=     # empty > > Yes, this issue did only affect ports that did not set WWW (i.e., which > did not have a WWW: line in the pkg-descr file before). > > The double quotes around URLs are not required for any current WWW value, > since none contains a comma. But I think the quotes makes the code more r > robust, since a comma could be contained in a valid URL assigned to WWW. Thanks for the fix! Something related I just noticed: portlint needs to be taught about WWW. Craig zinc 34 # portlint -a FATAL: Makefile: extra item "WWW" placed in the MAINTAINER section. 1 fatal error and 0 warnings found.