From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 09 Sep 2022 22:17:29 +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 1oWkRL-00CJFK-Mg for lore@lore.pengutronix.de; Fri, 09 Sep 2022 22:17:29 +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 1oWkRM-0004lC-SV; Fri, 09 Sep 2022 22:17:28 +0200 Received: from mail-eopbgr130058.outbound.protection.outlook.com ([40.107.13.58] helo=EUR01-HE1-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 1oWkQj-0004jt-GG for ptxdist@pengutronix.de; Fri, 09 Sep 2022 22:16:50 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GXh3smck2WnZzlH1gs0BhrrzjoooTSvB/eCbPJyxzNruiRmlcor59/ggHGX87fivPsJwRkYPaQIDlaDIdsSiccJ+iuoy/G8hEs4k7vseUSqqanAMLais4Jvsfo+w8ZcM3/uRjUTsk2U8VTeJosC+x6/vQdbSh4MzcJe0kViNIwpC4Q8a1hbsoQUiRbJKpHO2EQGR0u2IbM+OEKFsqWWP+LG/kyacgmytlFrGpy5IKBtAr85DAzlXluyJZF+ZbmsKSnPmK8RO/IQp+7JR6Mfgl/SQGCl5XSIJrtw2ej9+R7aoX5JYeOTaI033bTnXW/EP4+WUB3OOkaPsfo/x2lP1cw== 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=TpRauWH3bpATrTyULfvJuJrNuUuMy220x29V6LViWu0=; b=EK1U6ae/8kpXVLO7nHqS3xTwPAgtGOSF201SNSef1sNcvDXS4hWjrELgmR0GUEZcmSaLYVKk+rR8FVdZgEksBIiBPPnuTjKw++qQPmSwqqLnoHzitvZpyrjWKhPX1qallEeEfM/3XUBTaPgdY9uK0K14os+50CXHC48uhHah8Unn6Cmg72ZQU+GdQZF6r1/RkfTxJjR8BX3FhuEhCZyHxDIil6J3FcGWGgmJdCE9zPzllTezocw1rGGhUOwTmeaL4l+yqLvVR1ExHHxh4hjpb9cbRPwDvRyiEXdCGE5bAOruzdkK9GIr+ejLjKiuMsBkJSEXZaYHPMBrqTLIrdArBg== 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=TpRauWH3bpATrTyULfvJuJrNuUuMy220x29V6LViWu0=; b=IdrYsai3gFLVdhL78ghlURbEDPa6szKneTNnhG3fe/os86mJV5pHVSxflAJB86mZ2arMlY6L2O8NDyyuffMhNl0aIBt7D6p6q1ls7vA4+KlrUUnw02WSdJa0C8wYIakV5eDe59oQsR1ayiJiJexN5zU0M1sis7ImP2ysaGJV/vk= 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 PAXP251MB0517.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:28e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.20; Fri, 9 Sep 2022 20:16:45 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::a130:b2a7:9ffa:f1b6]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::a130:b2a7:9ffa:f1b6%7]) with mapi id 15.20.5588.010; Fri, 9 Sep 2022 20:16:45 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Fri, 9 Sep 2022 22:16:28 +0200 Message-Id: <20220909201628.853195-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0038.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::16) 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: 8cfddf98-9958-443b-db07-08da92a037d3 X-MS-TrafficTypeDiagnostic: PAXP251MB0517:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fqzbyLLxOgB4DFQdOpscUVYDPLwu/wRQ4Jvk+A1yhqojn2Wnb6UDLp8KlbFnMFLsJQlPqQj1mU567pSvUyN6QvfSlZxrDI2UszKunFIBAsAqxkTkc5u2fhmWJpW5phmMYjl8ejz2lBGJziIwJoe7z8VEngbZMF5HqRlgQyb9yHU509Rbjk1GrRgGvaLd4Log7zETOBbNpZcgI7+G5W+UlCpR5GkJn1mqZkyv/bPmn1Mzg/HBkjfrh5XX4LAKTDVaLeZj6LtIUoUfYDanGPawagtBzCw8cdD3CAfC0Xh6adqGslSCOtPotEFYVKN2XlyDC21MT+KHzMreEKGr8lwIEAhLFNTUfiZ3qQMBP7YBuTfq4yHmB6NMUw9e9BJMIVKMYVH3SCcowh0/8Q52oOcJ+7XLcW22Q7exa5SWz48tYZkyHTftiKSY6HARQmr+GlmO/aLYiK9j/oCBt96bkmIRlEK/rPUEujdfn4Wg4nGOacePtL/Q5Bai2eUhVaWwKUczAka/mpi6mdakzR8VrcXHmsIICv+lInegOmX60YBXn1MhyoUclGdX+BzbCjf9b9j8qqLrjNWgk7++tDjQEFzJeHW6hI/RJq8FSZ23o8OKjt2y84uSORuhRIqlvjnq3pR9qfR11TMpNBkSocPhB+vh6LzsYMo1Irxv0Q7Rleo+eQkc+Ev+qiLjIxl+QOJfCeIM9DpUFiPH4R4ySXizqQkScmBtEOLDrEBpbyJQ9fr6GxnfdWnsa0bKd/Pdq5m/5gFUQR1UNLLa6HhACRA7JFWq0iv12txcYr+2qs8ViwqNgUQ= 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)(376002)(366004)(136003)(346002)(396003)(39830400003)(41300700001)(478600001)(966005)(26005)(6486002)(6512007)(2616005)(1076003)(6666004)(6506007)(186003)(52116002)(36756003)(2906002)(44832011)(8676002)(66946007)(6916009)(316002)(8936002)(83380400001)(66556008)(66476007)(5660300002)(38100700002)(38350700002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hXfQIbGsd+4/TUt5Tri4tSU/7thw0FEr7LodveB9mssrTVASgtLjPmOyIZAX?= =?us-ascii?Q?IdbBGASDK+VGfUPDB0P1TZCNFHKEdZlfvmj3bU7/iYExvQMKoVBot/LJcSwy?= =?us-ascii?Q?FhggSjf02vBcqn/3Mgo9Lja+n2Dqwq2tLD2vFnknFPyHjxxEHtOGXP38iziK?= =?us-ascii?Q?2izLlbI6f2CE+MA7CB2vkq1IY94TNIcOVHnBCo3Ya0YE35zi8qfcAq5HbPZ9?= =?us-ascii?Q?QWkeVG4ww6GvI0elZxGFB1BHuvsyatcR1+1B+jV0ESchAEfKVMarVr07OPVB?= =?us-ascii?Q?w9m9cCjr5/vDjZ7e+gXCuVeXR3wVLW5Qfs7OlaLijsxJe6AFMRH6QTRerob4?= =?us-ascii?Q?ciFRDAdfv9TA9GXIaafZHoM1uJR96Kdxs1N1NRPY8oTAPs/sAlUjh5VLYN5c?= =?us-ascii?Q?Ct2nLm/hCejifjjpXdq9tjbl0DMaoB5v7nr6OabJQVMtunI53W/LUiDkY8+R?= =?us-ascii?Q?S3Pnnx+Km+2c3LdUpFUe5bLq/KuU+bj8ZJbf3o+aht2A80sTjQUxIdRE6rja?= =?us-ascii?Q?SLaFFg0iD7ZmxQ58DWCuzZNy0MyycIjLC2NQe+ftPqbTR3MWeoKXXT+89DwY?= =?us-ascii?Q?QZJ2fwIx31WHS8l+CM+nMqvaeh+gbuvCfsV9hJPGw5kXGdqs8cLIGiLmOxEy?= =?us-ascii?Q?e5di3O9dzNW7HJdLshTCttStHJJ9JzJHNWNM+AtlafoOLMKxxJ/4cW5piXy9?= =?us-ascii?Q?DEESudN8VxrrmxvE/0g7MRD5u81thy2SkS5OPKXKMniowO0TOhdTEKF0fF4K?= =?us-ascii?Q?pi+9JLHhsBEBe2z/zr2t5939N5PNik/pR/aIZRxEujYuD0tMcXBGlEWOQvfe?= =?us-ascii?Q?TPPonT4+KBvD/9rDqOjXsza3FSlUr2zcF0mN3vcDxSe9QQBlwYIXmvpBfHxP?= =?us-ascii?Q?B8eCUPBLWJIZi+E/fC51t+iM5HVVDUtBesVYmCOoGvknGAol1xKXbhR/0nqw?= =?us-ascii?Q?LDNWWnMbitXjgFgdw4Dnct+nlRqxX6v8D5xaHjOEEHCpAYegHIWW8uf0fJS0?= =?us-ascii?Q?CXmZDkcTg/b62uS4imuwLRNQrknbYX1QVorZDG7aROf8+KAkBz078gs5WQyi?= =?us-ascii?Q?UOguUKpW3/ACk7cX8Sb/VGDogY7fCLYn1rO3WXcZsW5SROQQ+uG66eF984m9?= =?us-ascii?Q?oQjQA0FSSsbhCgAbaumVDY2T/+scBobRZDYhouAOKmu0tWUXDq1I6CFIJxvx?= =?us-ascii?Q?5ypNiut97aq5s8HF4JJ1Q6kyFTEwl77lb3IuREv5p2tMBG5sVFA/ImVeHNa0?= =?us-ascii?Q?saO5dLW6L3qcQyfuHIEjIftNV7+YBoGDC1MiMGq/d/22Rma8SnfD2kfS3GWZ?= =?us-ascii?Q?x/ntXRNN4r+rMrDOl863GWLj55z3llExojpec4eRqwBq0XPeQA4Q+WH4f6sd?= =?us-ascii?Q?C8QVorRrboij1x29U6hrXM/VN+O2LHKkxVXprNDGveQfveg9d5j+x6YesW5Y?= =?us-ascii?Q?xmyCGo4JHu3pCSUiBj2czOFWp466xTFj+Zn0D3vrCbMeCBewd3IzD+0UQ8eo?= =?us-ascii?Q?qr2JigUrW2qqkelX2l+DJEtJ4t05hk1QVk3+qZZifVoG8RFDn0dIeQW1Mzc3?= =?us-ascii?Q?Cvl+cWExjoiykI0a55mrhj8wSxQKsBo31vYaUv8aMpHRttpnJHvwxBW2byON?= =?us-ascii?Q?bg=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cfddf98-9958-443b-db07-08da92a037d3 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 20:16:45.6806 (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: G7FXawjx6mbAttWKRno5/uHZQhNAIR17SCP0+HKC3TkO9I7AfLLEC+Va0iQ2NNapSsaZxr76OvGQNYHj4D5Q8UYUuLDcxQgbpn/TTpCfwdY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP251MB0517 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 v2] libcurl: Version bump. 7.84.0 -> 7.85.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 https://curl.se/changes.html#7_85_0 Bunch of bugfixes as usual. Fixes CVE-2022-35252 * Remove old patchset, included in the new release 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, 2 insertions(+), 54 deletions(-) delete mode 100644 patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch delete mode 100644 patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch delete 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 deleted file mode 100644 index 099e49c0c..000000000 --- a/patches/curl-7.84.0/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 7443ba41e..000000000 --- a/patches/curl-7.84.0/0002-easy_lock.h-use-__asm__-instead-of-asm-to-fix-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index a8ea60cf2..000000000 --- a/patches/curl-7.84.0/series +++ /dev/null @@ -1,5 +0,0 @@ -# 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 e40063f14..0d0ac9ea3 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION := 7.84.0 -LIBCURL_MD5 := 6ce66afa416bb11b8f39cc9e059afd5b +LIBCURL_VERSION := 7.85.0 +LIBCURL_MD5 := 131f76c84016c45806b902330a74164f LIBCURL := curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) -- 2.34.1