From nobody Fri Sep 9 19:17:50 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 4MPQk867dyz4c7Dx; Fri, 9 Sep 2022 19:17:52 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4MPQk85L7Vz3MWl; Fri, 9 Sep 2022 19:17:52 +0000 (UTC) (envelope-from se@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662751072; 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=JIAQ8Q7Yxwv48zi3AnKmHsESRhya2IRUQTDKjFXHQUs=; b=lIJAGmYukJwoB+FeYUDD8IpTw6Vy4RywAGYnbdzfD4Lir9f/BqSTvLnTB790WV9ygv039r ep1lA9Bi+aeM9YdggvzvR/fB4Pqx+wbqAgU41QbI4A0hBEknfCfzmIUzvv1a64UPAzaSOa wqPKnggqcGA5ZbLPJEUGLACyGUy1EWMS78geBaIwH/D2fjOwD4DgzP/027EUOXJ62NtJO1 GmFH6WRKZ+rmh78tWuHl+TCiy/6wk2AjVaEI/gxB6R77yF3a7jMSdcaEWiTfUKnUVnATBg oSRk+wndztAljiIdUtJ9G6in6at2ohYQ+6wJsga3FwXisb3g66n0bRm3LZCnmg== Received: from [IPV6:2003:cd:5f1e:4500:645a:2daf:a3b9:31ad] (p200300cd5f1e4500645a2dafa3b931ad.dip0.t-ipconnect.de [IPv6:2003:cd:5f1e:4500:645a:2daf:a3b9:31ad]) (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: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MPQk75sMwz1FTx; Fri, 9 Sep 2022 19:17:51 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: Date: Fri, 9 Sep 2022 21:17:50 +0200 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 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 From: =?UTF-8?Q?Stefan_E=c3=9fer?= Subject: Re: git: ddd0e820c8eb - main - Mk/bsd.ports.mk: Add suppport for WWW in Makefiles To: Craig Leres 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> Content-Language: en-US In-Reply-To: <5fae27be-d529-9e28-faa3-b88ed19b94c1@freebsd.org> 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=1662751072; 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=JIAQ8Q7Yxwv48zi3AnKmHsESRhya2IRUQTDKjFXHQUs=; b=O6wyLSAZN+LPQwGG6qWlkFV7z/F2+mEsas+qPDhc1Zk7JuJvoaN9eZ0ifxBthBcd43LqXC KBs0DUL80hBX2cAd815KANFSyDtyIQhAZW7RUrzizl2pJobc0wuv+h2bFiGjGkKWRUCxZx Hf7MgEEFp29I+9/n9QoywCFlxCBqTjv3Y1W6a0RKp7KYNI68rxFI+Q5UeN7+p8RSSu+81v dKE4PWil8hEEL5DY2pFaPzBm2fcZv8mSd+C+6Z3WTGpt5kMaBLozj0HinMjUJoopa4Cjwm mdq0IEKWxoduVnttVhoDZa/L/JQUF7EHYj/2+odEGtuf+Jm0YwG9H77sQM5Ezg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662751072; a=rsa-sha256; cv=none; b=XKIveWlynXv9CpQ1tVkw3AHkz/31OqtFirkvsOLqqhE+zAyiJkIWGeEGrJuui4OOB7k8DA rmbBnGqlXTOsx4riBvvy/pMtNsImk7a8nvNKT13n0CHCFUGY3UaI4M3fZjW/ccattSGl8T RPVinjwCRhi3t/vepKhuTdiSiOL/MvqmN29RM/qKC9GdDLX2nn7TVFpcwaczNoRXdPRwP9 aT6MRaXYou9mdRkt3OY2Z/DxxWbapGIC70moE6OlSzJIAroKePeWpYmwtB+T/8nqubwgri suten9LlMTbWWX64a+CAV0I1Nio23B02C6L1u0UM5/W17jHELTz0TG1e8AIPPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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. Regards, STefan