From patchwork Tue Oct 15 14:29:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50710 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 49F01D216B7 for ; Tue, 15 Oct 2024 14:30:06 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.15030.1729002597713020677 for ; Tue, 15 Oct 2024 07:29:57 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=00181c24c3=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49F5weUE004343 for ; Tue, 15 Oct 2024 14:29:57 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4290r51n9c-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 15 Oct 2024 14:29:55 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ffc1ChJInmwWStGyGDzQCkokWfdtjMjoZ0PB18tmXJs2Xl+FsSC8S7yiko8OK9M94VYPdpNElBHbib5ed058lEeSDgYdxuARnHkcc4L3GTLt8EGtHfD8U4Iz8REL+Bg4jC9yxQgYEj3MBgUzrij+KDNgFhomC8bkyPk8sXojLpbnvoeXzBXhyGowkHuN5E9XVJ+7mN2GOj3dtxJQWBCKXKuMnswJn0q1At7arcWsnRHeDab012dO9dRZZ+TAUa7XN6geJ7AmPMj6FaBNBW+Fbu3IA+adHoyYr7eZEtAE5Ktanc5jyq6f4/hLud1HRgDcHF94Mc2ONyjnvuawmJDFqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1XDuCGaflIDduqk0Z1NNA6A40owZcw2NJ/+ndzpk1Ds=; b=vYwwlx7uT6wp2+20gd7ZF4leC7ptr24KrTJkb48FiwT58kyYw1LzM44Z1rsJd1s2Pne+05jYTSLOaaAHIlgBM2PYrj+VUkfTXr3RY0ragIbvHGFCqHyBmdH+EPreB3Ri4tGayWiN+IjBw6Xyth5orR8rhvukayISp0ZOmzs/o80KUX4NL06rKn+hjM6z2bKjj1itmQXUGE60GROVzQ5zpjTh+0zGeMb/deC17MovBbPoG5/y8u+dBhqNYHJycKB63nbKbEHwZ8J2ytdPLRdO2G6178Fyvsb+YeJz/IFMl3CeqK1L0yL0/kIisr8WkSwP1IaTavAqu8GKfiBtxVCeFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by DM6PR11MB4532.namprd11.prod.outlook.com (2603:10b6:5:2aa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 14:29:51 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.8048.020; Tue, 15 Oct 2024 14:29:50 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/3] rabbitmp-c: upgrade 0.13.0 -> 0.14.0 Date: Tue, 15 Oct 2024 22:29:37 +0800 Message-Id: <20241015142939.719707-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SJ0PR03CA0272.namprd03.prod.outlook.com (2603:10b6:a03:39e::7) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DM6PR11MB4532:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d9ecc5c-1e86-4481-55ca-08dced25d3f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: ccJH3eHGNAlGXRTSNJb0yap4Nh36z267ccaHfnNIghEf+mq4xSwKw/v4JXBT6aAkWpOw4YuyggEgs3we1SqGpMSAkTz3PvEJnVr1yTeYZEXAWoE+hei3I3VjTJtVn6d8Ej+n7N3qFFqI3nHNk+BSFQiq8D5T2S9Wg/3ai54XAp35tbHJIKREDAU7nuDr0nWor/31n9LbpuBb0ON/eSrsCgQ7BPX1BGIMsAq6gHnt1qdbbcp/pGKnJUXne0pK8aF6ScREG5FhB5y8VDO9oXqmjAOBszrMiI4vTMSdrnrx6AEe0ANR5w5zyurJgtOvv2hXI2zqpfWqf8PUFHD3Ja/QxXn/QjP+CfFgapTkqpeuU3CxMsq/KxVj+8HacWBxJ5ERdrND+Se0PJhnygjaItWw6XJb8hSsmXbTrVTSbPmTkv+JuFU8unrbg/WT3sGjyYfXQsdpuoovef2d/lYxt3YUmnwIrJ/9wFkUwXpT8OQ7yLFeWOTH+gngS1uWgFw5nqsFeQqeFy1o/bMQTUzG66ay7Pw1UY6/D/nRlQdh3VF7vox7Qjvrzy916HTaL/VgQf9s3OkCI4Nisw4G1Ku4H1OETUpN4VuW7sh9GsNw1aBEwFfzRIbepSSVKHeeurQUd9MNrfUmNBnl+OeOrtAavvQE17Mz55QUTYDP2daw3GZ+UQ9LMuXH+I5M/dIpf5lLmKzcuYbcqMd8I+fGVkVieIMkkFV90wg36jafTRTgrof85ByEkBlPqHWYbATZQptHZtU/JlDsGi83otgAiU/hS2Ev6q2z1wSpm2LjBLUmViJtuc+6C/mxg1t3+IpiZST0zMpSoBJHJb8jQWZbjD8ojDVLtb7Ss63E9S36bYA/yNzANHUbj5Qs+QkK55xi4zb7TDr8W6hlLlT3+Hc8Gq6eqa9Jhvp74C5J2zOLmkgNR//XYyzNozov4BU+x1AazC8NUYB+GwKJH2dmd1PNsAqGXJ9Ol68jAGRNuDed/inM+8PMcZepu+a4kSvJGOgzNscU2SRtv58/NbX7XrUlk6BEaZa7nKeFWi6RQas/eP9BcrJvZlQ+TuMBEE/H8o2NP9WH5Vi4Mn7xgkftuNLjRsVZBgeJ6LSLPQtNSUhkrlI0j5A2cWm+G4fKdp58LiDdGXHgnvL4Q94V8vYkMU0Qaqi4INPDe/QzJZ6xrKi+JpY/GYpX8iohBOurtO7OIsxSXkhpan6CSCoUiToZf4/qXiIj+DUcYDOr6jhki5c1mGcrMfJzRtwx0YXTyfja3QuL4zA/lMsc1N0DMDEBuQqrcptfkopFm/usj8D1Y4eHfpDsavtCFTjINWHwbR3oL3fwG7AvQsYOSuosLRLHx756aW7CE7OpTg0ubfyx7jf9jJGJJ3dxgHU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9bTyPfi+XODpuC6VtQo9yfnFPQZiOYdyGKKl2ZSO3vRjG9wQxD+OSh6uHMrLYLyD/DMtXHaZAdImGg7ELuiz8ELyCVgobPB0+iWlVJIM6JzLtJX4Fd04Te+70yzjTE3FvjiiN8V7h82W5wLm5lVDCp6tNMg3JUuuQlkMgfKIe5H9wuJ88MS5+M8HtkE3G1eDccfmbqtbMAz8pIZ0FEf4SOf02mBv3RyP34xcWFrpqyDBB6/5l5yVz8BAlViiWF2PHx6fjvN/0FaibCwLfUqEc2nlYWUoPRKcRsu2HGY0TbQopFXFfZNnz+SzqNzep2R9c+/agfq2V9jC86GvKwelYOmghmuuvouY7w9GBSBF7hqJyYY/u8s+L085xWI0MnDBVyUY9xE9fHWYNavdVakykYubGZQcDMwPtIoJ/tO00MeaK51Cj3zmgJ+w961CmHxlxhK9cAYZ4JgrsJSRM0tNfD5z+BL0TIxhusSOaEyc+RD169mt81fn4MICSRJISd0J9ZR6o8mYP/pNuCmmKi3eyLH9FEYTwQM3Vmi0yySwaunlRo9Gn3FL+OKswqtnSSmkVcyj+dqlhOEpgNV1rGtcsK7GWUgBjxARirEZvh5fdFusFCpB5HXOLdWwxu8o1JAtgh8AbuqhH/2sSBDpOskGUToWUGD+DXqOvaee87RhTDKJ8eOTuSv+H4mIFieR/hmiUWAfRwZ8e4XUb/voW/3GhmuezlNwAPHCUcKTEW7NE2uGSSgMW00zFd/0cOW4lO+skZCWAfutE1QL/YGKG+moBOondp/mij5G2/9X5kLCHCFSqu24ntf2fF7iKxtVKlL09yweQpUXVFt+AR9tQoecDJPxJdGgw00CBY+awYUySA0eCjowAp9eyyZu7zG0VwvP5DjAiZ+CSzA20A9XslUCaBPrEYJkeP3p+TjxTPD0Vjc6iyBcEyYXYAJs9nWqHPZJoh6ca4mrlcqwFwVik5fAMV20JjDnGxJ1LiQ24YwejjTkBs1vnni73S/uz1nMoKqVYOnl3ESO7nAQL/rUI48SqjVMDrKHY5sMAflpo/dZv1CimO4u4G6zd+tx3YTLjS25V3s/80IP1rZaqs2iJPLQonTFFz7YMZGH/r6uu1NRRyQK5NphIJ+LMuuhra2sr2CndlhWeIpHL67Vcr8LXwMXzH7/6lywXGrme7s7UWNS1Llf77KuzVP1YZWvMOq2NtDT3KlUcW0L7+m2h4qhVO5/nG3n9He0ldxhs+x3yMQJfgOacBYCBrYNAaexagTSP6hOV8wKs+5unfJLqikexE0e01c+c+r4idhPap0o+qjNGs8oKm9sSgrsQ6KOlJO7wMHlRCmiuCtJkdqXpiYn8or5WO1fs0YorX5Iz7gH408NxVNcKIofcamlXT82Br8haIOjsjZSQEhyTsxDKcp0XjvcTC4J8wVo6N/uH8RgEERCinwWqL3NaOil7kGRPx5uWrfKg+dgec/MpObPM3bywrnV8ih5FnyE+gb4vdJXmT+pK4fkWu40/KvnlphmVrDotEnfzbSmHBH1TzTI+wrvnTCLIdSyDU6C7BwSXv4Ml9ztlxoBjRZBpeJQJL2pK20Tjt+K X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d9ecc5c-1e86-4481-55ca-08dced25d3f4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 14:29:50.8206 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gYZ9C8LH+7UIKqAcndgdOV2c6iWFS/60n5WOrOtexhDvjsxrgzwDXmg+MkStlNu611f9zG6e6Slm9xZ8317cPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4532 X-Proofpoint-GUID: 7c4ueOCf1cnMU7m-loTxnfIpbKSkLsda X-Proofpoint-ORIG-GUID: 7c4ueOCf1cnMU7m-loTxnfIpbKSkLsda X-Authority-Analysis: v=2.4 cv=ceSArWDM c=1 sm=1 tr=0 ts=670e7c63 cx=c_pps a=6DIaztarb0XTwjBPIWoXxQ==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=DAUX931o1VcA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=QyXUC8HyAAAA:8 a=hTmRzqaApGPwTaGWJ2MA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_09,2024-10-15_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2410150099 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 ; Tue, 15 Oct 2024 14:30:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112928 ChangeLog: https://github.com/alanxz/rabbitmq-c/releases/tag/v0.14.0 Signed-off-by: Yi Zhao --- .../rabbitmq-c/files/CVE-2023-35789.patch | 131 ------------------ ...bitmq-c_0.13.0.bb => rabbitmq-c_0.14.0.bb} | 4 +- 2 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch rename meta-oe/recipes-connectivity/rabbitmq-c/{rabbitmq-c_0.13.0.bb => rabbitmq-c_0.14.0.bb} (83%) diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch b/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch deleted file mode 100644 index dfd1f9875..000000000 --- a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch +++ /dev/null @@ -1,131 +0,0 @@ -CVE: CVE-2023-35789 -Upstream-Status: Backport [ https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 ] -Signed-off-by: Lee Chee Yang - -From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 -From: Christian Kastner -Date: Tue, 13 Jun 2023 14:21:52 +0200 -Subject: [PATCH] Add option to read username/password from file (#781) - -* Add option to read username/password from file ---- - tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - -diff --git a/tools/common.c b/tools/common.c -index 73b47e25..7efe557b 100644 ---- a/tools/common.c -+++ b/tools/common.c -@@ -18,6 +18,11 @@ - #include "compat.h" - #endif - -+/* For when reading auth data from a file */ -+#define MAXAUTHTOKENLEN 128 -+#define USERNAMEPREFIX "username:" -+#define PASSWORDPREFIX "password:" -+ - void die(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); -@@ -125,6 +130,7 @@ static char *amqp_vhost; - static char *amqp_username; - static char *amqp_password; - static int amqp_heartbeat = 0; -+static char *amqp_authfile; - #ifdef WITH_SSL - static int amqp_ssl = 0; - static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; -@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { - "the password to login with", "password"}, - {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, - "heartbeat interval, set to 0 to disable", "heartbeat"}, -+ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, -+ "path to file containing username/password for authentication", "file"}, - #ifdef WITH_SSL - {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, - {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, -@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { - #endif /* WITH_SSL */ - {NULL, '\0', 0, NULL, 0, NULL, NULL}}; - -+void read_authfile(const char *path) { -+ size_t n; -+ FILE *fp = NULL; -+ char token[MAXAUTHTOKENLEN]; -+ -+ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || -+ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { -+ die("Out of memory"); -+ } else if ((fp = fopen(path, "r")) == NULL) { -+ die("Could not read auth data file %s", path); -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { -+ die("Malformed auth file (missing username)"); -+ } -+ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_username); -+ if (amqp_username[n - 1] != '\n') { -+ die("Username too long"); -+ } else { -+ amqp_username[n - 1] = '\0'; -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { -+ die("Malformed auth file (missing password)"); -+ } -+ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_password); -+ if (amqp_password[n - 1] != '\n') { -+ die("Password too long"); -+ } else { -+ amqp_password[n - 1] = '\0'; -+ } -+ -+ (void)fgetc(fp); -+ if (!feof(fp)) { -+ die("Malformed auth file (trailing data)"); -+ } -+} -+ - static void init_connection_info(struct amqp_connection_info *ci) { - ci->user = NULL; - ci->password = NULL; -@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_username) { - if (amqp_url) { - die("--username and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--username and --authfile options cannot be used at the same time"); - } - - ci->user = amqp_username; -@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_password) { - if (amqp_url) { - die("--password and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--password and --authfile options cannot be used at the same time"); - } - - ci->password = amqp_password; - } - -+ if (amqp_authfile) { -+ if (amqp_url) { -+ die("--authfile and --url options cannot be used at the same time"); -+ } -+ -+ read_authfile(amqp_authfile); -+ ci->user = amqp_username; -+ ci->password = amqp_password; -+ } -+ - if (amqp_vhost) { - if (amqp_url) { - die("--vhost and --url options cannot be used at the same time"); diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.14.0.bb similarity index 83% rename from meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb rename to meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.14.0.bb index ea80ec334..b0556ffc0 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.14.0.bb @@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7e12f6e40e662e039e2f02b4893011ec" LICENSE = "MIT" SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \ - file://CVE-2023-35789.patch \ " -# v0.13.0-master -SRCREV = "974d71adceae6d742ae20a4c880d99c131f1460a" +SRCREV = "124722b5045baa41a24ce2e2d7c52a47467e7ac0" S = "${WORKDIR}/git" From patchwork Tue Oct 15 14:29:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50709 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 49F2BD216B8 for ; Tue, 15 Oct 2024 14:30:06 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.15036.1729002597475527281 for ; Tue, 15 Oct 2024 07:29:57 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=00181c24c3=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49F5weUD004343 for ; Tue, 15 Oct 2024 14:29:55 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4290r51n9c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 15 Oct 2024 14:29:54 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LKSYdQbHNoxhStXA2qf3eWjTBwHfms33EaxQZ3kRkY7pPnX0QUyPXUTdPDi3G8Y5oXB+Cz7yfTdgpSVMtNTemBa9kxtVAnIB3caOMRwdw90+HOjK2fUPGtzQdlwZHFv9rNaAMIOS/zVrM6/iChA9kdicKQLFKRUvGz1MZAZ77lhnjCKnRo+Es1JhuQiSvld0gHtfySDnk2B508CplfBdO1CbH0I+agBABFmZ8IAz2bBwSep413rVIlfL0A6vz7V0ZStemVtCivyJUkmFfme7/l86SYVyDJL1Yn40S82tH2moLvjrS5T1iE8eff4wOazqNPLLW7X6V+U+m/CMUWMIQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=GgYkIkJE2G99/G7czoExSSrvdv8VMh9zVreUR5B44YQ=; b=Ej2AT1bQZJ1wPmbEFnG36h3ifemUHg9sg7MAmWmNimU7UBhYPs/yih7ezEv3sZWbYGi7NZifGLD4wj8SNu6wknNsFkmZG4wZqig1QYbVRRXd8HLrEGG8852JcC3gFwAwVRVWHFbYzL+22m3q3IzKYUhWB9hczYK79tufZz6YtKh0scLviViN4XPdYeh1vesgU/MbZ625CyWeZhgCnu51IV4gD34AXqWV8CAN6ba7qTIGu+L9UN7rKZfVDpjXKDiWQJDN4LzSJ6q1q+OA6X9s0JmZSxo8/AF3VZRG5n094V+/i+4nOl527pB/2BcRjUq1Xe4XJDHw0Y8zaxC9iHC5+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by DM6PR11MB4532.namprd11.prod.outlook.com (2603:10b6:5:2aa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 14:29:52 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.8048.020; Tue, 15 Oct 2024 14:29:52 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/3] mozjs-115: upgrade 115.11.0 -> 115.16.1 Date: Tue, 15 Oct 2024 22:29:38 +0800 Message-Id: <20241015142939.719707-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241015142939.719707-1-yi.zhao@windriver.com> References: <20241015142939.719707-1-yi.zhao@windriver.com> X-ClientProxiedBy: SJ0PR03CA0272.namprd03.prod.outlook.com (2603:10b6:a03:39e::7) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DM6PR11MB4532:EE_ X-MS-Office365-Filtering-Correlation-Id: 3634a355-27ec-48c3-03a0-08dced25d4b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: cKF2GZUfH5ntiitxALY48YNFoEs+00aOJrtL/WNB57g/bvY62zXEIuoRaewplFifw6XsEq4kI6tzdAGtAHaVxlL4hI8f7IcY1e8ee7DcGsY9WBQLMQ2+ylqUe9nwrcktX6rd92KrZhWYJeAUiSyucWQ8ZbAttIHMI4BN95ouFWwxxBBownPzGEW0hu8fyMUm4x6RaYsg9SIuFJu4TRg63XqRpVYUuf5Q5kd00U/1z24RoQsAd+gtRl4tvpeCh6xqZpeeJAMHaPNUroIkk124/dTNvrhn9QgiXr48bz7FQdfSoYr9RSAERSHs9dXVPx67vJL98kM+94As+waQWf+7bwZvq8XoIUwZl97+Fuzzq7UCmovrPTdn/rUGDBol96tALctW7Sqwwy53bjMvfY0Wu8Bq83cs42uKlW4YMe/UIUx3hW7YnFWw37Dmb1+XmqouUaNcpsmHuggYZPIiEQWccHadP/BmQanGh413gQyL5rYaZ8Fqdz53Eie63N2RKNkpsRYr9b/GlbHLWqJLbfvLYBmfh+yq0wn1G6haeeXozQcRt8O1r8TExeGY7+tT+Y5KZOyvVRv9yrITc4f3R3pyus9n+uu9GRh19LxBKJ2CFenIKViA/r+4ypY4b/R0NcYkCTXXX1U6CqgWkBdvz62u/gKWP+Xa8s8P5FCzN7mSCttTAvnK4oCdtKhxhmbqa/dTYyBLZJULVjnqQVmd9hpavqO4KlMqvBeq9Dk1jL6vxR1d0A7iU3BhxJmUK2GlaNZqPvcKtEKHjNs8MFyaL4ZpcuF0R7rTM57IIsLZvBsdFv9xYsh7FKfkqgMd4wBrPonzYII0b1dJgL2s20iUQppBVzYwfP6irpurw90lFr+CBWeHcBsvO00uWYoPAu5T4L5F5EUtBTtSD/7E/AmTpBS3tjJZCbtQ/mbYn+GARHIik+zFlZbOeRmQJWNW6BHjKvYfn3Ryi+Tu4KlkBvMZLT2Axt/deOVKsYAdrPV1rNI72GaiDo1KRU3s5HOfRH/fc2LPcPwjqP9Dzr2qDzkoYpd6AyXxxRGKt1L+s/AA3dZagEIt117LTawaMWvFGCGqvdANyVaYZ29oMO4xvfmF/4Vectt5qQL0Lj/kGvN7m78ZwtB86rfpnV4zJZOEa36DXLp35LYbKdEgGxQc/47IzAhQxz0jydmuBQqixXeM2Nv09mpHM7otQZNtqDbYg5Bu7FmTLFzsF/7HP5taerVpDu1GsUDiSZwkQaJocNtjDguKw/xL53KqRRvhNZ5GZ2LybLgQki21dPX86dbzAJ3AbmRStVrFSq73na6/Haz6hfc1RjmJgnxuVli6l5NcfUp0ZXL324mq+RU0UcsQtZo3P0AaeA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iaVPaK6mxcxWhI29NFGDw5oAcsz4NnFE2l1bscWZIUByUwev0hyIyKxRYSa8ltmHp8K9MXrc4JbPF91MGz10YDYQqDwhHRjRR+/oICsEjpcgQnL3/f3bBOX75k6euoRCQfhr2carnLZbXNUKGNmQ67+L4tTU8T9dszv415WyXzy3kNMoLCR3HzCHtw5XpdmiJW4V6ZQJvKfUspqxqK+EEINvbluIOX+1psWsia2XUKuUBhQYYJkj1NGumSL6oU2wvvegHHe1fU2N/roSooJZgJVyTUIUmiTiHRRieQ4A3v1QXFBRjq7f8LrkNRgyP/f6tt0UyHXdrbgcnoESYQwkLR5F9kqTNLfMO+xln6L/AXExpgn/0QwolQBtx+/DaiJXIM77s8oltUZcu/HARiotBpUUTVqOURZCkHaEqaznURhCejka6zdyZBxtIf9bBxwVvQiduYawiBkZlnujBbcAQ0eZCkc+3ajKIHp/E/kSwuJyacRgCxkvccMsqOXb6997md5J4KawQETlfgtkcFNDRgiazfNn2RoTTnFhaNiFigLAqSIbknTiSybKZpRP8thHPcjxrBwYe4ecpIMIwHiCoOY60b0WiyoBAwCT1mfmDR2Uw388PV0SCLleg6yA3HVH1nqrsFvjAFwMNcDsnx2mstBnAz7GTyKcnlPUvdGbjx4fMw4qUGCRaK395zo/LFX5ElJE9qCD9AFuid2z86B0/X+Oey0nvgD7K8+e8Jzv4P/udSU9iG3hcyBHIlkpLf4Alm2cXRMX2R3ia4QhqZGVHe9IUzCYWP/A066psmXsNPEnw1SlRK1K2x4sHbUenQeiJQUJl52ThYrlfT8vDxMc82uM5vzu2BUOgUHaq3NJ31CnrAGDYfqlMP/OuqJql3CixT8Qbx32NyTHhs2Yo/Xk1fEAuPNiMyIcET4ZnoMP4iWjR2Jkyr3uxYkP18ifgdu87nbc0MkBqV7ajZRm0aHG2tbygTXt8xenhvfR3KpCGe2oJaHJfk18woJStLB9TNK6dN4ghOki5a1ZOaZ8IK+VRvW+oDU8zfqwjCp+cg7t4diRPQt9MFRpApM0utoUhGzzPk4RVABw4Ot6oDe6BTz+MfWFw0l3xQ8N3mwYVyXYTpBTEEB5lQHHG8IQJHB3CZarrbpI7rfRMS6oVRaiVPx9D4FNintoVLMpUAvTebAu6bnZ2xMr5k1aYpZhj8XgZuH3veEiG06Y+mP1StoTvx30Zb2xXtj/XRZMtScFrACoGDQm5VjrfSohhUeDfH4S4n2tTb7K885uep2OMfLfWEnagaLHztpr4ExiiIthXzTsRhmVxS58e39QANQJKmj4LfecbKBrEqQ9qyM1WxTbExU1E5xyx8/scXaU39cmkykaa5tl7/oLv8HHJDuibqaf6EjXN73yE/mby3KFeTqK4WNEnC9ZigtVJ7cEqDG0f1v0rZExf02ytgMrkE/g+/nuSMlUFf/BuiOlmJWRxg6VxWL26A3ukJ7ouIsOhsGw0LzBhBKirSXoST/LI8dkTe5IJzeVtqZ3YQGTTofX0yZwMUqxJtDlScz/UNjapegEbUfbhJYPef7lnJ2meoDVdEZwJy8h X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3634a355-27ec-48c3-03a0-08dced25d4b2 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 14:29:52.0626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6VUa4Ii9aiQVeqMttp8XyylF5Xl9LRR5dZ7pz+LABCz8oTyuXWC4Ewg55+7DFRK1znCq3W8pyJUIUlBpCn01Lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4532 X-Proofpoint-GUID: bFaJXkg5934Oh9xqTluPvXUQrHiz9iC8 X-Proofpoint-ORIG-GUID: bFaJXkg5934Oh9xqTluPvXUQrHiz9iC8 X-Authority-Analysis: v=2.4 cv=ceSArWDM c=1 sm=1 tr=0 ts=670e7c62 cx=c_pps a=6DIaztarb0XTwjBPIWoXxQ==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=DAUX931o1VcA:10 a=bRTqI5nwn0kA:10 a=pQs5aej7AAAA:8 a=t7CeM3EgAAAA:8 a=xNf9USuDAAAA:8 a=tYXVMe6-G5jfjEBI828A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_09,2024-10-15_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2410150099 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 ; Tue, 15 Oct 2024 14:30:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112927 ChangeLog: https://www.mozilla.org/en-US/firefox/115.16.0/releasenotes/ https://www.mozilla.org/en-US/firefox/115.16.1/releasenotes/ Signed-off-by: Yi Zhao --- .../mozjs/{mozjs-115_115.11.0.bb => mozjs-115_115.16.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-extended/mozjs/{mozjs-115_115.11.0.bb => mozjs-115_115.16.1.bb} (97%) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.16.1.bb similarity index 97% rename from meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb rename to meta-oe/recipes-extended/mozjs/mozjs-115_115.16.1.bb index f25c5a8f9..d235b252a 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.16.1.bb @@ -19,7 +19,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://1849070.patch \ file://1894423.patch \ " -SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" +SRC_URI[sha256sum] = "c3bb5a210738ca0f8cd26aa53fc4a07560db079c06cd0421cf35af4035029367" UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs115" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" From patchwork Tue Oct 15 14:29:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50711 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 4ADC5D216B0 for ; Tue, 15 Oct 2024 14:30:06 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.15037.1729002598323721780 for ; Tue, 15 Oct 2024 07:29:58 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=00181c24c3=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49F9Vn0Y030285 for ; Tue, 15 Oct 2024 14:29:57 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 428hm4aamg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 15 Oct 2024 14:29:57 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=go8IEKdVudsiWoeqPOh2cK3RwfX2Ij5oH7g2H0gfp1A0znyo62FOLOkxCvz6FxKJVLGe5jXOc/jFaxTN9qz2npjNzdi8WTbqjnPlPmPBPLjbYCVDdgFm0HMf/XMTfKMLhcJ85AWRRXkFjDjqd6jTtPvONcm5WiWhv9jLo2+QUs7oaRwOAoBjkRW2k2t3RJJ8Isdvv+k5U4EAwIESwhRrs4HN6TCmRIqrZqUSFNPhK2bj6qTW3Rrz1I2ixI78KoEoI+/EzUi7ECygdd+kBfSmAXIsFfgrqacl6HdHRGYQmdzyC/SM9h0St89dUglO0AnCMgTKjrPvv33cu9E2bZMVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=4zu+CvXDiYrpdPxv+Q1CVKuYvICksq0E+KvKUjyd86Y=; b=eCNibg0q+tfu48ceA9LLHjL7EuewJRZM8koL+2DPWgtZtkmnX58bGACqHlGB7abjmmOJK0oaHdRI69lkhtXgf3RRlHY4droWvDzOu63zzVkSzxZZU1F6AJdF1Y1X2RQ2rxTQBCbXpbNTNwG3h83Ee5qztKU2fzldM9rvWxPAEyjhxA0B9vKkkqnhArWLTKMWiSfC5F+wIBk5OQYE9QCmA74ZUlp/4aLfHmXrkR0tj139oxndNqqa2ITG5vf4gYEdQt6HIewtREXMuGmXYZeoA4Jat7LV5aePy9CWd1Jlh5GNZDR5cD6P292amXu24plrGEb0zvkI61tzSKCZvhfmaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by CH3PR11MB7203.namprd11.prod.outlook.com (2603:10b6:610:148::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 14:29:53 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.8048.020; Tue, 15 Oct 2024 14:29:53 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 3/3] doxygen: upgrade 1.9.3 -> 1.12.0 Date: Tue, 15 Oct 2024 22:29:39 +0800 Message-Id: <20241015142939.719707-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241015142939.719707-1-yi.zhao@windriver.com> References: <20241015142939.719707-1-yi.zhao@windriver.com> X-ClientProxiedBy: SJ0PR03CA0272.namprd03.prod.outlook.com (2603:10b6:a03:39e::7) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|CH3PR11MB7203:EE_ X-MS-Office365-Filtering-Correlation-Id: eb56e73a-51cd-4f76-5f62-08dced25d56c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 3LvzFbhSlYXpGHwaygC/nlZB5OuugZiUG7YG+dnSsDM4wQqEAnW0SsYTw1nd28WLY98bQa0PkeTTGiOeXA8PIiies7cgT37nk7BFYzd2WvxD9I80AO0Cgd2+Nry99MgOH64ft/s4P1yFYUS+Fe+XIBovXjjEh3sLHElSdSPeW6txlhbbF4tVq4kAyNOhaErZkrfKZsvFoMR8rINK2dgEom8vdPjziizIECb/FhLLDcWqr7vwNDr1zNqd6OX4YOGvihhkbW9QMSWbqv4hAaringGEStd1vIV8GkxTKPSDKnIQRdnEA3PGWMX0yiFe3QN4M8jwFRGp60AdCSfYGECXvrwIcA6jSDj8Ei+OfyuInj16Ezn1nQHn2rY0kmDJzTSezog/Nk0l8259x5R4cZWgNvfvC8LFcmq1Idts8DLjIJLy6a8BlTIZcmjgduepXv5gHyVLRkU70csCYuQhHbXuiI+mzHUMKpOqs/G1ZY+InZcCp0Yol7z0GIxSojq1onySg7Ozu0lZ6Y4UYZR2WA5wcUtHHdI3PjWNp76vOVdj43dhNrFkfUkV+IbGXRUM0A7f0Q3mxDHr1R0f0qHQ4f5P9na1OGN0ReqSF0Rg8OvO7a4UETMuFRAAi5nl1cUwe5yr1xgBzWjeIG1FsleQU+FsT/XXbr5CZIPJcZE+ztCtLhWx8VEcbZkN7a142CvF4vs19eNenEseERcLOOxxOzANrOcN8VaklMrOXsGE8PhI9JagRTBfL2I/rbM9G2EF41+QjbOkZbpjABttyy8HRb40o8vYsTp1+NijiUTPFP0C24AuQ1jfO1VI7s70rkHqc7U5QVhbiLelt7RU56bqpQP4y4sL4oP69TjkTPNbPLwQsnw+CGhefdRHEGPAgWajB+v2Zh7RmLIAXm+zv6KVlLMsXbl5D37SU/blM00eDrk311MrOwUMmRV4HjPnHQC0z/LsdFkcb66mh4JM3/9mfGuJaghsbR1iOlgu2CZIvVieTTHXQuaS7kqoe9NctgN3RGrQQkU6vhO6d91m4Z0LiY4TqxIBssj+RU6eNnugS3reC/ZG4rvgIhdfJf5MoKEe1Ggd0PjdGBvwXRZf+DMrcxzf5oJdg/zdLpwe8RVE3xle8IqBGtqWKQlaVTP5sYeUJQo043lzVyJTaee73lOuRQVrSOH54iAH9AgNVyNgWpGZnMEUza7zEDN1EhTvXLIVoaZD0+g5AAXcCtcX0CVlZ7fsu1oOAp1AjmzMB9mw2ul3quDj0aYCpIWYHj9TVEOn04xscMvBsvc7yOwLzbtqhq4fkQBb2tzUztOf1StKmmeWMYA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bQB8spzsmgQV+FQ+OvRMZhD1oKGXgkKS/tGPqturnZGFbzoXLhf40OnkVNnXQC+7DyYPorySDbwWQkON7didiDBSw9uREsaZU9+xc7dYntHXWykwmHrhlJ0TQn++3ONNnEeLoTF00k22n+vAm6qhiW72WgvXYd9zGgYHf5dWAHWnZHAnivzW4kKThdWPLrIa8w2/sjWYwTMla71+48cks7wTGwmyg5BmO81zDSy5fZdWvk5jmDb4MvzzuCFx16rN3W8V5s5zN/6bGcHrurr+JuWkNbpues8WUyFc9Aij38j3z+znVbAkTiB/lj7RWtSKsQz0EmK/4iHQfVHxlXGSxJfAfQh6fBJTB4HK20mNH/7i8C0mptVbLn83neRFo45duplvCAN42XuvGtvg6/BGXKkgOY5cXzYc6ttZ3zRZujB/1vsT59KXZtyE+VVme1zPpsEX4ZYXAhQaiPUMP5gUWWG2SoK0XkOP+rbWkreMPJtTtwZj2AqpN5T/qi1w8HsgvMOdn4i18F9ihejJ4cU5LMn2WGYArt8As7cFKpVQNDUE9gNvRx/MynCtnryrhcmXp1xfp67xmtlIw5Wdp2OWlz/UYUhsNI5bfKIn52KJDRi8aFHrVywu9fvU6ktUzdqU3oYaPhbvvANdamQkJ0jp9vYnNrtEk+nf7RaTn/1GznmMYqij+iUjrYebYAEPuPHXs5wxVdMnw/ZDe3HNgOB1knetrD/xmCLDpgVX8CwNO98TSKZj1mjZwepyA52FFsuVWV2FY/+D0AOh6dEx0y4LIIfs6jACVyAPvSO/gIt3PytxnNBVJleJJPeDwQLExo6L7APux4JbYQ9SdlqxSZlrwBU/2EHGqf9zH1hroXgxV4ZKtz7QoErOqvLbwI63YLlrtPHVXjDYegf7FgkD/T3yG2bl/TQBt5vFJPpwM8maYIgLiBszarDRgiAibvB6omtqgV4ydY/wjtDtZ9IJSLWEQWqaRbs9p+FxzDZFk7VMXl0c6t/ypYGPISrdqLqmvAwap3bBfGppksx55cFBYVP6+npwDMz1xfIS0iG+MSh4DTsdWrcdU0IjImQ7MnM56PI6DCZybux5lcze+nyscEsfDfPPcgmilBB6RbT2NjDpFefPmiaMhIn6VdgEVYKzpyh0Xu+pmxjyhxE2xnpzf0Dq987WU0OofZyPG+Fq0EGtm5HYP+YEANg2nHNflRGRxzDM9wb9z0+PSdfksG7THoLptMAwqAvsWq9i4mZuIRigOObG//xmxGFfTe0HyAsBvdBct5cLrdBe2d5Y6vAQAwtZEkpzjRB5htiLo/RvjHol6Vt8haDFzTsM1FeW4FjIP0VpMehSxBwG9q9H1QU7cX/ofmkVhPzV6ZIhr64pEoj+Hd2Y9p/p0rJTJc7gnjFWzsGi+4pYjRbXwdU8HI/xRR8QOU0b1qPDJLWfzLumhiTOAqnw7pwDNebsyh1CmtFyO4uDXfDTyfurcabFWDW0PW89K31t3VG8RducckhsK14GhCIVRnOqoSP1fDHZpIx/0Ngf4rI0t2V0Zu+9CRbfDeiXJCl7Bt2WNK2ZTYsDoVAnJbf89qWMpu6PQjN2jYS6FsBM X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb56e73a-51cd-4f76-5f62-08dced25d56c X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 14:29:53.3257 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: y6VL+DZ30/egKZkFwQZKkf5yQEGiF4vHXkXaP8XnT49bEu1FlFGOCZS2UQLVZYiq55zlGFWrnNVMqqP1J0AnIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7203 X-Authority-Analysis: v=2.4 cv=Kqgf2nWN c=1 sm=1 tr=0 ts=670e7c65 cx=c_pps a=6DIaztarb0XTwjBPIWoXxQ==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=DAUX931o1VcA:10 a=bRTqI5nwn0kA:10 a=w20KmqIKAAAA:8 a=t7CeM3EgAAAA:8 a=NEAV23lmAAAA:8 a=k-42gJp3AAAA:8 a=8IenNxhtyOxn46NhC8IA:9 a=Xjc3AndYmIsA:10 a=ZPE7x7C7M2cA:10 a=Qf4GdZp0wr9wS1Hk4A6d:22 a=FdTzh2GWekK77mhwV6Dw:22 a=uCSXFHLys93vLW5PjgO_:22 X-Proofpoint-GUID: Sl_5VQ9_6sl7D2Z3DjSsEM_PhSq2Ue3J X-Proofpoint-ORIG-GUID: Sl_5VQ9_6sl7D2Z3DjSsEM_PhSq2Ue3J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_09,2024-10-15_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 spamscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2410150099 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 ; Tue, 15 Oct 2024 14:30:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112929 ChangeLog: https://www.doxygen.nl/manual/changelog.html#log_1_12_0 * Refresh patch * Backport a patch to fix build with clang * Drop doxygen-native-only-check-python3.patch as the issue can not be reproduced. Signed-off-by: Yi Zhao --- .../0001-build-don-t-look-for-Iconv.patch | 20 +- .../0002-Fix-build-with-clang-19.0.patch | 52 ++++ .../doxygen-native-only-check-python3.patch | 232 ------------------ .../{doxygen_1.9.3.bb => doxygen_1.12.0.bb} | 4 +- 4 files changed, 64 insertions(+), 244 deletions(-) create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/0002-Fix-build-with-clang-19.0.patch delete mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch rename meta-oe/recipes-devtools/doxygen/{doxygen_1.9.3.bb => doxygen_1.12.0.bb} (80%) diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch index 47c8edb49..6b0a48f00 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch @@ -1,4 +1,4 @@ -From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001 +From 2d587d043fc061c53c3d8015501392a804c5f0b4 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Fri, 23 Nov 2018 11:44:56 +0100 Subject: [PATCH] build: don't look for Iconv @@ -7,31 +7,31 @@ Drop the find_package() for Iconv. CMake is unable to find iconv.h in native build but all modern systems supply it as part of the standard C library. We don't need this check in meta-openembedded. -Signed-off-by: Bartosz Golaszewski -Signed-off-by: Randy MacLeod - -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [oe-specific] - upstream doxygen must build on many architectures, this change is too intrusive for upstream + +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Randy MacLeod --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06b9696f..f30b46b8 100644 +index 3adf456..ad73997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -117,10 +117,6 @@ if (sqlite3) - endif() +@@ -212,10 +212,6 @@ if ((CMAKE_BUILD_TYPE STREQUAL "Debug") OR enable_lex_debug) + set(LEX_FLAGS "${LEX_FLAGS} -d") endif() -find_package(Iconv REQUIRED) --include_directories(${ICONV_INCLUDE_DIR}) +-include_directories(${Iconv_INCLUDE_DIRS}) - - #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) -- -2.27.0 +2.25.1 diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0002-Fix-build-with-clang-19.0.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0002-Fix-build-with-clang-19.0.patch new file mode 100644 index 000000000..fc3aae75c --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0002-Fix-build-with-clang-19.0.patch @@ -0,0 +1,52 @@ +From cff64a87dea7596fd506a85521d4df4616dc845f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= +Date: Fri, 9 Aug 2024 14:13:34 +0200 +Subject: [PATCH] Fix build with clang >= 19.0 + +Clang >= 19.0 requires a template argument list after the template +keyword for CWG96 compliance, see +https://github.com/llvm/llvm-project/pull/80801 + +This patch has also been submitted to upstream TinyDeflate as +https://github.com/bisqwit/TinyDeflate/pull/9 + +Upstream-Status: Backport +[https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f] + +Signed-off-by: Yi Zhao +--- + deps/TinyDeflate/gunzip.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/deps/TinyDeflate/gunzip.hh b/deps/TinyDeflate/gunzip.hh +index 652058ab8..3ba341487 100644 +--- a/deps/TinyDeflate/gunzip.hh ++++ b/deps/TinyDeflate/gunzip.hh +@@ -1141,21 +1141,21 @@ namespace gunzip_ns + //fprintf(stderr, "both track flag\n"); + SizeTracker tracker; + return tracker(Gunzip +- (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward(b))); ++ (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward(b))); + } + else if constexpr(code & Flag_TrackIn) + { + //fprintf(stderr, "in track flag\n"); + SizeTracker tracker; + return tracker(Gunzip +- (tracker.template ForwardInput(i),std::forward(o),std::forward(c),std::forward(b))); ++ (tracker.template ForwardInput(i),std::forward(o),std::forward(c),std::forward(b))); + } + else if constexpr(code & Flag_TrackOut) + { + //fprintf(stderr, "out track flag\n"); + SizeTracker tracker; + return tracker(Gunzip +- (std::forward(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward(b))); ++ (std::forward(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward(b))); + } + else + { +-- +2.25.1 + diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch deleted file mode 100644 index 796bc61dd..000000000 --- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch +++ /dev/null @@ -1,232 +0,0 @@ -From daf686508f2ee4711d93e96e5b100e50bf161656 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Wed, 26 Aug 2020 10:52:10 +0300 -Subject: [PATCH] doxygen: Fix Python issues for doxygen-native - -It fails to compile doxygen-native when /usr/bin/python is a link -to python3 on build host: - -| Failed to import the site module -| Traceback (most recent call last): -| File "/usr/lib64/python3.6/site.py", line 564, in -| main() -| File "/usr/lib64/python3.6/site.py", line 550, in main -| known_paths = addusersitepackages(known_paths) -| File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages -| user_site = getusersitepackages() -| File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages -| user_base = getuserbase() # this will also set USER_BASE -| File "/usr/lib64/python3.6/site.py", line 248, in getuserbase -| USER_BASE = get_config_var('userbase') -| File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var -| return get_config_vars().get(name) -| File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars -| _init_posix(_CONFIG_VARS) -| File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix -| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) -| ModuleNotFoundError: No module named '_sysconfigdata' - -Replace find_package PythonInterp with Python3 to fix this issue -that it uses python3 from python3-native. And it also replaces the -result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE. - -This patch is only needded by doxygen-native. - -Updated to apply to release 1.9.1. - -Upstream-Status: Inappropriate [oe specific] - -Co-Authored-By: Kai Kang -Signed-off-by: Leon Anavi -Signed-off-by: Randy MacLeod - ---- - CMakeLists.txt | 2 +- - addon/doxywizard/CMakeLists.txt | 6 +++--- - doc/CMakeLists.txt | 6 +++--- - examples/CMakeLists.txt | 4 ++-- - libmscgen/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 10 +++++----- - testing/CMakeLists.txt | 4 ++-- - 7 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2455793..28f0d83 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,7 +105,7 @@ else () - endif () - - find_program(DOT NAMES dot) --find_package(PythonInterp REQUIRED) -+find_package(Python3 REQUIRED) - find_package(FLEX REQUIRED) - find_package(BISON REQUIRED) - if (BISON_VERSION VERSION_LESS 2.7) -diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index 63ac8e3..d37d1d0 100644 ---- a/addon/doxywizard/CMakeLists.txt -+++ b/addon/doxywizard/CMakeLists.txt -@@ -57,7 +57,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA - - # generate version.cpp - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp - DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py - OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp - ) -@@ -65,7 +65,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER - - # generate configdoc.cpp - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp - DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml - OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp - ) -@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN - set(LEX_FILES config_doxyw) - foreach(lex_file ${LEX_FILES}) - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h - DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l - OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h - ) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index ec63ceb..49a2bda 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -168,7 +168,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR - - # doc/language.doc (see tag Doxyfile:INPUT) - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR} -+ COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR} - DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} - OUTPUT language.doc - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc -@@ -177,7 +177,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) - - # doc/config.doc (see tag Doxyfile:INPUT) - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc -+ COMMAND ${Python3_EXECUTABLE} ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc - DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py - OUTPUT config.doc - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ -@@ -228,7 +228,7 @@ add_custom_target(docs_chm - COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py - COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py - COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py -- COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp -+ COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm "${HTML_HELP_COMPILER}" doxygen_manual.hhp || echo > nul - COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm - DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 194b427..248b807 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f} - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f} - COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg -- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex -+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex - DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex - ) -@@ -73,7 +73,7 @@ if (DOT) - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams - COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg -- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex -+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex - DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex - ) -diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt -index 34cf4d8..f015afc 100644 ---- a/libmscgen/CMakeLists.txt -+++ b/libmscgen/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories( - set(LEX_FILES mscgen_lexer) - foreach(lex_file ${LEX_FILES}) - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h - DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l - OUTPUT ${GENERATED_SRC}/${lex_file}.l.h - ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0e0c5f7..c1d3ca5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -40,7 +40,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) - - # configvalues.h - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h - DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py - OUTPUT ${GENERATED_SRC}/configvalues.h - ) -@@ -52,7 +52,7 @@ add_custom_target( - - # configvalues.cpp - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp - DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py - OUTPUT ${GENERATED_SRC}/configvalues.cpp - ) -@@ -60,7 +60,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT - - # configoptions.cpp - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp - DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py - OUTPUT ${GENERATED_SRC}/configoptions.cpp - ) -@@ -95,7 +95,7 @@ endif() - # resources.cpp - add_custom_command( - COMMENT "Generating ${GENERATED_SRC}/resources.cpp" -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp - DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py - OUTPUT ${GENERATED_SRC}/resources.cpp - ) -@@ -126,7 +126,7 @@ foreach(lex_file ${LEX_FILES}) - set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") - set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h - DEPENDS ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l - OUTPUT ${GENERATED_SRC}/${lex_file}.l.h - ) -diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt -index fd6912e..0af1865 100644 ---- a/testing/CMakeLists.txt -+++ b/testing/CMakeLists.txt -@@ -1,7 +1,7 @@ - # run all tests sequentially (keep for backward compatibility) - add_custom_target(tests - COMMENT "Running doxygen tests..." -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing - DEPENDS doxygen - ) - -@@ -19,6 +19,6 @@ foreach(TEST_FILE ${TEST_FILES}) - string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}") - # add a test target for each test - add_test(NAME ${TEST_NAME} -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $ --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing -+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $ --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing - ) - endforeach() diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.12.0.bb similarity index 80% rename from meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb rename to meta-oe/recipes-devtools/doxygen/doxygen_1.12.0.bb index 16a4250b2..ed0c71b31 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.12.0.bb @@ -8,9 +8,9 @@ DEPENDS = "flex-native bison-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ file://0001-build-don-t-look-for-Iconv.patch \ + file://0002-Fix-build-with-clang-19.0.patch \ " -SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" -SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0" +SRC_URI[sha256sum] = "a3a3dba2018ef409d83d81a2fc42a0d19bdbe087252ef342bf214b51b8b01634" UPSTREAM_CHECK_URI = "https://github.com/doxygen/doxygen/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)"