From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 30 Jul 2024 10:04:56 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46U84tww001150 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 30 Jul 2024 10:04:55 +0200 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-426624f4b7asf6096075e9.3 for ; Tue, 30 Jul 2024 01:04:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1722326690; cv=pass; d=google.com; s=arc-20160816; b=bxn4w8AE2qfjDjfyq5WgnPH2NZ6N3SECRk6R1f4qGoH5njJGOeldHt6obYviUSV90H znw8Z1livNGmXq8Ml1E78jBPhBM3mhwhD2xndb/3rZTa4Lyh+5hsc0ZjLtqlXSA2af5y wigQpOtFFHXwb9s8R9a1K/oZn7OuOMvQO3cgGjrFKGHUD8zcY5rpEvO0IbcGY/N65Ldq 8rOHGr6WwkBDl/N01ZZFHSbheTWB986OIujNWq8pekM0AFyhLgS5FZ5QH2Zs+/r1SNt8 VPo9tsV49hKylTv+kFvWpQS/6wc6VIKGmFXUXm4Pb4CPKerHRp5jiRCGhBcVZ0muL/Qc /fiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:user-agent :content-transfer-encoding:autocrypt:references:in-reply-to:date:to :from:subject:message-id:sender:dkim-signature; bh=LHZ+1tkn/7n6hm5qEaxCZ3lNfocxenEkmYVFTWEIJ3Q=; fh=xXp4wabR/UiYe+mRuAeP5ldUgk16SWaXxEtsQUDCvnU=; b=Z7qds8Nc72TRDyw3xUTiNLeDHqRoOAWPZ8ppAh/zftscx3rHGth4RpJRdG3+Wn9KUo zAptIPO+PmxuXf67H4yyoB+UZffIjiOd8gQ4GixCAv3XcK0cjuv/qKnwy1ZDymuZ5MLJ BlFpbogX51GBiaj6mhYTG+OqL6PCtx+bSWZEkS8xMj7hS0qsJpnIEQ43f1rljV0BkUGQ b17YnL72GptFp4hnG+wDPfLLRwSTaGyZLZAhlSx8nApal8qxizahhuk8HXqaa3a0z8+2 dcVJaG5WX8LADRi5++mldq/hmlQQMldRDulTtKT+6icxn9e1UpxYG5OwOd4zU2F/Nur2 V0/Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1722326690; x=1722931490; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:user-agent:content-transfer-encoding :autocrypt:references:in-reply-to:date:to:from:subject:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=LHZ+1tkn/7n6hm5qEaxCZ3lNfocxenEkmYVFTWEIJ3Q=; b=ShEPLntonInk/oZfXwauDnl9mu6+m1l5XW91ngKwcy4ccyUxIHqJRIA+J0XJFiAGYv mxk5h3JziQHSylRdkhisKOoeTUUnisR4x/v1DltkeYTWHlf0Q6MJBDhEQ6FhXgmmWHjj +Te0jFnWh1YqoMwuHwtyjeuMwpkvohc1pyO/gfhJhKmOd8b8cWpZzw0NFHNnBVRP2Osd wWNmbYfPSFFcz1zuydujAtGrC04vhRcZKNHL8Rj89i6LF4fp/NZEyI0lCgmLWBvgK22x PUE2VqCh5H5VTjAOqtvwKD/xBQlhQGTZgbu87ptBb//MshcqBudPMZ0l2xqM6xXaT26d IrVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722326690; x=1722931490; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :user-agent:content-transfer-encoding:autocrypt:references :in-reply-to:date:to:from:subject:message-id:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=LHZ+1tkn/7n6hm5qEaxCZ3lNfocxenEkmYVFTWEIJ3Q=; b=cjF+/VRWQi2GK3gvh+YFXmPr6Y62daoMihBXOYUxKjS5KZeCpcqppycMinvCpYMRLv 77PDxEDG8suIybo1p3cfhtr6jnZ+akruo2VvG7gzoN6hPpMFSC3C8FJtTAWKIIXaWpRm YbIDDxKJfjC7pqkVUXP87MDuPzoRjNKVULSBC+709KzCigi836IHluMtSaIHXzIREMbR RwqUhHaBDdV8xThmO0Rgojwe6QffQY/CRtB25Dckls5igUyolZ/gh4x1HZaA16a8+A2j 8WHPAk3yPR2BKlSexmMg+lbgPcSoc0/OTN8YwKXYhi7sJWdaxrbLpwrNdpUiTvZJMJEM CkQw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVXk2k2kvg8kl6LsbRG2HfkHZtzsfxboNPiyf5ctkMvJbCp7OWUV/DOyyC7FLRlVPJtuiY=@isar-build.org X-Gm-Message-State: AOJu0YwY+1Z7chZl85EVotc/tdcbzRT69htmKb3AXfyQKM8xkZuTNTqu fiR93qN27CUxukwkfkKKa6+iDa9gRdPnVXWlpTOvxokirvI5D747 X-Google-Smtp-Source: AGHT+IH/RK6MFwgPD/fRTZCSbRG317YnLsOufMpc3IeNH1nO6SgaYyz2b22z1gBmI3uwKfdGRQoUpQ== X-Received: by 2002:a05:600c:3b21:b0:424:ac9f:5c61 with SMTP id 5b1f17b1804b1-428057706aemr71383495e9.3.1722326689397; Tue, 30 Jul 2024 01:04:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3513:b0:426:68ce:c99e with SMTP id 5b1f17b1804b1-42803b69c50ls24772125e9.1.-pod-prod-03-eu; Tue, 30 Jul 2024 01:04:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpOOxm51GGR32Pbfj75ITFZULSTyJCa2FXqlSKI9BfiSF7wvjRZztWAHKxGDYgbKq5IIky2AgKXXYiQ4OGwSAk0AJj4qh58uZXxSA= X-Received: by 2002:a05:600c:35d5:b0:426:6f5f:9da6 with SMTP id 5b1f17b1804b1-42811dd70d7mr78623285e9.27.1722326686953; Tue, 30 Jul 2024 01:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722326686; cv=none; d=google.com; s=arc-20160816; b=yW14jxl0BxO90ppxXxbkqNyNNJIINT45rUy3UfbgXSpDFwiUwSVqF+npeGsbHIg2r5 my0J1ai2O+w9P1ZVKA1Hq5Jxu/rwFicuU+WAJKu2CKN3GUKEssOUcS0fcYfxfa7kJ6wo lg33fLLXVQUF7Yfz0Ieb/9v2vinETFj3aH52Teyil9Nt5xSlOX0hEtU8MRQWLQcch4JG 0ib/4lSNP01RGHc8od/q+l+WxEiQDII3iyg28X1C3D78BFAK1TRh8teWdc8qxVK/mP1N nPgEWmuPM7Ws3z9OHUBaIreVO4NWt0FO/irt8OOy7VXApLVMKza0eOBDpAtsdAopB7ok TqKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=aOFbowb/yBnd8Q8okT8CRA0Dga/cAV0+NXCsU+cVi7g=; fh=ez+yYIN2+t1/A1KtVD1essDQ6+anTTnZTbSXjuK9WaU=; b=O8aFWJn+/XF/rauLyPab70tVfrFs08mgWG5KpNohaNkCPAviuDqTXUXl9njMgT1J2o pbJQsJlfTkJVq5HbdnYiZtXYwBkLaTCYYTcD5OHUzr42PTjGbAUldzEPmFbPQvy2kUSD 3KYgnulkrJeEt/VoDyEjc/f/zHJpGSFxkGFzdfDBtDVGSEzALSLjqCmebpG0H+yivreo +N/MZLgUg/8XBcvJh1KrU3wMAxP2eJuSkYG1AyvHLQpb1gPZ25S8r4RGg4Bwjsbj6z3m 2vBpQzqXpupHzUhVrPdcx4eoBpvXfXws1m5F5BfpXx4L+FSvFCqgsk8Ehis6mZv8O36F psTw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-428240b2c2csi560655e9.0.2024.07.30.01.04.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 01:04:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [IPv6:::1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46U84iJ7001138 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jul 2024 10:04:46 +0200 Message-ID: <60af4ba0a930954a347838e850a7c039f6043036.camel@ilbers.de> Subject: Re: [PATCH 1/1] fix expansion of variables in SRC_URI of dpkg-prebuilt From: Uladzimir Bely To: Felix Moessbauer , isar-users@googlegroups.com Date: Tue, 30 Jul 2024 11:04:44 +0300 In-Reply-To: <20240712092245.47054-1-felix.moessbauer@siemens.com> References: <20240712092245.47054-1-felix.moessbauer@siemens.com> Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtA== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.2 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-TUID: T1ofjjhKcS6V On Fri, 2024-07-12 at 11:22 +0200, 'Felix Moessbauer' via isar-users wrote: > The processing of the items in SRC_URI of dpkg-prebuilt previously > was > executed on the non expanded variables. This was introduced to fix > credential leaks and to avoid absolute paths in the signatures > (caching > issues). However, this does not work when putting whole SRC_URI > entries > into variables (which potentially can be empty), as then the > unpack=3Dfalse is added to the non-expanded variable which either might > already contain this, or is empty. This led to broken urls. >=20 > To fix this, the patch changes the processing logic to work on the > expanded string. As this would re-introduce the credential and > caching > issues, we further add a vardepvalue with the non-expanded string. By > that, the signatures just contain the original string in its non > expanded version. >=20 > Signed-off-by: Felix Moessbauer > --- > =C2=A0meta/classes/dpkg-prebuilt.bbclass | 9 ++++++--- > =C2=A01 file changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg- > prebuilt.bbclass > index a6187a07..ecf0d383 100644 > --- a/meta/classes/dpkg-prebuilt.bbclass > +++ b/meta/classes/dpkg-prebuilt.bbclass > @@ -7,13 +7,16 @@ inherit dpkg-base > =C2=A0 > =C2=A0python do_unpack:prepend() { > =C2=A0=C2=A0=C2=A0=C2=A0 # enforce unpack=3Dfalse > -=C2=A0=C2=A0=C2=A0 src_uri =3D (d.getVar('SRC_URI', False) or '').split(= ) > -=C2=A0=C2=A0=C2=A0 if len(src_uri) =3D=3D 0: > +=C2=A0=C2=A0=C2=A0 src_uri_raw =3D d.getVar('SRC_URI', False) > +=C2=A0=C2=A0=C2=A0 src_uri_exp =3D (d.getVar('SRC_URI', True) or '').spl= it() > +=C2=A0=C2=A0=C2=A0 if len(src_uri_exp) =3D=3D 0: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return > =C2=A0=C2=A0=C2=A0=C2=A0 def ensure_unpack_false(uri): > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return ';'.join([x for x= in uri.split(';') if not > x.startswith('unpack=3D')] + ['unpack=3Dfalse']) > -=C2=A0=C2=A0=C2=A0 src_uri =3D [ensure_unpack_false(uri) for uri in src_= uri] > +=C2=A0=C2=A0=C2=A0 src_uri =3D [ensure_unpack_false(uri) for uri in src_= uri_exp] > =C2=A0=C2=A0=C2=A0=C2=A0 d.setVar('SRC_URI', ' '.join(src_uri)) > +=C2=A0=C2=A0=C2=A0 if src_uri_raw: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 d.appendVarFlag('SRC_URI', 'v= ardepvalue', src_uri_raw) > =C2=A0} > =C2=A0 > =C2=A0# also breaks inherited (from dpkg-base) dependency on sbuild_chroo= t > --=20 > 2.39.2 >=20 Applied to next, thanks. --=20 Best regards, Uladzimir. --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/= isar-users/60af4ba0a930954a347838e850a7c039f6043036.camel%40ilbers.de.