From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406755293691904 X-Received: by 2002:a05:6871:5cf:b0:205:198f:7457 with SMTP id v15-20020a05687105cf00b00205198f7457mr7564177oan.17.1704182185645; Mon, 01 Jan 2024 23:56:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:9720:b0:203:6edc:d5ef with SMTP id n32-20020a056870972000b002036edcd5efls527505oaq.1.-pod-prod-05-us; Mon, 01 Jan 2024 23:56:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IE39IhtZrDw7WxuaeZ97b7RjDfqfVKxCrRAS2dVDAXxMYVL+Jkb/1NS9TwA7sgshaWzXQGi X-Received: by 2002:a05:6808:1717:b0:3bb:8023:37ca with SMTP id bc23-20020a056808171700b003bb802337camr18721180oib.35.1704182185009; Mon, 01 Jan 2024 23:56:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704182184; cv=pass; d=google.com; s=arc-20160816; b=JmX0XZAYZqVdI9MjK273OyRAVgQgyaH3JjNS/k09UdamABS6qYoi2+B7f5tHYuYinl dvXWyxPHVnmY7xCsQWS25xo4MxYrN09zz6SSug5X5HQEUd++0jvhHLKRGxqsnYrPFaJD FY/21IrhPWTbDskqSuK2PBlMV2IfnMROd1/HXqIPjXDZ4ML09i16CaxU8At9DVD1ZO8H KGzC/KbRZ5MgofK3vnN7O1P03J49V5Y9QsC2Sq7rDN1mF3cMOZL99gZNnfrjlYYRmSOo YuZYYjQJ443EwjnRsf5QOmYVajyPLvGtVP4j4t8sWiPEGmIGIzae6UJ2N1fjmhCb4r4H Rcog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=ycd43R/Kb64HvTGTtlDuQoDh++FzRbyXTpJngHCUZGw=; fh=t0mcvaJbZX1rbHGy0VZpwqATSFr5kG5jjmumnmxE5xI=; b=WuAWKlVbGkj3Sjd3IaCUDyVgnViGj7S7SgQDEk1pKvzCqXAQG8EkuvFHM1rZvnZmcu DsQT8I6T7+Vdn4bGBDGaxcZDbr9AyWw3Pf38s/EsMbg4VdbYznd5TFFS5XE+kZdRRgAm jnXACLawwVmiI4ggsmp2Skp1OXhrKhP2UnRn4TVWoCjUMe5myB9dKRJX4CJUK0z5aC/2 bdk00tW5DjmAOL8B6vgo7t/LUWEF/vBwAQ+8ffzIDfswSmmd0yrF191DgXizB9cJevR8 zOfSlKBKiw1x3JXLU+S04SOFwjUEpVN94OTovyg4XHzB03GIJEciHkuR17mKV2Ukfsha RgQA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=djRZJBqs; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::61b as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061b.outbound.protection.outlook.com. [2a01:111:f400:fe0e::61b]) by gmr-mx.google.com with ESMTPS id s13-20020a056638218d00b0046ce76521c2si1656147jaj.2.2024.01.01.23.56.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jan 2024 23:56:24 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::61b as permitted sender) client-ip=2a01:111:f400:fe0e::61b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=djRZJBqs; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::61b as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gd36fc+YxV++WWYYc5NW1SKD12th5exHz6ZAcTsq8egaM0vVpUEHYHrgIAbGe5rpT//hi7R/ZpuTX5n1OVqMT3ejvNwhllUX0z0KUO3th7yB3BNkoevJz/MTl/tgN6bmzwTpDQSn3F5R3lAKEQlxImnvgiBy1d9HG5akBb23K5dKqN/BACD8VwXqNyLhxGW8grvrlmmlwjl4WSP+0g/TIlvT8CI0j5Tx3sfTEpWe8/7f+cNBoBdxfF00LLSP/r5d2Rq5+k3YG4AEY+Zd3rjSAgQXdtIc+ZEtKN3sSprn9bX+/Z+4lMZO1CO6cAuhj6thukp95aevA2Q0sH1xG7GQFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ycd43R/Kb64HvTGTtlDuQoDh++FzRbyXTpJngHCUZGw=; b=LC1Y2wskxen+DgpNnMC/apmrXrq0y4VWp3aZ4RTy29F0oHwAKub2iGwLc3JH3Yzu1zG9hEVw2QglI3X3g5XoHGvFpYC7kOKcKZAGurMwMWO9EbtrAWdExoV5MV0NdKY9dYwr4SKgPA7U4DMN/9WManowTyG+H+sIcEyBM9oz2Z5seC8z1rCkUU3Gv05d2rbiWfqGWtbJEOiJUk+jwbbeJ6xtkWwS3YoFOtlhB9MO1EGUiVuJyw1XjjjXOExDIXrOoZ3otw1D/QpD/GHh9KZ6qMoCzCTrl/lrq8PUNkuHpX7SIce+1IkA7X2a7P6OJRzTxGemNroiyNK5J/peHrO3hg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ycd43R/Kb64HvTGTtlDuQoDh++FzRbyXTpJngHCUZGw=; b=djRZJBqsxN6kFTngIorshrMSPIuisn1DTzkoCXwvV0j+dRNz6E8UvzVYxdnBemqJKevzSRm6D7z7AulWDYW32po94+ucFqb6Xe/0ygtWDqdfH3Jz6+pK55HT5OSXGWMn+rf92jNgeqid4bXhynCUthkr6YZxQLNZdUlHV66lvw17DPYOqYlKbpPKliAv9Ef0C0NzNG4yAJaCMoP99FSn9jzQFe9nBHIPRNm0c37d0GWdym4naeNsJvgvmKJYw04C5GvDFiS1RAYnhQ2ELKbtYn0M9IQ2QtgK8ER4ZytZpWeXTfCnRPKtJcz8U9KhUPNB5obHrYSkbXWkvvVN0TH8xQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by DB9PR10MB5332.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:336::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Tue, 2 Jan 2024 07:56:22 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761%5]) with mapi id 15.20.7135.023; Tue, 2 Jan 2024 07:56:22 +0000 Message-ID: <31649c87-19e0-40fd-8ef8-70fdf4a84f69@siemens.com> Date: Tue, 2 Jan 2024 08:56:21 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] dpkg: Prevent early expansion of shell command Content-Language: en-US To: isar-users Cc: Uladzimir Bely Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0216.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e4::20) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB9PR10MB5332:EE_ X-MS-Office365-Filtering-Correlation-Id: 18288df2-0825-4bc3-7125-08dc0b684f9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nPG+/MkF743iumVjMUXvxNxktbiqKw0AP7TV+Xe8A+q0YhtM4d3ZzOBUTvO85e/XnaTIissOQLkHX3ohGxkRX/9pwyYxufYDZyZq90eYobO4m+LMZtjDw22FDlZDEEiTOUkablgxfom98LwkGD0gZgEgh1vkK1GGIO9yRrPtNKrIza8eBX4FPERM41fJw/Kvj/bh3CLCUhwvEW6mYrM6aoOrwEx1+mUZnvMX/xUstcIbiyzpiXud0VHOObFbUVlmvw0KNDSeXCxUewjLNpSEEcENvql8G1FGb9KDOu56XMy1HweBYPXw07ekSuW6HCGtuMspsnggsrsYGx6MetzEGTxmxkL6tV8Y9gtken7ezIULqkntlmrkJLA706qfTbAmbbLLrsvgCPlYXL0LC2Y+e2QZ56vBWpstdERUm42RU9/HfVzABneffYwzM7XHiNg4Np8SQQcLEviK5Sa/hpjgkLc5LH+hgVYmQUpgbw9xIpw4YKWSTMdUo7z58ym+e8jjsu0lQLHtXb7A7srYEprfy8DCvw5yWkBsmhpkHW/4sjqXpsKHhNUx208oKo4MDJzg5wbSRC3PsnaNUuoTQQb4Pvg4rGUsun3B2m8SDtjJb+VcmZPCPRKTcjV5J8+R/qfffxUuVfVHYXTpmKMo995OsWKkvLtHy3ZeSuyR9GJk6ho= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366004)(376002)(346002)(136003)(396003)(39860400002)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(41300700001)(26005)(83380400001)(2616005)(38100700002)(2906002)(82960400001)(8676002)(316002)(8936002)(4326008)(5660300002)(44832011)(478600001)(6916009)(6506007)(66476007)(66556008)(66946007)(6486002)(6512007)(31696002)(86362001)(36756003)(31686004)(43740500002)(45980500001)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YWVHKzFwU2xYSllZZks0ZGdsbVNWRHYzV2YvTzJ5Vy9LNmdSS1FrNndwMzc3?= =?utf-8?B?eGM3Wmp2Mko4RWlQS0c1eEpBc2hxSEZuU200bk5oNVAyallsemhQM0xzUmZj?= =?utf-8?B?eEFULzZFQXlxMG9Jd0VxTTZxZVN3REMxdFRHMmRMWkVwUzNJVWg1Qjg5Nmlq?= =?utf-8?B?QnNZQjRVcnJuK3I0VHNFN3o0b1BQZS9sdWF1M2RJZ2NCK05hNk9ZSFozTzZL?= =?utf-8?B?b0tHb05uZkEvdlpOL1RSWmtGODBBWEJpajFMQXQ1SlNadmtrL2paNEsxZm0v?= =?utf-8?B?WXlLbGZrSFY3ZUZxQ202ejl2S21tOGtpalpMV0d0blBoTksrWk90Rms1K2g5?= =?utf-8?B?WWxBZkFKRy8wNnNNNlJVTzU2eDFCZDJmck5PdmtkQVh4WDhHcVJtNU9RS0hN?= =?utf-8?B?ZTJxSFQvZ3JpMmNadXBOL2JIVVJxQTdzdVJzUGIxYXQ2VGJMQVUrQ254UXVy?= =?utf-8?B?UzhobHBZNGV4QkZDQ2JhMlNuc1cweno3c3NxWVZPRGdrSThwSUVVVllDUlMz?= =?utf-8?B?UzRxOE01MHh3U0YyM0VpeTJmbFBxcGFkamhLTytpRnFlRjdwOTl4NlNTTm9S?= =?utf-8?B?MGcwMElTMUNBZFR3UE82TjRNQURPWmFtWldSVVh4Y2tsdjFHbXE3WElvcTZP?= =?utf-8?B?SGRGeGVrMGpsV0hRVWh0dG51RW52aWthS1hlbGFrMHFUOVcrNUw2T0dMZmFE?= =?utf-8?B?aVRkMThtSWxocXE1TmhSY0lLVmlYU3NoeHMxRlNPeUY2ZjZwQUlHNVJkL1dB?= =?utf-8?B?eGxNNlRyQ1dZMFlzeDZ1MHpaY2EvUDdkSGJERlM5MUVWV2doWlVtNUlOOHVX?= =?utf-8?B?V3l3bk1Sb2hyWm42RHZySm1iSURJYjBzV0JlRll3ZHlURmVkc0l0UHQ0eUpL?= =?utf-8?B?Q2xCMlUvM2xMMjZlQWF2WlpDM3oySEJQcWdpc0FLTVB2ZWo1NXNLVWE4Rmxj?= =?utf-8?B?eEhiWkJDb3pOV3hVclVrbW5sWmJ3SDZrbkdLRm8vbzFVWTRYV1g4US9ZTlJ3?= =?utf-8?B?VFFvYjdXS0lWd3RLZU9YbjBzc3ZlQ09nckhGc1I3K1lqMDFxc0JkOTBaZW96?= =?utf-8?B?TnByckVvbVJLTG1NNFVpbGYvTjJlaTFLNXFpRVpZTVZWWHJSWDdjclA4WU16?= =?utf-8?B?Y2h6Y2NmMzJldmFpYUlzamhtbFU4cjdpdEVJc3krY1k0Z0ZXWVhGTWs4aWJI?= =?utf-8?B?WkgrTHBaczVTZmNmbXVhbDAyWjEyNUt0OXd4UzhzN0xNUDM5RUpRV3Fjczc1?= =?utf-8?B?ME9ROXZXZ1ZsYnFjbHZsZVoxV3g3NVFaQlRPekV1Z1phL3lCWDJ5WGJSUllV?= =?utf-8?B?ZWFoM3NvWHdHZWZGNlVqdGw1UUVDVlU0OS9QMHZIOUczYk1Gam94a2tSYTEy?= =?utf-8?B?SXhZcWFjd09aZ21BWFdXKzVvV0U3dlVoM0M4RWhCVWFHRmN0b2pOZFRxeFQ0?= =?utf-8?B?VkxOaXZnM0NYS3doakhLKytxSU5zZXlCd3lOTzRoMmRqaUxsK3QvWVFJcmw0?= =?utf-8?B?dlZRY21lVStZRWloY0w5Z2E0azlMKzhHelNwUEZNbGd2d0VmTGc3NjgwQUlS?= =?utf-8?B?cXI0elhqTlJPS1QrbjZab2VTd25zN1BrMHpIeXNXUlMraXBka0xxVldLL1k4?= =?utf-8?B?QU0vdWhwUlNsWlRTTFFoZ0wrcFp0RnlWUUZacUhiTUhyNEJ6UzY5TG13U252?= =?utf-8?B?K3I5UWlmV0xmTkN2d2ExRFF4RTJudUFLUmxsWndabzR6QlAweExjdlJsRnpz?= =?utf-8?B?VDgxY3ZGN3E4ay9hc1Y5eUdrOXpJR0ZCZi9POUhtMG40d1U4S1VGT3R4eHIw?= =?utf-8?B?OXViVmFtaHNsZVVIdERMVEpIWDNsTmJwSGYxR2NyU21tNWRPeVVWSlR5WjBN?= =?utf-8?B?Y1BTMUU2NHY5djFYc2ZIaUtmOHJhencxczlENVQ4dm1HT0Nub2plQnZtVW1z?= =?utf-8?B?RXkvbHV2dXhXeWdMcHBPdXNJMlZGZFVDbXo4ZUxSaXRRRTg0Zyt1Z3V4M2k1?= =?utf-8?B?YVNwb1FqKytZVXRPbHFBa1ByT254WVkrZC9Wd1lnZ2QwUU5wOUhXNVNDRnRh?= =?utf-8?B?ZStjNHlWU3BsNHNkWjM2S2ZXalBzWFVVSll1YmRWdXpLTGVYM0NTQmJFd1Fq?= =?utf-8?B?cERuR2R0TEVGRHJxQkhvbWlNV3R5THltbjhkOXg1U215eVErSmpTVWFHRGpv?= =?utf-8?B?aWc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18288df2-0825-4bc3-7125-08dc0b684f9a X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2024 07:56:22.0828 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dL0Ft3OH8alx8ObOS66MJs6IMpsgm//qKh/G/mjfXOsfdjiX4oum+Y1mvAT2/y5K0cNrcXPKHiTzrvfbnbe7yQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5332 X-TUID: tCCFdIl0DeBF From: Jan Kiszka So far, the 'find' command in the sub-shell is already executed before the sbuild call, rather than after it. Fix this by escaping the $ as well as the quotes. Reported-by: Uladzimir Bely Fixes: b382dbf434d9 ("dpkg: Account for empty local apt cache after package build") Signed-off-by: Jan Kiszka --- meta/classes/dpkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 0cdb5792..d1666f78 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -122,7 +122,7 @@ dpkg_runbuild() { --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ --chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ - --finished-build-commands="[ -z "$(find ${deb_dir} -maxdepth 1 -name '*.deb' -print -quit)" ] || cp ${CP_FLAGS} ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ + --finished-build-commands="[ -z \"\$(find ${deb_dir} -maxdepth 1 -name '*.deb' -print -quit)\" ] || cp ${CP_FLAGS} ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} -- 2.35.3