From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 28 Jun 2022 10:59:42 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o674M-0004Vp-JC for lore@lore.pengutronix.de; Tue, 28 Jun 2022 10:59:42 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o674P-0004zv-8P; Tue, 28 Jun 2022 10:59:41 +0200 Received: from mail-eopbgr50089.outbound.protection.outlook.com ([40.107.5.89] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o673s-0004yJ-Ve for ptxdist@pengutronix.de; Tue, 28 Jun 2022 10:59:09 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kxGjz5MKxgU2gO/Y/zgv0aSCtcE/FvEiJPVB+x0lTRN2/IhUsWJqELFjKwtXN9NEfXjj5vRFOzZB+ZqUuWjMA/B1lQPNuAcI3wzzebLe+TvjZVydbI/9Nv40Y4FTEzPUx8nBS2sM9PpWNZbXEU+xpUlyxQwUVgyNTA9XsbNudflSxni2vA0UZVV/gJd/A2hVwecIXi1yGqmkLHYimsS8b6Xj7w9EVIfQ+OGbGb5Gp4yEABbVum4aWkVuPXeF95dczDNas2dM+HuDsSsgGnoewqNrByRdiTBJpdirQ/0bK9ejw56nzx6Peip1Mr63tb+CB7Nw6YI/9Cg7vqk/jT8Spw== 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=lLbKo4N2nsPw5r1X6+Y9Uywqr4VMjBDjH4f3LaXonhU=; b=ZXWJcyQL+EQ8YP2nivXMxhhmfkjEnK1JOiKaua3Wek34MBEsYuDcp/k0g//ZKWvgcT/v9zi46rKuqrj8IFdGElSGrbmgQ0xXN2Fo8IlhATBqiTJDEr/xtE2dkA95oFpKg9pFnaP6TIMfSjnw1HWN5f2gm8IiRu9OvVqgKVxGOujQU3sPegF+FHnKR6Yzk8FLMsA0rm4jenKh2g3PNY3pabQ7tl0oMhK3Ajqnuac50sAVUzsXalNSf8F9C79VuQ0rlvPv4ALKBHLoB7LtZs7qaUZBZPWqmixq1OCZY+Zen9hcqqsHTYJ3zKuSW6Df/9xtFlP3og/KTRXb6qha9wFCZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lLbKo4N2nsPw5r1X6+Y9Uywqr4VMjBDjH4f3LaXonhU=; b=A+pHxgrmp51rQsHKA/zlh1pjbzEEDZVDDvqsMfp5vJ7mCJ/cJSgI4S+hIgO7CHgZWn2gTbeA/49UrIzlZkhQek+VgJOml6YXfhVv09gzZxkzydzRUP72uVxFQhCwsiff5qDJ4AmzSyAbmtkuw4Wtk+k+wX16wMfcgdATxFG8NHU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS8P251MB0981.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:572::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Tue, 28 Jun 2022 08:59:06 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af%8]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 08:59:06 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Tue, 28 Jun 2022 10:58:59 +0200 Message-Id: <20220628085859.2748013-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0109.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::12) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 326e3bf0-5a05-4629-01f9-08da58e47470 X-MS-TrafficTypeDiagnostic: AS8P251MB0981:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eFkGF3yzg4BIeTZ1G/5fc7XV3t6DBewkwxIFPxVGAzMYn4GgUEcfiywN4jLQ5Yg6x0kA9L7VKB7t33lMQhKgAd9U0Cse5iIQOMOAMajlBmiRGuFhDDpBdPQyDcSdyEt3z1uBPXmj1t/2QydAlz73Y/raOktuHBf6PyQ7XvpPsjvOoSKhOwCb1MZdUI4kk+1ln6wCmTcFWoazDxdu8/lZ3o6Wrc1U+WGVDujMELhNunRUpQMDaHBzO9+XGOh4aSyNHJ3VkA787f1+MCAlwdMY8wXryKCYnGbWDG7oyamKfaMs38LdiI12t5ztJP26orzYBP4c1i2F37uTZWavSeuhKX/EzOK77Zz+RACgpPV6l1dF66YfruP5htuUg1ROx63nqe1EaPzw3jI0LAi1tvsdwafQP1DYo0h0/nt8+u0nvHVO0H+0+XqkgsYJDudrQZpZlOs/wsXFhnXz+e1HUTk9Ht4Tn95YJq7ZJD99EiZNV5/OuynBfbTB+xcnBlRiM+8s7142oQv0vVSPSkG/W9fnMhvmrteqVdtlKFe/BjivhDIA8mlZTSEsjB8FEiYNAd3rqy7uwCbqsiJias1gf3dDgaqijiwVizDh0jipVc9J3SeP8vrjD9XWODib9iL+8dreehjoCQm0nqobVBBnNJlstE8x5/T6QeTfLB2i/qpfETneW6cp4ygFtwc3Gr70y1UhihJp9JhGoANFceC/ydjYhso0VKmp10zsP8b3jpiQUUJIuAO5SVcIVlPxiBcardpFU2xNUIowqJQoQLOTQlOJuV7Y4qZxrvUXU0JlyfhfswCjFaDi/cp275oLZWVC+Xez X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(366004)(39830400003)(396003)(376002)(346002)(136003)(86362001)(36756003)(38350700002)(316002)(52116002)(2906002)(6506007)(6512007)(1076003)(6666004)(6916009)(26005)(66946007)(83380400001)(5660300002)(966005)(8676002)(66556008)(6486002)(38100700002)(66476007)(41300700001)(186003)(8936002)(2616005)(478600001)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eWKwdSDWesp31z4EzSSMActUt4OrxQV0mmIN3bQjR9QW+ibCLfERxSwl/FW4?= =?us-ascii?Q?//iOqg4y0zCOdSzTd2KrOK1EB9QwNLnEewSCPdHavVJmM28q1AXfGeIY4pqT?= =?us-ascii?Q?c2uMQb82qWb2RjeXyfF8HHKo1NOSHwzhO0bzgHbvPPqnIdl5T8M7ckMEDBj1?= =?us-ascii?Q?jFj7YQkZyvN8QaS7jq44zWSeunW/uU6a2zuZSlwKUAoKdJg1Czga3UgXx4UL?= =?us-ascii?Q?eiXyJxxO3yehsc/t38346c+FjQGmYaZy9JQpPAOcZV0bmeFR1/PlploBFnmg?= =?us-ascii?Q?c8pJWxfG9+5DUMBMN2Qz7ACcEHUG4wU+j/HqWBqEGnQV2YWQ6M3+IiSXLBMr?= =?us-ascii?Q?124EodpFUTX8YQ7KT+MxaAaq6jKCuvpnbMs/ka0rzNP9ag3mZRVmLH+N9rso?= =?us-ascii?Q?oetiQqp9jfdV4vRQFpO+wgeIyrztH0mfOmFeepiolYZVVXtiT5eP9EUQOTXT?= =?us-ascii?Q?Bp63gPs9J4kT+qDyXyrEMCv3WsDsngi7ri/6fFJXwStp+VY+7iaxzCAw8S0i?= =?us-ascii?Q?8R2PchWMBeBCsDF0CljPyznSHKfr/wrzt3hFeGULuIqX8oa3PJny7Ho2NOss?= =?us-ascii?Q?3f7+HkTl0c0/T3Kxc8aaMFdact7IrktyIHc7muV4feKv7Q4t2styjgXkkHZS?= =?us-ascii?Q?f4rS3m1EY7fm2XkY0HAswqvSBJd6ppKERaoTTR/yJHbB8q7ypCVi8zc0Bbpg?= =?us-ascii?Q?apIFCA268bzw3Id5rb9RQlgg2oXQ+vPm2E0fP6XaCgmGE93n1DEAt/FX5ecP?= =?us-ascii?Q?b5tC2ZshgyxP8kHoTSFt354fiY3NFrOdo/rEyR1GVTEShgdFDktFXVRZULSV?= =?us-ascii?Q?VQx9jHFExE76VZxJZ6sBaNCd9H9NQdo8KJZl0z+54PTNGvUb85u6KIppAND4?= =?us-ascii?Q?38QtBGWuL4vkYe6cJrFb5/qKuh5ago4fuvypwy3olpcw+o2vevjzJ6ckELqH?= =?us-ascii?Q?aEjUbojQK1N5Ih33E+6LhZYiI9AbhdjRmxAxvPCCL/ZDpCN+jUdX95uWW1Z0?= =?us-ascii?Q?fpBPbW6yrulrp1yfRJFi+D8wvIHOP1sCQ+rTmCZEG5feIHXGYVdpClp93Y7H?= =?us-ascii?Q?PX3rPXK44qO4pzXsxMBh6WYj8uzClUCIod+XZcn/f2C2nNpgCYUDg7Oi6qq9?= =?us-ascii?Q?EbDruTDRnuOWu9Hbgdj/7NXoQhuzoQrIlvaL5ukq23v8x1N9cbT2RM95pshH?= =?us-ascii?Q?qnGwu4a1UFGvDojjBUEpPZEAJ/Eb2EqnTT2d5yRPDrU3efOwwhfsQjdnl02C?= =?us-ascii?Q?nGoEoXZsrv2/Qw3Q/+1olv3R25B6Hem4NOVxSPAxf0qxlvLwBL0skvNRKfoI?= =?us-ascii?Q?dM5PzAq7jFxV1E2egU60HzJNvdds62STBcP+PMVoNMqxy+wkQFzXI0A3pog/?= =?us-ascii?Q?ogxH28N1x8McuivMOch2kArmV/4u+czuIOKcfht7mZxVHVSpZPWBVxQsf0ru?= =?us-ascii?Q?2WaGTl0XV84Nao/BO81sVvlLKJLRTim6Aji4edG60WhwQS1RsByk4DiBbq0M?= =?us-ascii?Q?wUta86w3jXhNinYXMi1zZQ91eTBzdmLMGanlKlANOeoPSHPogxhdwSjgLoJF?= =?us-ascii?Q?GMe+uy2d5Hp6ecBwCWMrT3OSPPob6xS87XWUAI6NnN73jvdhRUgPZMtwbu8k?= =?us-ascii?Q?Gg=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 326e3bf0-5a05-4629-01f9-08da58e47470 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 08:59:05.9381 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dssB3mkkxSfMtZ0fSjiRz9E5M1FIk/qiTy2becRXi7soHxHq/m9rtDcWVCic4+SBT7GEwSQhXlf7WzGbgb7Qh+RXzJa8LU9JQm6eWyvJqS4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0981 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] libcurl: Version bump. 7.83.1 -> 7.84.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false The usual slew of fixes and development. https://curl.se/changes.html#7_84_0 Plugs CVEs: CVE-2022-32208: FTP-KRB bad message verification CVE-2022-32207: Unpreserved file permissions CVE-2022-32206: HTTP compression denial of service CVE-2022-32205: Set-Cookie denial of service * Add patches to fix two build errors. Patches from upstream curl repo. Signed-off-by: Christian Melki --- ...ude-sched.h-if-available-to-fix-buil.patch | 25 +++++++++++++++++++ ...-__asm__-instead-of-asm-to-fix-build.patch | 22 ++++++++++++++++ patches/curl-7.84.0/series | 5 ++++ rules/libcurl.make | 4 +-- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch create mode 100644 patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch create mode 100644 patches/curl-7.84.0/series diff --git a/patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch b/patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch new file mode 100644 index 000000000..099e49c0c --- /dev/null +++ b/patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch @@ -0,0 +1,25 @@ +From: Daniel Stenberg +Date: Mon, 27 Jun 2022 08:46:21 +0200 +Subject: [PATCH] easy_lock.h: include sched.h if available to fix build + +Patched-by: Harry Sintonen + +Closes #9054 +--- + lib/easy_lock.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 819f50ce815b..1f54289ceb2d 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -36,6 +36,9 @@ + + #elif defined (HAVE_ATOMIC) + #include ++#if defined(HAVE_SCHED_YIELD) ++#include ++#endif + + #define curl_simple_lock atomic_bool + #define CURL_SIMPLE_LOCK_INIT false diff --git a/patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch b/patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch new file mode 100644 index 000000000..7443ba41e --- /dev/null +++ b/patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch @@ -0,0 +1,22 @@ +From: vvb2060 +Date: Tue, 28 Jun 2022 03:48:43 +0800 +Subject: [PATCH] easy_lock.h: use __asm__ instead of asm to fix build + +Closes #9056 +--- + lib/easy_lock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 1f54289ceb2d..07c85c5ffdd1 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -54,7 +54,7 @@ static inline void curl_simple_lock_lock(curl_simple_lock *lock) + #if defined(__i386__) || defined(__x86_64__) + __builtin_ia32_pause(); + #elif defined(__aarch64__) +- asm volatile("yield" ::: "memory"); ++ __asm__ volatile("yield" ::: "memory"); + #elif defined(HAVE_SCHED_YIELD) + sched_yield(); + #endif diff --git a/patches/curl-7.84.0/series b/patches/curl-7.84.0/series new file mode 100644 index 000000000..a8ea60cf2 --- /dev/null +++ b/patches/curl-7.84.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch +0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch +# 3ace341f1349f3d078579bbef0b35324 - git-ptx-patches magic diff --git a/rules/libcurl.make b/rules/libcurl.make index 8faa948bf..e40063f14 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION := 7.83.1 -LIBCURL_MD5 := 08c6d9c25d9cf8d17be28363753e42ca +LIBCURL_VERSION := 7.84.0 +LIBCURL_MD5 := 6ce66afa416bb11b8f39cc9e059afd5b LIBCURL := curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) -- 2.34.1