From patchwork Fri Aug 12 07:51:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Hadke X-Patchwork-Id: 11311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCB1BC19F2D for ; Fri, 12 Aug 2022 07:52:44 +0000 (UTC) Received: from IND01-MAX-obe.outbound.protection.outlook.com (IND01-MAX-obe.outbound.protection.outlook.com [40.107.222.60]) by mx.groups.io with SMTP id smtpd.web11.8206.1660290754330040845 for ; Fri, 12 Aug 2022 00:52:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kpit.com header.s=selector1 header.b=IGK5PK+B; spf=pass (domain: kpit.com, ip: 40.107.222.60, mailfrom: akash.hadke@kpit.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c8NquqcYpkBa8dwf1y+p0V2+PMhSREJTXy9wiZs6k97jI1gdoGQarM/3ZUcQ1U31spYqKgv13oJAyDZosuNaR7WM0QJtDeOozgknarXDJyYJSUmjpBNbZKIjGnXqhPsRTa9kk+gMfSm1ykz9HvPLhTQhmV3tMpKwWQzK0TlgufgbpMcGK/0s5ydg2pV0XQTB41VY/VINOg7HVBYCPfm4DuKKKXfISQgjhRPfbljAM08lk+uurubelh8GUGW5QXX+Ldz4szp1+QH7P6jwWbwyaZDXdE4LWPKh4RV8HQWXxUdnXwpUbLJ1OUvN2LVRy5yWdkbUnA4nAalCpUxhO4Mixg== 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=fPb5Uen9hh/CbFCSb/IFdsl43S4sDgdPblv7nDpj5mM=; b=LGcFjgfKrECZlMSjTAP6CoQAqAxaZG0oTosyZuvvjrrXvP/KxZSU9oiQker7oUqQhgPJPq+HI+IXwQ1wrmW0OV2y6pFHB6QTbL0OFoRSB1hqNF3NygSApiZS/i6TS3c9IrY+BzzmVxXJmQTbg+O2VIiKS7a8Zq51CQgjqAXjUGmjPp2M6ecXux2GzCxziEbRuqCHofAuhnOutILbwj6fOrRueXWCbfJ8dsfq2p9asL6GInkZb5JWJ6y3vETnYV0koykyfOxTxHV/pIm2Cib48YemWMusyD8B08dlxxsNfPHS/ZZOCHFuASW7w3cL5MRecqjhw4bUeIQswpFCngrnfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kpit.com; dmarc=pass action=none header.from=kpit.com; dkim=pass header.d=kpit.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpit.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fPb5Uen9hh/CbFCSb/IFdsl43S4sDgdPblv7nDpj5mM=; b=IGK5PK+BiX1QZXgHLzikQts0wurSO6Blohi7FTerPugJlMG+KbYHwlfD6Pys4F5UUPycxrjKYDUkvkiC7NTvjQZ79CzofvCiJKIP6Tg0+A143GRvdHjp1mV6ijjqmtTKCIAPhgrju+sDzRa3Hmo0x6GkRoW7AMlSO12LsgZBaVg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kpit.com; Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) by PNZPR01MB8490.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:5f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 12 Aug 2022 07:52:25 +0000 Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50]) by PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50%5]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 07:52:25 +0000 From: Akash Hadke To: openembedded-devel@lists.openembedded.org Cc: Ranjitsinh Rathod Subject: [oe][meta-oe][dunfell][PATCH 1/5] Revert "c-ares: Add fix for CVE-2021-3672" Date: Fri, 12 Aug 2022 09:51:32 +0200 Message-Id: <20220812075136.31326-1-akash.hadke@kpit.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f917e37b-0e72-4b3f-8f89-08da7c37987e X-MS-TrafficTypeDiagnostic: PNZPR01MB8490:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yFurxNQYkdq9cK/q/JVcTEta5Ljcf31CTwWqQ0ckH3IBQhShVv95DCUTneEToB8Q+PY/NPk9Bv57QNQXC5i8K/3zhl8SF8D5htoDiPlduaQhTpDIQ/pCXsw3KDVA4ezD6NHp0SWkAQTJ7ialH+7DMPuGMZg8OZS0fg1OZXFXPSOXUX60BaEUXKZBXk131ElrKvcROHJ8QNdQRMHem2EsR+Jp9e97LMeVK1GNH+8FFxtb9kH+xEWr8B7CL24pwKnLhhbKKVPx9Po0bNXTXO6OLYxUGH4+Oflx9NOjOH9hIKBRsF72xoKEYXC95Q3VOQezembJM6PiAMhsKjgp8NcfkmJbtn5gQdunyOlzhv9C/dwDq2Z5QwbhgXHXCZYccJtx3gUv3OQ7vAmJ1hAHIA7rZH1p6qI0vUYBmNG6lAtmq1Ia3piLgGZ4uI/4tam6TLVSEnBf5Jzj0m5IJJpeCaLqWNUijLFsL/QpzG3X+Gu0V4QAQXaMspubvondsogHCo10vnE1QwnTCNB2wrAMvWLG2Nfl3C1iZCAMjAZBtJmsfxZ6HkUO5JCY5ImfJq90+CyCOwX8ltZGPTcJnvjzUEB02w0dBmgFhOGnpx43Ckdm+n4ZZG9yfyZwb7zKG7fpn6H+9GnsV5y1pww8/gIzZ+rOIafZQGDTgrwIB3BC4fqHbJj1sZLLCleDcx+rSacV4f4NagF3aI6DGPfa/0myLRknwvSUi+bwKLu9AHc1RKnYD5/GjyWMRSjywKq5NqjKounRrJUk0QzeVOBIcXk675ixuXg8Tzix8D5ix4CCNGSzDnOdgp/5K05xcMNwCYhzGpnc2dxDBK7s6suFSjwbUpwZhw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(376002)(346002)(396003)(366004)(36756003)(5660300002)(2906002)(44832011)(478600001)(8936002)(316002)(66946007)(966005)(6916009)(2616005)(38100700002)(38350700002)(6506007)(26005)(66476007)(6512007)(6486002)(86362001)(41300700001)(52116002)(6666004)(186003)(8676002)(4326008)(66556008)(107886003)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XWEwHaOeLoK/LEYFHr5ktwAHQtHRkm9ZFhHRuDWpKk1Ie/wTr421IzMByZkohoAjJhx82zoq6w86XGsQZ3o9g+qftzcPHc2HQhvJR3dadCdenuHGFy9a+MCA0tucK4PLYeqd/yw86nV5yPhy3pP+CKjR9Z4MUx+B2HTxv1kab/42H1Vjt9Yp2XezEpKidwtAhiI0q9EdIkTyguZTj6JJXqE6n95xNJVe/vLnolUqCPqcx3GUWtFui1BYNEuKSjawug/+SktC79pgI6PB1gpBR6eHBSGDwsxibQEXIrX/mD2VHt9xPkD2a92dVFBMhJRN4dSO5wNO7yPDT3GDpO+f+7Bq0WB4VHJzPDrW9HbTymvM9DFNGrgX5f9wgdjaDPN+aHUqPg1BehwmhsYc083N51roEkzgf8oUr7sWmtMh1Mtt2eovi1JL/JCl1sKE++fFq2T3Jo/jTnkC38SPb8EOW924n6XOiH2XtomRjlJfyunDnbS+vsTA+V0EhydtsFnQPv+KR+YDZ1odoBx6IFB17WPlul96xTQwUOibhuH3qDyzsGQeBCyH0b/RtYzW7SuuStitTzi2vsROalznExuEwX5XvqAZeN40Soydzy0rUrkAmNf/UJOrUXm6/1EfB1GPrHCGg9tCfQ/rlBMCXvdpo+LASY2qL8neu3hUwaG9Of25BB+mWYQVrHL1aP1ZR5aal8J+oyeHF9B8r4+W+xxxZh8aQ6cJ68Uaubi2iwZbzbZnRvaUei5C8NU8TjhTFrlrSyjP71XQecVWTPdxRujd0VT/GuiXX1I2lEn8F79jjAc3pSaxJRl/5y9OdjSHvI1pf3Cs0+Jku10L0ZoaBpRh4oVx8KvXLSvIwniSyGrhwQIh4RdzbjZaokihqqqMASgUvOROSxFJXEHiYqZiP4kFgzKZ4bD/wCc6/po69Nszy1j9KuO5/Lj496WkWDdM8q1cSKvx2cGQcjKzrNJfPRLcCyRHitaflqKFensMrvT0iEB74OOZVlDEharZDGgRr85r1nMl9vWpVXSLHZBStk1yao9seRzWTizmVrmB3HUz2OmGLa7eaZyTUAX1d/gVCFRYy+ihN5PjcEaxsTmi6C2XCSQOMyxxz+XBAZEYjvR1TyBw3tG6abNkpk7d3z5PwbCLuPHkHAMlpzMEJpTvfsn09w6C3FvEg4q5bBSBDxJp+E3k/z6ulb62iPwJz6IhN5V4nPdfLItJkEV7LJex3LlsswHFE1D2naRSiB8NMZK2ieVUcXXsKiUX6Csd20wBT86Lox+NIHPsZqSme212U5kGEC/LTngRg9mbbAE3F50rkG+nBX3fftawJH0XIST9NlQgAXICI9xYnuNTOuOYDt6OYCujWztpTh+Cd3muO3j9ALq4kUwZc1LMyK2wRQ8KTypEnAe3mbxuJGLpO7i48fLZhDOuOsvDyHDRAVdbQrG3HoFnPw5JeHtB1lwhi4LRZijdNu1rwRYFi3bHtMwfyR8xO1UGL2SbF5as9u3nISPCGN65onc7sabftXn4qHivyHGbd+anUI4ufJKYWrzYelTws3QbOCT8wZ/Wb/3o6IY6q5MTxjptqJ2D9den7KHdGSOO X-OriginatorOrg: kpit.com X-MS-Exchange-CrossTenant-Network-Message-Id: f917e37b-0e72-4b3f-8f89-08da7c37987e X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:52:25.3259 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3539451e-b46e-4a26-a242-ff61502855c7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ebkRPCEiyxFq/62eeX1GhmRG/16ZogSLlH+PVn8DC/dkEhqM3FOJzaFfH+F/0gXzivvL8h4nlIyIoSKKax5COg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PNZPR01MB8490 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 07:52:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98202 From: Ranjitsinh Rathod This reverts commit b06724bc274f751004ade2ceeddfb8ec40d93f16. Revert this CVE fix as we upgrade c-ares to 1.18.1 Signed-off-by: Ranjitsinh Rathod Signed-off-by: Akash Hadke --- ...-fix-formatting-and-handling-of-root.patch | 115 ------------------ ...d_name-should-escape-more-characters.patch | 90 -------------- .../recipes-support/c-ares/c-ares_1.16.1.bb | 2 - 3 files changed, 207 deletions(-) delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-fix-formatting-and-handling-of-root.patch delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-should-escape-more-characters.patch diff --git a/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-fix-formatting-and-handling-of-root.patch b/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-fix-formatting-and-handling-of-root.patch deleted file mode 100644 index d1cb54aefb..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-fix-formatting-and-handling-of-root.patch +++ /dev/null @@ -1,115 +0,0 @@ -From: bradh352 -Date: Fri, 11 Jun 2021 12:39:24 -0400 -Subject: [2/2] ares_expand_name(): fix formatting and handling of root name - response -Origin: https://github.com/c-ares/c-ares/commit/44c009b8e62ea1929de68e3f438181bea469ec14 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-3672 - -Fixes issue introduced in prior commit with formatting and handling -of parsing a root name response which should not be escaped. - -Fix By: Brad House -CVE: CVE-2021-3672 -Upstream-Status: Backport [http://snapshot.debian.org/archive/debian-security/20210810T064453Z/pool/updates/main/c/c-ares/c-ares_1.17.1-1%2Bdeb11u1.debian.tar.xz] -Signed-off-by: Neetika Singh ---- - ares_expand_name.c | 62 ++++++++++++++++++++++++-------------- - 1 file changed, 40 insertions(+), 22 deletions(-) - -diff --git a/ares_expand_name.c b/ares_expand_name.c -index f1c874a97cfc..eb9268c1ff0a 100644 ---- a/ares_expand_name.c -+++ b/ares_expand_name.c -@@ -127,27 +127,37 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf, - } - else - { -- len = *p; -+ int name_len = *p; -+ len = name_len; - p++; -+ - while (len--) - { -- if (!isprint(*p)) { -- /* Output as \DDD for consistency with RFC1035 5.1 */ -- *q++ = '\\'; -- *q++ = '0' + *p / 100; -- *q++ = '0' + (*p % 100) / 10; -- *q++ = '0' + (*p % 10); -- } else if (is_reservedch(*p)) { -- *q++ = '\\'; -- *q++ = *p; -- } else { -- *q++ = *p; -- } -+ /* Output as \DDD for consistency with RFC1035 5.1, except -+ * for the special case of a root name response */ -+ if (!isprint(*p) && !(name_len == 1 && *p == 0)) -+ { -+ -+ *q++ = '\\'; -+ *q++ = '0' + *p / 100; -+ *q++ = '0' + (*p % 100) / 10; -+ *q++ = '0' + (*p % 10); -+ } -+ else if (is_reservedch(*p)) -+ { -+ *q++ = '\\'; -+ *q++ = *p; -+ } -+ else -+ { -+ *q++ = *p; -+ } - p++; - } - *q++ = '.'; - } -- } -+ } -+ - if (!indir) - *enclen = aresx_uztosl(p + 1U - encoded); - -@@ -194,21 +204,29 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf, - } - else if (top == 0x00) - { -- offset = *encoded; -+ int name_len = *encoded; -+ offset = name_len; - if (encoded + offset + 1 >= abuf + alen) - return -1; - encoded++; -+ - while (offset--) - { -- if (!isprint(*encoded)) { -- n += 4; -- } else if (is_reservedch(*encoded)) { -- n += 2; -- } else { -- n += 1; -- } -+ if (!isprint(*encoded) && !(name_len == 1 && *encoded == 0)) -+ { -+ n += 4; -+ } -+ else if (is_reservedch(*encoded)) -+ { -+ n += 2; -+ } -+ else -+ { -+ n += 1; -+ } - encoded++; - } -+ - n++; - } - else --- -2.32.0 - diff --git a/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-should-escape-more-characters.patch b/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-should-escape-more-characters.patch deleted file mode 100644 index 3603ef1278..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/ares_expand_name-should-escape-more-characters.patch +++ /dev/null @@ -1,90 +0,0 @@ -From: bradh352 -Date: Fri, 11 Jun 2021 11:27:45 -0400 -Subject: [1/2] ares_expand_name() should escape more characters -Origin: https://github.com/c-ares/c-ares/commit/362f91d807d293791008cdb7616d40f7784ece83 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-3672 - -RFC1035 5.1 specifies some reserved characters and escaping sequences -that are allowed to be specified. Expand the list of reserved characters -and also escape non-printable characters using the \DDD format as -specified in the RFC. - -Bug Reported By: philipp.jeitner@sit.fraunhofer.de -Fix By: Brad House (@bradh352) -CVE: CVE-2021-3672 -Upstream-Status: Backport [http://snapshot.debian.org/archive/debian-security/20210810T064453Z/pool/updates/main/c/c-ares/c-ares_1.17.1-1%2Bdeb11u1.debian.tar.xz] -Signed-off-by: Neetika Singh ---- - ares_expand_name.c | 41 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 38 insertions(+), 3 deletions(-) - -diff --git a/ares_expand_name.c b/ares_expand_name.c -index 407200ef5b4b..f1c874a97cfc 100644 ---- a/ares_expand_name.c -+++ b/ares_expand_name.c -@@ -32,6 +32,26 @@ - static int name_length(const unsigned char *encoded, const unsigned char *abuf, - int alen); - -+/* Reserved characters for names that need to be escaped */ -+static int is_reservedch(int ch) -+{ -+ switch (ch) { -+ case '"': -+ case '.': -+ case ';': -+ case '\\': -+ case '(': -+ case ')': -+ case '@': -+ case '$': -+ return 1; -+ default: -+ break; -+ } -+ -+ return 0; -+} -+ - /* Expand an RFC1035-encoded domain name given by encoded. The - * containing message is given by abuf and alen. The result given by - * *s, which is set to a NUL-terminated allocated buffer. *enclen is -@@ -111,9 +131,18 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf, - p++; - while (len--) - { -- if (*p == '.' || *p == '\\') -+ if (!isprint(*p)) { -+ /* Output as \DDD for consistency with RFC1035 5.1 */ -+ *q++ = '\\'; -+ *q++ = '0' + *p / 100; -+ *q++ = '0' + (*p % 100) / 10; -+ *q++ = '0' + (*p % 10); -+ } else if (is_reservedch(*p)) { - *q++ = '\\'; -- *q++ = *p; -+ *q++ = *p; -+ } else { -+ *q++ = *p; -+ } - p++; - } - *q++ = '.'; -@@ -171,7 +200,13 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf, - encoded++; - while (offset--) - { -- n += (*encoded == '.' || *encoded == '\\') ? 2 : 1; -+ if (!isprint(*encoded)) { -+ n += 4; -+ } else if (is_reservedch(*encoded)) { -+ n += 2; -+ } else { -+ n += 1; -+ } - encoded++; - } - n++; --- -2.32.0 - diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb index 692a5f0d6e..0e118c88ff 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb @@ -11,8 +11,6 @@ SRC_URI = "\ git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ - file://ares_expand_name-should-escape-more-characters.patch \ - file://ares_expand_name-fix-formatting-and-handling-of-root.patch \ " SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" From patchwork Fri Aug 12 07:51:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Hadke X-Patchwork-Id: 11312 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDE29C25B0F for ; Fri, 12 Aug 2022 07:52:44 +0000 (UTC) Received: from IND01-MAX-obe.outbound.protection.outlook.com (IND01-MAX-obe.outbound.protection.outlook.com [40.107.222.60]) by mx.groups.io with SMTP id smtpd.web11.8206.1660290754330040845 for ; Fri, 12 Aug 2022 00:52:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kpit.com header.s=selector1 header.b=o8EhPii4; spf=pass (domain: kpit.com, ip: 40.107.222.60, mailfrom: akash.hadke@kpit.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rr2xd5+wuP62R5NFSWDVdml8HGyqEq4fI+7HyztESD/SmoI+8K+cGf9Th9CPbgPgrBi4TJgQwAr4g5mQFxg5w+an6K81GptUTzn2ERkxN6zHw+vNpijr1yu/bxppvjIhScj1DVC8rJPn3rmIQRRJU312u75/Q2Kg69trPfU9OHDDL3DOPFFW7Pmjy83c3l5Aejz+ktkjfJEIyxw90O6kFpfH9NWJzpSh2Z1Pgmf7ujF8+xJs/JE1Q9vltaQ/VAfiOnWdNPFUc/yhfzYsNaFc4hy/PTKSm+pQgvjagO3KjXmHepOKKOS6LODlUtRFq1+xOz+vtz987kj7lq382fybTg== 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=vjQXyPYEOxvKDuOyqE72r0pGyjjzR/XrEhwObERxKY8=; b=mulzW19tg+SSw097nIgCwjIenKClsIobSGDZ8/TK3OC+Cx5C0VGXYQvVGSV3RQwlI5fWIL58wL8vNLz1oDKsfvuqTuDHCmJzAbtczvzJVHmLChfcsocvjODOPB6QB+00KGK4HaagTnxdik9K5fGDYXGdOszt1yFoZ3khZgYlzDqF0OxYB4z35j7OFHBs5q9XR2sW0AJnat8a/xje/OZQhfjtkHyx05vdSLv4yQ25srCJPo6ENbX08xi10YS/j64EZH/wRoloWYw6hVzW0sSUDxGbBl8S0NfRdhFeTfKhYuH5owWTYo3y3JIlxTUg8Z86U3xkchz28Zjojn5VW2+k1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kpit.com; dmarc=pass action=none header.from=kpit.com; dkim=pass header.d=kpit.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpit.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vjQXyPYEOxvKDuOyqE72r0pGyjjzR/XrEhwObERxKY8=; b=o8EhPii4IgT8htXgiUUffqVNjS4WrnciFBqjvV2nQK1Dzk+TT7JzRnzv/ffUPSn2ZT1Q64UCXy/DwEt6xnqAV+EoaQJSk6F/hxNByaBroXIAE0YxnfgQ6MwsCArONbuZHcT8I1NSv5jjCmdTZjJr2bKsgo/Q9diH0vyjXoRbMNM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kpit.com; Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) by PNZPR01MB8490.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:5f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 12 Aug 2022 07:52:33 +0000 Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50]) by PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50%5]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 07:52:33 +0000 From: Akash Hadke To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Ranjitsinh Rathod Subject: [oe][meta-oe][dunfell][PATCH 2/5] c-ares: Upgrade to 1.17.1 release Date: Fri, 12 Aug 2022 09:51:33 +0200 Message-Id: <20220812075136.31326-2-akash.hadke@kpit.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220812075136.31326-1-akash.hadke@kpit.com> References: <20220812075136.31326-1-akash.hadke@kpit.com> X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91bebcf1-1d1f-4f8f-4702-08da7c379d29 X-MS-TrafficTypeDiagnostic: PNZPR01MB8490:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iFKNrcwRcOIl6xEk6JiSRElpqiyYaFp28Nijlnu4Um2uxW2yCS+bzFy28Rgtb03iB2FuMrCJJ8Q4kqmmyKdUVgozjtuIMz+lruYJ2et0FnCJOSzxvAH766w5+71Vbl7RiybMvg5jCpRTpIQUxckhJB0j44GCNYGY0PtWJuLQmmG01yBN4B6bC02nz8YMEOmaULaoyEKuhN1jmQ0K5pSnKDWT55WqmddQPtn00891vY8s0j4Coak+vYggb3XMXNutV+ksJN3RZ022Re2+sVXR3GnEN7hr25dE3eNH+4x2YkkKhAovkZ5fOFM/MftI+0Fp1b2gWWbFjFmWjLfpn+6tv5cSzvV49aQ37HTQKJYmtY4RmZT1Yb7KG19zOsTEU9poBi0hMihWR8Rsluyw8ZkXVWw6rwlSLZIgzS7UhDBhxdrcZ3sYCIYXmyhfGtizMubkDJbKrag0rXGmmbPGpz8zGVJbOyNpD5k6+BaA9EuZ5I4f4lByziJWbT0kYTs3rw8zBRabLy/yIXiCniN+KPoVntz8kj/ouEi5yR+h7EMtWMhq+0bi9UZk2/U0+bdLtKhnz7Ilr0S95pgAFN3ZL2u1RqeBxO00qzpYHbE7Ew9mEv2lG0MUJ3CwFL65rtnzHEidL2LDUjTXl7JTkdwhM7D/yg3pD1O5BBnrYBb+d+5B60lNuTPVDxtRutnNGbPPPqhjuU45IRdU4NJmO5EMZxTltBEfXcndbDM1lXy67HwSLyizT94iwUIlZcoKmhtLopy4e7AMxV5nBxBJFTi3AZac3+luamyM12sqSBHwVjJqf8w= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(376002)(346002)(396003)(366004)(36756003)(5660300002)(2906002)(44832011)(478600001)(8936002)(316002)(66946007)(6916009)(2616005)(38100700002)(38350700002)(6506007)(26005)(66476007)(6512007)(6486002)(86362001)(54906003)(41300700001)(52116002)(186003)(8676002)(4326008)(66556008)(53546011)(107886003)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: asX/MRAzr2kMLgC7DdbX0LnxxBKP5Md7F4OTeQZoMe02CT7MJfeIJdiU9Ee033SS4/DMwKxITXvISyOsWDSAUcFtUXdHIGM9e+MeQVpyQVJZfzDeBuErRmObey2PDfnGJ+xFJHgtZYiE12JO8qfY6FvRKDa1Lw0GhofxzYfWTLzxYvd59PQvsB+JK1bWJcwQmrdRtuN4JBV/8xjq7uWS/Fxl7azFu4yE4s/TThbc4mCur5NurQO195oh5DpqelGpcBP7g/ZnpfOrQ6R0ktQ0FB6rGmWP+pb5MMkpXNbkcjlWzeAR59Cf61r/sQDLqjOtOOSzDkpAbkjUOQft82xedw0JlSoMtPYnHokaCH8BZHWsMo2jpQ8de9SUrYVZjeSsBE9FfLI6J/9e+IfYHy5AdkDmzBhLLWmXIu260WnLxdf/GG7VRErBNgUNaj1c+WTuDDJLyobb8z9De8W2U2X4HsAYU84dhQlrH49jHx0DcJ9Ty+etlkA0glFi8OHk1HKBSpxc3XVDWDxhbMuDnxRUlM2D8CM98/plDoPqtOtt1tio5ykM+TCcJmALrjZmlmq56lA5wsIIJmjeWa1PFl24Low+t1c8tU+8GA+fnMXxUIYDfurJX7A6Hvu+5aeekzwhzXxkooV+sjfnt7LvpGfXVZnUdWMgpriOZ1l/6zCgSgQyzNeZ4aNOXpTNM7Yw5qRl+vQdlnp7h8hCGpfX9/4NCW8qemn3DTKCLx1bge8ffCi49Shl5hTECdqO+GxH+rA2Hk/8QhjdBTOBiOV3EsxncKA2PvZic/sIz5TAoQV7OHnh6DpJgPyGqy/ZUBYTrlopS9P+h1XnjVYy1BvL43eoFRpKXyP0j5JDtp/dn46udjP/R0Svei0R+kqvIEZ3/A3OixILjRAPxQrhUAVeQx+RfWCl8jjjoYxlFUAuTDxgQ3NWQjRWvCxBMIyouPr7AMh5dfecg5ThtBpRN6Fsc0bhvmx1GWxaDw+dBwt57sREh9K+Q3pGKaPr6H2npPGAyyrI+7a0+NZQ6NZO69KbeHNYclAwZRuVi1ucXnadH/KiF4HJh8fFDGiRBowh5UF83WLmCOk4QIDTDff5iw+CSfwivrNaoetXmD+dQ8GIjJYA61Ph/Mn33nOkAhhEaiOORnwtBG1hjhi4mYsIMP27m5E6hMerPFtOA4o7h5iLZNRsEIOuWVLR8vuBSbGtzFhOs0fTPJjTyeKg1mb3b23vA195/yq2uC1vccfKL3G+m8zzh4OC15kuc+WebmXM4+OpSq8Qo33um8VbL2t6t9nQCp81A1nMEN3tLWVUqeo6ixzpXXaU8UzfST34Jz6dwxgA7fQZtfS5y+ys57gFAnN/ADWndF5WN+fTFJzYjVZ4IrLm/DyABTOXXsKq5ChjtWJVEFRxJWgcYGebozk+5JmOoGAFy1TRbo0WztaZvdwNvOJtylMuC6LuiLyFZsCaA1jiH24BtQxIhw5smvSlnyt0858RIe4jNKOm3izuzk/OZGG/ofYQvJoGaH4OZPCZx5Su527Yk9go0jB3DVtLxFreDyPwA0Ct5FIDbl78RM0x56VWpPp5bDKhEGi/QkXb1WU19w+T X-OriginatorOrg: kpit.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91bebcf1-1d1f-4f8f-4702-08da7c379d29 X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:52:33.0307 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3539451e-b46e-4a26-a242-ff61502855c7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cpQLqLjyChDR72F951IiQPHVeBZ2jDHn3eVCW3MpxsImdoJJwZMiiSK6rcMScqoByrg+eiVvTo4XD9rLsa1qeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PNZPR01MB8490 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 07:52:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98203 From: Khem Raj Forward port cmake-install-libcares.pc.patch, drop the need to install pkgconfig files as its already being done by main Makefile Conflicts: meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb Signed-off-by: Khem Raj (cherry picked from commit b65f2904191b8d309b3971d4e65c5e1701156b1c) Signed-off-by: Ranjitsinh Rathod Signed-off-by: Akash Hadke --- .../c-ares/cmake-install-libcares.pc.patch | 27 +++++++------------ .../{c-ares_1.16.1.bb => c-ares_1.17.1.bb} | 4 +-- 2 files changed, 12 insertions(+), 19 deletions(-) rename meta-oe/recipes-support/c-ares/{c-ares_1.16.1.bb => c-ares_1.17.1.bb} (89%) diff --git a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 0eb7e4bbb3..c6f9c6de61 100644 --- a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch @@ -1,4 +1,4 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 +From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 24 Jul 2018 13:33:33 +0800 Subject: [PATCH] cmake: Install libcares.pc @@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago update to 1.14.0, fix patch warning Signed-off-by: Changqing Li + --- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) + CMakeLists.txt | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 +index 08c0247..0020d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) +@@ -551,6 +554,15 @@ ENDIF() + # Record toplevel CMakeLists.txt path + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +# Pass required CFLAGS to pkg-config in case of static library +IF (CARES_STATIC) @@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644 # TRANSFORM_MAKEFILE_INC # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) +@@ -624,7 +636,6 @@ IF (CARES_INSTALL) INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ENDIF () -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ +- # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb similarity index 89% rename from meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb index 0e118c88ff..de27d736ad 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb @@ -5,14 +5,14 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.16.1+gitr${SRCPV}" +PV = "1.17.1" SRC_URI = "\ git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" +SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" From patchwork Fri Aug 12 07:51:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Hadke X-Patchwork-Id: 11313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD238C282E7 for ; Fri, 12 Aug 2022 07:52:44 +0000 (UTC) Received: from IND01-BMX-obe.outbound.protection.outlook.com (IND01-BMX-obe.outbound.protection.outlook.com [40.107.239.52]) by mx.groups.io with SMTP id smtpd.web09.8335.1660290761287076859 for ; Fri, 12 Aug 2022 00:52:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kpit.com header.s=selector1 header.b=fQnQFono; spf=pass (domain: kpit.com, ip: 40.107.239.52, mailfrom: akash.hadke@kpit.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cnvmdkxqpGlMCzIompS804zHqmmi1tvuOET59Li/s5TQOCaYgsEeITNg76nL4KEsOi/xDYjCEJukDbbxB4h9LQnDrCvzMyafTQxHe2kTZR61XfoVpKSiAqzbGF1X0tW5bBEZUadUqjrqUZfqxwgpijuWgZ3SG3jIOhO94TTpHIaP82EOVzlNwcGVYRWklsU+ZK8B3hPFj6gwY64g1O0IGAUycCPdUSe3g4z6U/QDQ31EscH4TA7DaYXgNjipNCSXCZW5qEKcLjUqHHGmi7WY2P9SPF7NDk8Sqt7ntMl4xQ2nKurp/bZplisYgUrzMTwHsvLO26xck2hnp08ADZJFng== 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=zhVV1jZj552/LjVwv1BB47MW1PFYh7Rhg7hocqSOrmY=; b=FSE9LypfMkm5NCBAG0Br1DWxXn/8OBdMWYRgmYShqctLlfxGOiIpQzvbRpuTPEhc1X+t3O8xIuk3m9qOyv4afiA0xlf/qI4WClCcGLh680w0ap7lIXqX1R7fkeggNKkoeBrMVBIVuPtv+eUQZr8b/C2uptO1nYQV7iZHEX9/ecIqs/F9X8MbOLJgOgQog4s3VkWD+KkZi1uwOe+xT/H87PiKzrjnCobeA8rg2A+64dD8Nn4Wv7pnaVSlQqL8821gsF/suGX4lF40i68B4WmmelIjoCIEYm86AiOnRuDu9mRg+NKHiFjmFAy0H9OBR8m6Efyx0dKoxNepcz4FOH0jrg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kpit.com; dmarc=pass action=none header.from=kpit.com; dkim=pass header.d=kpit.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpit.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zhVV1jZj552/LjVwv1BB47MW1PFYh7Rhg7hocqSOrmY=; b=fQnQFonozm3Obpho6qeQcIDp0TDo8RYu29+Vl7RisrmdAIIxwwzrE/mxZYcnQrA69wF7wPOSQaFPbtXsu7fGJcYE5gIQH6KrihzpVp7075fi5nd/pLyE7LyKv/TIRnV+R+NW6xFHRE9IF6DAehIojmFbl4xZkL7y1sJEW8tdbRw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kpit.com; Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) by PNZPR01MB8490.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:5f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 12 Aug 2022 07:52:36 +0000 Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50]) by PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50%5]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 07:52:36 +0000 From: Akash Hadke To: openembedded-devel@lists.openembedded.org Cc: wangmy , Khem Raj , Ranjitsinh Rathod Subject: [oe][meta-oe][dunfell][PATCH 3/5] c-ares: upgrade 1.17.1 -> 1.17.2 Date: Fri, 12 Aug 2022 09:51:34 +0200 Message-Id: <20220812075136.31326-3-akash.hadke@kpit.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220812075136.31326-1-akash.hadke@kpit.com> References: <20220812075136.31326-1-akash.hadke@kpit.com> X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd87dd68-4a7f-4f9f-b12e-08da7c379efc X-MS-TrafficTypeDiagnostic: PNZPR01MB8490:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9APEJhBf5aWgczyWJuB+sIWCtqdgENzdtWrcpvXKEkXFFyoDtnWf6rD1OAPurlKhVRByzxBNlY+VGkcYo1zj1Tmu4r5WOjMS4pH2mCd3heb8G+vf0J225JtOgQJso0UmDTka1qp/uGe1pTtyd6L+nDuF7DwtJMQ3UcHnoWui+slIkfnD3Ny0Z3a9kwm0M79gJvvp6C9tny/cL2WXTekMZWBG9g0yBUNFtz4gYR+Lb3+3pAz2K+jCrmIJ/bNWP6jgRSvPyPZvwmoD74/aCoVLBFC69Pl6fxWDjb80vMSxVCoSc7W3uE1/skmplyEUPZOMPe10Vfwj6e5cvMgJUJVpkywuXYN/ehp7JroBV3UW4z8JOfRWaldMEtC7tih7hm7AhQSSmXwWESB9BrjbpYebowxYA+tCdcC7IHuAYu8E01spXiZu6YQweTc4JTa5fnBVTSV5Q4n30djf0cR3gM3Eje3db7nc31ZPZyNfDQmkYWIl76FR6Rjh4Fa3vGE5f7Kw4oTx9dgzOerhSwIGclpRCpUC0EoTDrO+zyrNLwue8mkc2ZhTf5du4+M06XawyWJukmbXUVm7aaftcU1QXqt/m32MafPC8cS1r6LF5/RpmLL9OZon6dOOfuVM0UhQLCLQknQxzXHBrG7o07Xpk4/Wo4yLQayqtO0x0Xgws/IJXFBcj2FLtxIeRZQOp2pQvoqju7xytzHwXKGNCNaLfI9hH3Aotv+UkX/1s4Xg4Z+ZrlNOU8G22J3IpJ5tU5APxYef9kIwMt2ri9m7w0E7c5O/wrI+LPcJKXRPQORv0yuSq7g= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(376002)(346002)(396003)(366004)(36756003)(5660300002)(2906002)(44832011)(478600001)(8936002)(316002)(66946007)(6916009)(2616005)(38100700002)(38350700002)(6506007)(26005)(66476007)(6512007)(6486002)(86362001)(54906003)(41300700001)(52116002)(186003)(8676002)(4326008)(66556008)(107886003)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L+5WiocT9TOWCrMoT5LjNngu11ByPNLLciO15rQyceDqLuTN7iQW5DeIwCM073q/mtNjmUS1fGBNwARnQHU7y6f3xAvWz/HSrEQOC2pnLr2IQ/46mQGp5y/2ksZJSiB1rQ5u8Et8Y16nbhYUuhTBvzskHjfWv+9aO5jvTky0g8v5f1IKMHoNFljT51wRcvkAmP4g0UxKEbFkxiq0BKARjdZSyatm7/b4RZ5Jdk0cawD27LHwXCGCgMmzMx6yqrN/py7Fp/wr00oUwvlwEnC5Yjhc1/aCRb2nek0VNxF5XFfcnP19XqO1SQMteIn1agX3n7xQjzOtFIwnf9g89KN94+40E7Q3s8H1m6Fz59g3StSfA8jWM/2ImxjN4Jwo3Bid5LKRVfHgM7sELqmhVnNehQKPLR+kHy2wQ65LjH1gh2iGmkU3aF/sd19mmWRBboozLBCn/0D17bKVhR2QG+jmnmSPykGmDBeXKCSan3Jl3a1nuByXYzjjMu/RvZbupvKp1foS+t87iwPM8D4uYlZKPhqLHv5JUEAusllqzNwS76hDMXko6uszb3rbwILQwzPkwbHZyi/PV63M5URskWa4LA+iL84Ydj6xm9v9k4VhUNxWPQBeWD3w6fTQQaerrjtku5GoZ4ChK9KaFU/Ii9fMAajr/LuDx8F69ARwzdZsHOaknK9ya8ByJ+BrgaZp3Bb6Y21z60xqql0ddkrAsgHn/y2BzeAvxkOL011DMtzJo1TJcNNGjVNpmLtuLg1jgUIRsebMDACdjq0R/CXUVdovS6/9I7NTfEXak8ivL9Jpbw4i/9gwpBytWQchpxlGjKRtnnG592AeB5JVhzeuCKOzwQi2xe4XZv7MbO2F4iluDA1MkZv0KQnLG2ofkhVWTPbOPCi+6kIeT8UcoTmHws6Ig1Hk1qxclDA2bFq/3Elg/FFnSUyiIRdh3M+GudYu0V2OYI713L6vPFgZeEU9hBW6jmXu72nhJZyqBcgFZpZr6StV3+0URNwFZsV6E/Pi/eR0amXskx1VQbPAmLZb93aO1iVmApAR9JGMIp9HQoDv19CeLNuurd+SgRcmykoYF06y47v2Bx9gPXOdCApjb3mnveI1N3YcctQtl/XgbSa8okuwDh5DAWHzjuPir2zHKKWlIInYv4ELdnKy3bacLqHH8CMN1U/4RgPNftISY3/g4Lj+q+M4X/3+JyKc2FKgDS+xl0IANlwqNZ0VCoIVuwmYX7sxcjb8DM6jj6zANXqoUBQ3711elL9JnXJc+CRJtItMHNLZVKcCGU82b3H2Kq3jKSPa8px3OQ5+eIWnpvua5dYRpkYYSWXb2EdlFiktd7kGftJApNvO8SgIaDQ3wZcBxtEmb+CqmZ23mMn0PXck3l4kpnNo8XUAGhxqG4lhdAONFTYHeRshIMFUASt/GgedgYENCPZ9zz0XKcEp/SHqlg8tmwuZ4BI+lEmo0BfeN/jr1TS9P0UCoEhJkvKHs9hbv/7MGGUWm+VkSG4WHdGBb0kiAQSWbqrhbd+7Sd5HKCn2WlyiDP1IvtKrgl3bAqrcOtdflRE81bkZFKr6IVWYKaGksp2xiqni+b0AoJoH6dso X-OriginatorOrg: kpit.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd87dd68-4a7f-4f9f-b12e-08da7c379efc X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:52:36.0627 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3539451e-b46e-4a26-a242-ff61502855c7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: e1d6iGppkey/4UWbN3jIxIUXtkH7mN712/lhZf+bJ9lFjFQRL7tkLs9C2ysVE0nxkTbgjbUf1FN/NXDMKPy4pQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PNZPR01MB8490 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 07:52:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98204 From: wangmy Conflicts: meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit c49173b09c998bb3893ae873f68823647f1a7e18) Signed-off-by: Ranjitsinh Rathod Signed-off-by: Akash Hadke --- .../c-ares/{c-ares_1.17.1.bb => c-ares_1.17.2.bb} | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) rename meta-oe/recipes-support/c-ares/{c-ares_1.17.1.bb => c-ares_1.17.2.bb} (63%) diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb similarity index 63% rename from meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb index de27d736ad..19e35db2d7 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb @@ -5,14 +5,11 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.17.1" - -SRC_URI = "\ - git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ -" -SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" +SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ + file://cmake-install-libcares.pc.patch \ + file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ + " +SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" From patchwork Fri Aug 12 07:51:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Hadke X-Patchwork-Id: 11310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC563C00140 for ; Fri, 12 Aug 2022 07:52:44 +0000 (UTC) Received: from IND01-BMX-obe.outbound.protection.outlook.com (IND01-BMX-obe.outbound.protection.outlook.com [40.107.239.52]) by mx.groups.io with SMTP id smtpd.web09.8335.1660290761287076859 for ; Fri, 12 Aug 2022 00:52:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kpit.com header.s=selector1 header.b=UxflVBup; spf=pass (domain: kpit.com, ip: 40.107.239.52, mailfrom: akash.hadke@kpit.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LHVo60X915ZLETVxo3iMoXfCL8DSAkNf10neLEue4C0VtT4SRXsErKGNYOsSPFJvCofMtays23a/AloQDfZoy9Y47RgxKxa4bREuklRbiOgk2p49vvHdGtOy0evCdjcwMX0uYEr8zV2mlF5e7WP4/5EP2FaX8FG5aGiFOfkP1qeBK658Uisk5NMZaA6QqB1Ra6sq01iptLlhijphRnuGh7bFvMXcdkJzuvz97VFyRS+nytOKSnNDmMUdi7KPGi4xo2SHmingXGoakqjDhJ3ri5Y0h2unkUQ0Lmr0xp8E69H9KVnbuB7w/MqJzlTwtamFzJcW5S/qKCWOTJMCFF0cEQ== 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=S6g2CdPaUK+lUL1o+BeisXnKXRMQZpfdl8+QMFKi4fU=; b=gcy+8brMVhM8ionr7qTp670G3xxidr/g8dtoMCKllN7d2eIztAY8mmMkm5Fe+GqRIxS6UttljGSmaoD+GsZl48zqPTy5VnSTeZEVAbIH/WfRKWjCZYVpMCWINHJF7CuNMe84qdnSgMbWrfgYva91jeavG/BNc4m8xXQLVbK73s7JK0xEs86WpDrliDdZS5zFH4F/ea7CdwaNfxbKbSeajFF19H12HaxxPK8C84KzxEiWnX0xfFHxNi7zdLrc8GI3Egcof5765WL14IMsPirc3YhdIPGgXBl4hSO4DgRc+5RIpPRnGrIFx8eKPh4PEy2JMtUIeNsRsK5lP+ucSsRd2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kpit.com; dmarc=pass action=none header.from=kpit.com; dkim=pass header.d=kpit.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpit.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S6g2CdPaUK+lUL1o+BeisXnKXRMQZpfdl8+QMFKi4fU=; b=UxflVBupoURkbwONiRLCZN4BmB+EppN+iKF2vUNDSsD9SZPRQ2ThS6w5G9KcbmI3hLXlWiGrA8xeuu0ApKGAgE7Pe0JrXzg7QcxBR5Q+NcgBIsf+q3jaWEH6zJJeOthLuZXsS41zy+x3nc17dK8EbvKA1vxjikglwiM4T0E+1YA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kpit.com; Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) by PNZPR01MB8490.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:5f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 12 Aug 2022 07:52:40 +0000 Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50]) by PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50%5]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 07:52:40 +0000 From: Akash Hadke To: openembedded-devel@lists.openembedded.org Cc: Sinan Kaya , Khem Raj , Ranjitsinh Rathod Subject: [oe][meta-oe][dunfell][PATCH 4/5] c-ares: remove custom patches Date: Fri, 12 Aug 2022 09:51:35 +0200 Message-Id: <20220812075136.31326-4-akash.hadke@kpit.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220812075136.31326-1-akash.hadke@kpit.com> References: <20220812075136.31326-1-akash.hadke@kpit.com> X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb588a76-0aea-4464-a661-08da7c37a14e X-MS-TrafficTypeDiagnostic: PNZPR01MB8490:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 041glas7A9cO2XsoX2M/8gBzWGKmywT3Jldfnosiq3tlx7Q77WhxAFFc65os8bFgZMktZSBoiPnc7ugx6Lg1CO/TyDmdVkwqMY908fvXiKPrMzPS6ZgWBylpWDsDnMPedGzwyvoToSb+/YZ1o5dYfD3G3AxWIhEhbEncx29zKErLIx/dozmJIZmsWymNafHjccDneWT38FKWXprKml5a6hfSjJQ0QH/9NE3ATsJZhh9NTa+dlRL/KlTw1cUbjUWVbEIIL0wQSx/2+Tm4SbQNqH1cF2gS6lIWISvn18eXQePa3WyXrQvTZjXgKqVX1l6Y7ukNsNPEU4crBzxt1QHVVk/AKTFiPvx/BUz1vHYNf4qVd66F/N8Sjdd4MK7I4QJE7sD6YHmOQ0REcHyX0PtpCz4P88yfMjmwEm4kzt9pTzmhNIyJz2+SQnzJVvPW7t/FCA0Q98oyJNU6VQsg/vffSeF4ycXk8nLUAfVX1QCLnhfWD9VdhfWsKH2v4WjCghJRp8AbnwxjDH1U26DxECzQFlI7fsZ6HFxBI8mDOnKOg1eW+O46G51q1khHW7GvqWQUZHl9aUfnZg/V1aVRohgf55IXiwFX0es7EZXwumQadFKxr+IvnYRMd8Lloc3bHYFYBqBiItKPoI9HCoBbz7zAUT/nLDGY+kJ71+bAwFlVujl9yGlhuArjeouzZUWcXc/2bTe3fk7gSxdgI4nH0TR1OlxRF+V/+fdKLmQojA1WtSiYmAuSkyOUalaGEqfHFwgjG6Vk2V6LbaUJmMfh66a7VA5p00WRpoFsAIqRnqgxIOsEtLXUMRkg7tqnlJMp3qJy4NHpdW9MzPqDNFW69KU/WQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(376002)(346002)(396003)(366004)(36756003)(5660300002)(2906002)(44832011)(478600001)(8936002)(316002)(66946007)(966005)(6916009)(2616005)(38100700002)(38350700002)(6506007)(26005)(66476007)(6512007)(6486002)(86362001)(54906003)(41300700001)(52116002)(6666004)(186003)(8676002)(4326008)(66556008)(107886003)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Mfdy1X1ASKFroCYt91rV1Yn+OslqBp+tO87PlhqrxlUnRZm9O7DLK+cGUydNFyDUYWIL9Vi3RWv8fP3Gq1fMWKBy04vpDUalxzZPWyVfcwKyo5HxDnO9JFPrJdGBBKqstH6gIeIJdj5XzFHjOPD6qyG6H0eH3Yhs1hYXhjpiDkTl9UpNb612zuaHc3wF5u3TRjj+zUM5sdwYUAkYBymcJmddpKC48pTsP5aEVhhM1YtmLY5jdEa9hNUknvipkchV8yf/dYu3rZ+xY3p4sY/9NVL2GZ0v3h6p+ts5FkT3fmskSzuufV0pQNZzyNyr95ONGxrbdjPmd5bs5vEK/8fXirxIuDsfjTf4lYfJLzlQ1GTT5qZyOzWxEZSd6y3OX5VUWOcjBxIZ6UJIh9a4vlKNCIL0jy0Xg4MaDRxf1KuTJrGMmJ4zDFxII6EO2xVGwf109MGezGnGA08FnV9ZNvvlSLvjfcPml5H7MZN6VeSHZV//5O5NMKaHejOkVhFZffo36r/nePK+ip7+BUoSACp+3pxJPpPnmINr2AFodh7WxdDri6mHhn+NUrz6RDfjNEPQZosXktm9GkYQiW5HtqF846VXaHu3Gf283hOgKTeqdvBmJY4L1o5fovmkgQOTZxG++PyLm/oqoYFKxqmLbEOPGF27GsOhR2si8Wmrd6HICdCJ8GoomlXOzcEq4z9YdZ7vuOJ69WVFdVr5JMuenAxI4ThMoT2gbGheLlIG8xp4e5PKttsE6/5DGTmMErv6/E2WBIpqyYNIzRUtKiykkGP/Qz/HtNqaMwkYj5cqerQUATex3buXEFFEPsTnd1ss1Sad4gCJuBti7kvVNjoWwrIiDCazJoSoJrcqROzkApSOcENnGqEyIFSdsZp7wpGd3U40DhcG3Fucun+3Va/DzSrjyhoF52G8w3D5CS2RYl4BFMbJYZYUx0AwOz8fmebh8jZ20fA5+ugcEQxO2AP76iaiEmyGqy4iomg0EF7Mft0EksFNq8zDzzxxEXOq54Gvi7PGo0UqFt0kNQhx1S9yPBROh76m7GoCywmj1w+dQ3hTVm82fYTEsPc7x1ahtvTk58TpeVIzDMW25OiPMKZO8aYcBcu0xTpUj3qIHmrI52KCMvRpDaOmPQQ+3GRYhAkiTnbIsrWjua0rfy3V4CnOzgAnFDVhlCePJcC6cVPDaLGtMo8QenNrIR8EIiTIKnn2J8D1e8pvL+bjUNGEBkmaNXPZJM+VSBgW76kzpmAoKGQ3UcGq04cy1UvGRyCIsgUC1nxSR2HICkY8s6B6+kaFtSsN3zM2SDLBS93oW1papuWJJlAhEbNDQfUOZPTl7PI+eSsL76JwEBnZ8GamH10jD2xLqSwjrnGmktFs483ZPDLkaRzy4PKYQm4HZcjiB1GwzU0G+1zaG37srRoO714L9KOiDbEU+nOCRKFTYZFsBBF2ULYwddy8VMO6I3fZ8B+9/2dma0OpYZk44P0DoAfsQumonqdBdjVmgmvha8+A9IH4eiQmKVL6lL0Ra8EBdm3X25Fi9TwAPI1MDy3LbGHhJRQwPJZ57fC/+ikri0/dPyI87VFxs+ycQja259bceylYcmRi X-OriginatorOrg: kpit.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb588a76-0aea-4464-a661-08da7c37a14e X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:52:39.9638 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3539451e-b46e-4a26-a242-ff61502855c7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7GjnDlQ6Zq2u0eeBlmW+phsHbcJQI25bDShTLvqXzNqaxzYYxeOxhlh2jjFIB9Rs/uIK+p5srfI8Kv0BCZMMkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PNZPR01MB8490 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 07:52:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98205 From: Sinan Kaya Current patch is breaking the library dependencies added by cmake especially when you are static linking. Applications need the ws2_32 library to be linked for mingw32 and with the existing patch this is not getting passed to the users. Current patch seems to address this issue: https://github.com/c-ares/c-ares/issues/373 Both issues are resolved in 1.17.2: 1.17.2-r0/git $ find . | grep c-ares-config.cmake.in ./c-ares-config.cmake.in 1.17.2-r0/git $ find . | grep libcares.pc.cmake ./libcares.pc.cmake Conflicts: meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb Signed-off-by: Sinan Kaya Signed-off-by: Khem Raj (cherry picked from commit 621bdc1993d2e8da08b9b240043dc13481cd644f) Signed-off-by: Ranjitsinh Rathod Signed-off-by: Akash Hadke --- ...ror-mv-libcares.pc.cmakein-to-libcar.patch | 27 ------- .../c-ares/cmake-install-libcares.pc.patch | 77 ------------------- .../recipes-support/c-ares/c-ares_1.17.2.bb | 5 +- 3 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch deleted file mode 100644 index 8f15f8424c..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Tue, 17 Mar 2020 12:53:35 +0800 -Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to - libcares.pc.cmake - -Signed-off-by: Wang Mingyu ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5878d..c2e5740 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -563,7 +563,7 @@ IF (CARES_STATIC) - ENDIF() - - # Write ares_config.h configuration file. This is used only for the build. --CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) -+CONFIGURE_FILE (libcares.pc.cmake ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) - - - --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch deleted file mode 100644 index c6f9c6de61..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 24 Jul 2018 13:33:33 +0800 -Subject: [PATCH] cmake: Install libcares.pc - -Prepare and install libcares.pc file during cmake build, so libraries -using pkg-config to find libcares will not fail. - -Signed-off-by: Alexey Firago - -update to 1.14.0, fix patch warning - -Signed-off-by: Changqing Li - ---- - CMakeLists.txt | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 08c0247..0020d6b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) - - - # Tell C-Ares about libraries to depend on -+# Also pass these libraries to pkg-config file -+SET(CARES_PRIVATE_LIBS_LIST) - IF (HAVE_LIBRESOLV) -- LIST (APPEND CARES_DEPENDENT_LIBS resolv) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lresolv") - ENDIF () - IF (HAVE_LIBNSL) -- LIST (APPEND CARES_DEPENDENT_LIBS nsl) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lnsl") - ENDIF () - IF (HAVE_LIBSOCKET) -- LIST (APPEND CARES_DEPENDENT_LIBS socket) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lsocket") - ENDIF () - IF (HAVE_LIBRT) -- LIST (APPEND CARES_DEPENDENT_LIBS rt) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lrt") - ENDIF () - IF (WIN32) -- LIST (APPEND CARES_DEPENDENT_LIBS ws2_32 Advapi32) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32") - ENDIF () - -+string (REPLACE ";" " " CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS_LIST}") - - # When checking for symbols, we need to make sure we set the proper - # headers, libraries, and definitions for the detection to work properly -@@ -551,6 +554,15 @@ ENDIF() - # Record toplevel CMakeLists.txt path - set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - -+# Pass required CFLAGS to pkg-config in case of static library -+IF (CARES_STATIC) -+ SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB") -+ENDIF() -+ -+# Write ares_config.h configuration file. This is used only for the build. -+CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) -+ -+ - - # TRANSFORM_MAKEFILE_INC - # -@@ -624,7 +636,6 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - ENDIF () - -- - # Legacy chain-building variables (provided for compatibility with old code). - # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). - SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb b/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb index 19e35db2d7..80d711a36f 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb @@ -5,10 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ - " +SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" From patchwork Fri Aug 12 07:51:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Hadke X-Patchwork-Id: 11314 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6238C00140 for ; Fri, 12 Aug 2022 07:52:54 +0000 (UTC) Received: from IND01-MAX-obe.outbound.protection.outlook.com (IND01-MAX-obe.outbound.protection.outlook.com [40.107.222.77]) by mx.groups.io with SMTP id smtpd.web12.8238.1660290768647566674 for ; Fri, 12 Aug 2022 00:52:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kpit.com header.s=selector1 header.b=rNA9unv5; spf=pass (domain: kpit.com, ip: 40.107.222.77, mailfrom: akash.hadke@kpit.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRFZG8KEW0IOESVWKZ+KK3MJMhfyB4E2m88bCqTzdRdi2lxeOPTh+z0iVLmPnPNFDdfEJ1SFQRTLDoKo5lTm79VejSD4gOMrW+0BbrKKq1e89SESuQGqvcqulrbCl6hWTNWJ3E2gEGV8EMlIsZrObe9B0afD19LHhHTeUUpIfgpwCO7F7cyo2J4bFrAM7XEnsY6md/Ks0HDjNgSQWEA58IxOkJtO/9WgBoN9V4T3SmdSL0r7WgGzHSyct5zL9KVT6I5IVkwgCSk4dzRsLtmt0NZvVyYjAyVWoTnJJB7KMysr/X7p1T2o2b1grzcLaax75bOoGkgNmRVo5EJ1IYuJ4A== 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=vAgTzF6x9BZRiZp/HsxOg4TgXQWCBi3Oa16Of1UGap8=; b=Du5F8Fio0wVeFKl723S+IQs8qcXfBoK9PZHZNKmCdA2ZNmpnf1IU2x/ttWU2d+7ZEOk+VkVF7k8hu4KB8fAQz6ueVgJkaEs1TNydewh/bhIjqjTELZQnUUxXUiZYRGuoDjZa6f3MDVe/hOGFyofNNenxyIB9vCkUwKyl4pPt/j/Yj3ZfoKYeWB/5iJfi66ECCKYTcRFUnuy3xIVcqzbU3Wkd9uV3kZW4L1iNv0fhFRh0ACfjJpFw3Jl/5U8u0h7CcX8TspAbwdTqFaZ5ejGjfIRPB3PzXj/0IxKNAW1prvXtrp/qdEUOKPHz9LZMljEP6b44gKXw0YitjScUDpGAsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kpit.com; dmarc=pass action=none header.from=kpit.com; dkim=pass header.d=kpit.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpit.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vAgTzF6x9BZRiZp/HsxOg4TgXQWCBi3Oa16Of1UGap8=; b=rNA9unv5NmySUDCWuX+/YDXOc/HtoM/XdpTzwOIbJJ1bg4N+Ia6KgRXAUkBUM+BZd3lJepZO29RjP3h8Efk9nN4WXYCOn3YjO2A5Yt8yeh+NVKdwEQIsGOqSkuuVH6UlHGNxHiAs8CR7APeYPNs10ZK6zInOsT7wKU4BdgwG6MI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kpit.com; Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) by PNZPR01MB8490.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:5f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 12 Aug 2022 07:52:46 +0000 Received: from PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50]) by PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM ([fe80::5d77:6438:def1:ac50%5]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 07:52:46 +0000 From: Akash Hadke To: openembedded-devel@lists.openembedded.org Cc: wangmy , Khem Raj , Ranjitsinh Rathod Subject: [oe][meta-oe][dunfell][PATCH 5/5] c-ares: upgrade 1.17.2 -> 1.18.1 Date: Fri, 12 Aug 2022 09:51:36 +0200 Message-Id: <20220812075136.31326-5-akash.hadke@kpit.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220812075136.31326-1-akash.hadke@kpit.com> References: <20220812075136.31326-1-akash.hadke@kpit.com> X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:89::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da074cad-cb36-429c-837f-08da7c37a4e1 X-MS-TrafficTypeDiagnostic: PNZPR01MB8490:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0JjMvF69wmw3RwFiXgBudMz0XE2GTlHQeR4JdZTXP48cJgGy7xmgiMJas4aDxfzk7fKu4+JJdizSy6e95pEWiMbgp+zAoWWLvB2JIHfLNPMKPjZDwuiYrxvn2g3ysCwAQ1YGDc65aAJWZwVYo88BEE3yhjQIhA85qkXMNXjVhLEdYiJ8VaPuNBI7Ez+hIqVKo16UJYZFQO1x8HFldbO25brRZP72dFTBLc6v6qfGON8QSlxvrvIGJvV8jj5vpKnaVh72jFO1Hj1UwocvZoFY4yrJRlX7t9TLXHCy4aK5v96oIIYYbcsGzGSOMIpXXtGDHjmmKb7rAyMBsyPHqMy90X62uyx5r7KL0sp6Mzhe5l7fylsIryl28xgX2J6Ay3R5IIPd/OY8m7k8rIWF7BelAXqfDtGvabQ6PzhZn1DdECxEC0YDMKCEOtMpUE0OtKNx2rmUzx9hn1hQmqm4hgpu7z25qUPaEbH+GS5NpGU61jX+j+ACoPgaEUEuTTOaVl9p9I5R0p1+7sRQIZoCP1eYFMwVsij+4uqBzuX9RYB9DEosy6KYT/y/L2FQf8z3IQWVhTlfOMR59Qw408Qx7swAL3j04tVyNBBYzkOrVE9bsJJYnI1F2B6LOipUNM2iCQ39Van+TwbaSGRD9E9geYdQUt/DjWboCVJapWU+MPxIf11UR7Y8HuPUZ6tObjD/3/1b9mqCI5atYCOzCwMZHy71TRgOu+lWkUzDIkKsieVvI3crkU1Sbwc+otHnESkc52CrA/QT+as1SYr0beqvmT5GX7uuS4OMSflNCu5I63nIVt0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(376002)(346002)(396003)(366004)(36756003)(5660300002)(2906002)(44832011)(478600001)(8936002)(316002)(66946007)(6916009)(2616005)(38100700002)(38350700002)(6506007)(26005)(66476007)(6512007)(6486002)(86362001)(54906003)(41300700001)(52116002)(6666004)(186003)(8676002)(4326008)(66556008)(107886003)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wMdB/b5e803rGhlJYZPRI7z6knNb2cTRxAvYjzc+kJsSFfzMJxCg9oR8T+ZKfxlE0h8tDB+5qO25U5qd/khe5wnPTZAPTABV7xp83RDU+lXvHBnfrX3Jw6wKxsDJ4CTCndqPCVwuPXDyxuuqDis6LuVY2nDmaRN5QGvN/noeY6yYsTCGB7VoNI7najbqVLkm1e203O4F0iPognMa57EfT1ZGuCcIwLLYiIQHH4Le9TNcfPw0We2yn/J11g9YFjs+Sv7g3CP7W2SgUVzaikyEVXiDDL5Fo/bogU3QAMTZ/j0efC535jmUUvnBYb1qFKNbQlN8TP6JCQqjYLeCqL7gxRCkMeyXDIQSfvbxvEgUwk1k4SYKyPlhFxY7jcsUJutXA8RdnF7MIhtZjZxF22/LQhAcJSE9SN+zmyCTzbI+kl5OY5Y+UIBGOZgfxd9pdCdDqX0cv34Urqb1IriDZapfs9KhE4vAjgHDuR21AywfC0lLgSwUdanAAezMW8GYVqfLEdQXZaxaNI3vJWMTOeGXI6QNeJGlYilLEOfnIfyP88foAdZTVjjDbh+xBfyECTtnjI691cmLWay3Q3OOaNKXPNB7J7+pO2rVdvVv6L8tqGUKL7WbMFfjQ7qPBLWRjJzrQ34NX3DhhomMupNKiBLMRfT23ylwvqLZ7Qxp7QoIATVZuvObRYsimZdIV0Tb8EKiH7TM2gcS+x91zJ9pIc0fRCFuFZ3iDD8ZF5pTxHC6YjwKHD5XYE+jdNZwZkcyBmHpaubGyvtqnx3ctRNth2jbyKjjbIrzP1Lzh6QsnRvaFVLaB7LYjc/sOptbgjFtyvuveB1GQNs23k9Li6XwNDzQj0F06LMJdFp8Y3kRa7yoS1rMV8bInMdry2GNNwc4QnH7ap1v1nyDej5uFU9bplTOl98w+XhAcar+MncFp3rslAmH5ZWjDMqJ4HBWbiemoCiq+ek9Sa3P9WiVx/fjoQRqPnvsbBS2u8+qQCU0OhTesHtA8gH/8cIZldwTP5nLbrrnIjtIUN+Ch1CNrr96j0dnuFHF5U5oveFkmHS78RZWjHSmatpwcYm4a/D1fSJwEjlLUYbtiatRclxFbx7bRAklGwVdDAiCul48oJs24TmNt0+Egf+gmJrxoC6jJ1444QgvbfNEUjoAJO4QteMaBOTpTfZ2iVCI0KZQxWGZF1lnVT5F+mE/CysZpCHKoYEC+8FoJcY0NR1XxOkbVHbl5SaKRJewi3wLS9diytr49NVH5+9nsqMRfd8GU+u8KXuR/BcAhkYyyI6xIs3akHo48NFul/dvV9Dus2z76qeJn+PwJ9DGp2wdCUxiBJexXeEqTsNNrAa/KcTFtvhWW/E7XqQtr3bGxMKrl+hgrxL1lQ+Xzk5hauySfZ9DXmc+aLd5KUqPW4CDPyoDeMMCysbxzQqsce2/jQbzdEGD1u3Xi+UNdObl8pCLar+GvuHIGi6uhsQ74cj7fkomQ1BmTr1xApvTsmCETKHihe4deghXlsd//ZxNHFYSaLeN3c493AmMVDq7Yn2saE9RE6L/YCmft2VMSFbpDWmNG9NCmP2dnLy+VQF2PSw9QVYNcJpIlBzvvv9O X-OriginatorOrg: kpit.com X-MS-Exchange-CrossTenant-Network-Message-Id: da074cad-cb36-429c-837f-08da7c37a4e1 X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB6712.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:52:45.9821 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3539451e-b46e-4a26-a242-ff61502855c7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0ar+vfymNxqSyAYrLRu9RC6a4lqnN5mLXyyCkqaSEbPBSIJm0Ej9XQw6kxqCRqFsc2yzkqt1y6n15fpHQYy7nQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PNZPR01MB8490 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 07:52:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98206 From: wangmy c-ares version 1.18.1 - Oct 27 2021 Bug fixes: ares_getaddrinfo() would return ai_addrlen of 16 for ipv6 adddresses rather than the sizeof(struct sockaddr_in6) Conflicts: meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit e251d7b827d63277a36f1b8094d992303329b866) Signed-off-by: Ranjitsinh Rathod Signed-off-by: Akash Hadke --- .../c-ares/{c-ares_1.17.2.bb => c-ares_1.18.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/c-ares/{c-ares_1.17.2.bb => c-ares_1.18.1.bb} (91%) diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb b/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb similarity index 91% rename from meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb index 80d711a36f..6e0d0fc38f 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" -SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" +SRCREV = "2aa086f822aad5017a6f2061ef656f237a62d0ed" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)"