From patchwork Mon Mar 30 06:31:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 84776 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 BB172FF494D for ; Mon, 30 Mar 2026 06:32:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.45005.1774852324781888879 for ; Sun, 29 Mar 2026 23:32:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@windriver.com header.s=PPS06212021 header.b=l8cwbxGV; 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.166.238, mailfrom: prvs=8549bf16ac=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62U5efub411066 for ; Sun, 29 Mar 2026 23:32:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=PPS06212021; bh=GgHxSBjIYBLhUaEwhyFp 7inPDEULabAU76mjLwl1UXo=; b=l8cwbxGV9UH1Gn6gwYhw4F+/D9r4s0wVZEau NS9frjMXyAK8//NoV1xQuAxK7rhGUkuKJ8A3UfSi2ve3UIf93+2RrB8fvpAI5//1 VJAoINOnSI4NrgNd8QGTXyhIVcRP+DO0Qd1qiKQfcVgBkzSTOJYju6MxKQ/sd/Qc xYX4cVyvZQuDaakHpyig6vcPdAm7GHBFDRvuRJL5grXdVuSmTAWGWknWEmFs3/F/ 5zmCAfvKGMaHxEhjvGX7mf1ecVRRFCD1Tku/t5pEwrwq9RCLOnTa8sxYX4vLzcjO 4QG/iTpb+xYM8T9GChCtMy2eg9SHKtKhiQjn9xvB6VM/8gtMoQ== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11012018.outbound.protection.outlook.com [52.101.53.18]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4d6egbsbcj-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sun, 29 Mar 2026 23:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=db8oYMxlLd4+8minc8gkE1jqOMtLOhNXqnUw5Icm10KAkdR+0JWCP0XO/G+GzE//SUkoKr+7FoIRsNeBBFryFkTy2QCMCHrrK2kW3FbkWIV2naIthCKXxJPOYPa/pktOPF6a3dqI1hUdctEs3gDIWCWG3EJg6iS2IwnKEt9VM0UBsM7hrcwvIsWi7Q/8fHX4vreiv9+5rFYs5+jxxKAlBMqwHhfaGb5gMd1Qw4WWEVFe0Yk+bx451IAyG2jEygMixUYToBXcrRC+PV9znyFtLt2x+OhStwnG/yX09reqDIqwuSCtg6HO2LB+gnGxc6j2TB9QIjQ+K6JkgRdLcs9c1w== 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=GgHxSBjIYBLhUaEwhyFp7inPDEULabAU76mjLwl1UXo=; b=ldcFXV7sgyru8/ZM92Psobi94yyV2/rFklVTW420JBLk3uaMJVlc7jF3ypQp+qBYt2+iBhg688T+dmFibDaXuHZzBSaofnvaTkiJ9vbnHGVZK4kMRE6rDFS/kTO6QzeaY1dYjQHWOGXZiDq6OxP0AyPRBvPQ2GrKtKQoOJzhd/z430AiXNH418TdBEGQe6tYxQoztiA93EgvdKa23ST58HiUtJlFHDGVjjvtyDqZye7GUZmU9quIJLmOXKOJnVBMdH3kRdIoYmG2GHTbo0kF+gYpzT5b+z2T7wW4qf3bGAe+QA2nkS13mYVnfmTlQL8LJZwrCcqyFDQdtr9+eToVnA== 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 DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) by SJ2PR11MB7501.namprd11.prod.outlook.com (2603:10b6:a03:4d2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.8; Mon, 30 Mar 2026 06:31:59 +0000 Received: from DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6]) by DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6%5]) with mapi id 15.20.9769.014; Mon, 30 Mar 2026 06:31:59 +0000 From: Changqing Li To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 1/4] yelp: drop soup2 option Date: Mon, 30 Mar 2026 14:31:42 +0800 Message-Id: <20260330063145.94013-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: SL2P216CA0181.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1a::7) To DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7312:EE_|SJ2PR11MB7501:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a9f0985-0b03-4429-521b-08de8e260bc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: qqBU/iYLimLXMOiA6eQxkQj4zpk5YhYuQjHsUf4zAkOFIM7XxLabZEDY2yzMPCPbC1GCu1V99wYX63mnTyFZkmHL6I8/Z5ZWE6Xmu3+KZTrPmnbJ85bTBehN0VD2LbsTyfcweQEQRnpsB8AnvRLRJIJMX+x9FQ+c5/RwLdP94YWnAuKXWs1qakBq7W4ZQMJAM9s7Ya1+Qk2n9r1fPEhJeKLHXqJI77XxmuolyCTKyGK9eHBKuYGneN03PC94YMPhubY9sCbAW0mMoVc7o1xlyZunh4/+zkyxvaa4qpJnqW1Tw9oR7XgBBb8s3B+VFmVVSW/isiWlChrxLutkYCbQ58SmHdn9yoR7Heo+WsJ2BVQRC6ktEb6Dc7CpJiH/s36cQT6PpdaVsodx7sfH4Njn0sb9NgBFOfZ3I1N1wCEGnj7Nfv6hw7kG++3T9egC3idXtmJ2Ar5KQXEW50W0V5mFg27jeSIDQ24iT0UluYwUElajdryA6scuZnUbMf8AYpwRdaf9CLWu66hs8NNVfb6DXOzTdzWiFwD0WY9PDzFomQWshBZ6XOetoBxy7lrDVfB33X0NG3k6Ahs/Ldqurzj1wXnhoz1ojVcjeGRb6Uy8W6EenwhC9goDvOUjD9q6Pugt44cJHkU6PBeFtOzUxGkpdLhAneD2HL+Ogyn4G5N2HpJjte/XQjsSQlOT3FDDEXhdaTzWoSN5qDPFpvUjbVmDzLfJBugm8QePgBVvvAB/KgRa1/BnYrnqAGMew6P6LaPQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0dvvHRfCZBR/ZmGWoC9tVUkcLsHS?= =?utf-8?q?Y77a8qoT17O5S999iwF/KJRCe9rMNG7BNtaO3xiSwbeO1fk2nCxpK/Y5ZeYIkMl+9?= =?utf-8?q?lWMnhgnoxFbVfK5l60VD71PpzTmJeOqDEIcU1GpLN4wNOphyiyCBPKIKVmT3/WwiK?= =?utf-8?q?VkipzzGhQzRh4Tdxzy0IUgx4RhfahFx1mHLKO/hb87odnM5tbux11AMe151qzqQrL?= =?utf-8?q?3+VtFVB+IgjWBkkFaKS7mlTvMhfN+iA19WxYosixXztW1MKFAEf9KAEyKSsktGjqR?= =?utf-8?q?+Vafn69g+/vXI8mYCX/hN0DujNS2mIpA5TloHeiT8NPirODuqFQTwHgffBq1ST2mQ?= =?utf-8?q?JBRbGUUQO+ON91Czs1b2yzBNfDqZchOQIjz5KSzQYV11+mvy0bP8xbwak7Pct4U9M?= =?utf-8?q?T6skcFP1/NPaU0ig6NTNWait5ImvLxzoBPV81qZdskx7creNVNQ/hMjX93kfV0iRW?= =?utf-8?q?yLm6VIfUIftm9jPcjQU/XTw9DeONe19BFPqi0PlPeISj9RsnjBB6LOgnd8DTzWbz1?= =?utf-8?q?3e+5NwvDREahlQRKccMNeS/Hz+C6ZuiQS9OlFlpTwThmIk1oinKn7+ilRTkIGIApV?= =?utf-8?q?zLvKw5w8o8XmIo56Gk9AyOKvIdBGZ1wtQVsmnGS01E/UkeTkcYrLKBuYHn1TgGzVM?= =?utf-8?q?DD2VKlOhpukvtMAkhL89H+dIJd83m8uKBtsrbbX3fpCZykQXcGX5g9Q9TPjquWDX6?= =?utf-8?q?1/4M0g/2bOvWuOIFuyqruIIgQZXvqhYtlt5sFQ5z0O8WKQ8fFOdU3f/pmt1Y40sv1?= =?utf-8?q?80Jzrn/Meq1p3sEd0g/4kMrOLWYEABIR2oAa/5n6a1ZHYtG22JodvWm4Tvc8p4+y9?= =?utf-8?q?OOiznBWKpAJj2ieSdTiILcZiVTllVPcE4UgqqwCXXJ2Zza1PXSHus7ePETeZq1M6K?= =?utf-8?q?w1craWOwsz02u+EQu5FyYOJJPentVUlsjXpzjC/Sg3rfxNJyaTL0wG8bUJtf/7JvU?= =?utf-8?q?rlhcW53IZEEZN8BaPvRdLK7J+0mTyG+ZFvNatwP27Y9fGfgvWzifr7x1UMp/Dp9IX?= =?utf-8?q?Dwi+EFVQ83qS0RbCRjEdXwDYH9SeSMNa8GcUm0H5XNjT24n8LiTX9nowK3WZkUqA5?= =?utf-8?q?l4y15E1Yu+idAlM5FhXIogJ+ytChuLtKbb6sOuLeFvtW/kgRFYLkTsHU0J0dIeIvv?= =?utf-8?q?Gn+MqXKugCtuU3q3qXSsLk2RWR7xYducmPXxGQmJkeeUYzCMNCdEPEzYn1go8e3+O?= =?utf-8?q?y3CMP9lWVwUZa2MW3Psm9DhwBTYpoCylXBUF4i404KpkqH3QoDCHO8bL5Zw+KOa57?= =?utf-8?q?tm9NVoN4zRXx0V4KVrrD2Eci/w9Iypq+MkgERCBUJNzh2v6q1NapuNzoG/hj2T/Tz?= =?utf-8?q?cpKNgV+LsrrRePPUshmgqJyiiSdgDNfS/THr5cn+Wbyp7NW9IaRdt+CoDKSmZGiAf?= =?utf-8?q?p6d1E3vJPia2emdhcgaDMMSl7j4zakGZKsI5z5+QDNE78Vhsrz4hwinox/+FJyIkt?= =?utf-8?q?WP0iBeXant+pJzx95XH3THHm7UrnANeECN2prNDe7hY6t4bgIA6n8Ij8jPwBxVVrx?= =?utf-8?q?WNvwLMSz79uShszGFA07MBluBzRPHE3tSv5Y/2/pMjStgXeP8nvtP1rbmZ5SdtOSR?= =?utf-8?q?iadzsZcKXe8/aFt22EzKlbYiEkMj56DYSM30PWyNNK/mVVNaYS3Cmffcu5kOyHbCr?= =?utf-8?q?ic9C8J1k1koQ6AfIbutvnTmxaLoFP92h1sHqMWteazm2153+lP6po=3D?= X-Exchange-RoutingPolicyChecked: BuZISHYbQ5CEdILkFpkvlYeHO3MpxkEpta+iARIVJensFJ3w4xmJsdSCGEA3CJSPGw0vr0QivAVyTG7I6yjvHUfn8ffsZPpuExWgs8bMyCrYY9LIBNknBJ1k/KvqaKYCU0HAiKMhni/HFOlEUWhCVF8qfKUmimxQpzS/fE/tPuqs0PXJp05J7kIOFOGPCIE5G4t5iX6dvAFByr2/ZgETL4dGm2dRzy8KKnT98rxYStYHkCtQPjb4KG/Sh34H7SreHtRK763RukXEa/v/PI2btnGIAyy1oMWASnHekMdYdqLi8oeEXKddIQiDdfW67QJEjN6ObTpsQrJAmtYTrRDs7A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a9f0985-0b03-4429-521b-08de8e260bc4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 06:31:59.3977 (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: WpKsFdRCi0ZQHPMuRAwq4Ra/IY+dKlD7QTFu1CwtuSSVQpgNZoGev+KTDLJ9ECwjI4xFGlt56QYmAdA13dDAe5rp4tKxkQ5Z1xaAd/xzdaE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7501 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzMwMDA0OSBTYWx0ZWRfXzjBqPHrYoU68 P487U2iIeGDUQ1Xyrg9R+C7ePccYzExMyFsQbGv7/3hKT3NRaGWGcitgSwIBqmKnfZrlpVRQuPi 2km10aiVvdLQMXHpz5OJPc6UkI6AOZ5uzca7uuZJbXFrMPDRotJmQmYx9Ys5RL/UbrzN+9+pYLu /978sjs5PlPIvccuLaiDVgowyaUy+fdTcn19vWeQNhGSQTcgYsQEcQB8eMfLgd72tp7gQhWncbD aoeeDaHAKs73S1NQq5pOxjPzTtjPl1v4+YQahY0gdz8/enuIC0DN/zknV2FHe4nmG5HeH+piXCt FwV9fWmMlQhUwlQyOJ6uwV6kSgGGeLuyvVlDJY2s1JYQibrxrd+XDG2exBVXr1+JP9qG8j4351Z uKiEL23j7h8njhIoAcY7+WO53nYlvjN1zHrP5p4yBXOi/2f94Nx6xZo/KMgPRWgym4yx1jJ1cI1 OR/yhp6fMR60D70FS4g== X-Proofpoint-ORIG-GUID: LO8EOkndTVozbN0V-NDEqMf_vfTQ9XDg X-Proofpoint-GUID: LO8EOkndTVozbN0V-NDEqMf_vfTQ9XDg X-Authority-Analysis: v=2.4 cv=fvrRpV4f c=1 sm=1 tr=0 ts=69ca18e4 cx=c_pps a=eZ5Ua+8tQ3RPWrQJUiaIvA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=GHR8O2WEAAAA:20 a=t7CeM3EgAAAA:8 a=jmkyWzQy7MOhuRdFQhIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-29_05,2026-03-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603300049 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 62U5efub411066 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 30 Mar 2026 06:32:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125831 libsoup-2.4 is deprecated, and other recipes already stop support of soup2, soup2 and soup3 cannot be used together， and the latest version of yelp also drop option webkit2gtk-4-0 [1] https://gitlab.gnome.org/GNOME/yelp/-/commit/1b0ccdae25d0a788a2b44960db7273f2d1dacb4d Signed-off-by: Changqing Li --- meta-gnome/recipes-gnome/yelp/yelp_42.2.bb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index e1c9324940..4ebb5bb3b3 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -23,12 +23,6 @@ DEPENDS += " \ webkitgtk3 \ yelp-xsl \ " -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" - -PACKAGECONFIG[soup2] = "--with-webkit2gtk-4-0,," -PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0," - do_configure:prepend() { export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool From patchwork Mon Mar 30 06:31:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 84777 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 CEB2DFF4952 for ; Mon, 30 Mar 2026 06:32:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.45266.1774852323742067809 for ; Sun, 29 Mar 2026 23:32:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=H3kzeA19; 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.166.238, mailfrom: prvs=8549bf16ac=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62U5efuZ411066 for ; Sun, 29 Mar 2026 23:32:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=z0ekAY0brwJX6qt1jcn/ruK+awHnlB0H08nh1lPw5L0=; b=H3kzeA19ttlu MuFq1+XsbTn71NCOefjBI/QitiFOV0mUcMTefgAan40h5YZXc9ctLgfhssh2gRbR 0m6S15IQjk6G6r0N6PX2/CGRazO0KiHKG/B5ehI5BB/r8VoLXCB9uTCdPQ4bGM85 /tqpv8m+QKs+5V9IiCwmDOYUxfrhFxdBY/ZLHAbvhafE0s9EDNupZWlvEv1qctYF XkJWwLeiidR8Iq+GyXvSU2XnKP5JnNPOsYYOkqH2ZMP0toJDlR9BLKkLe1kLI8U2 j6h3XldegnkR9Mnk9NFkn28/jaP8WG8ap3xbxOftwe1KkVzSMplsdqR641OiexNI bunc7NuRuQ== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11012018.outbound.protection.outlook.com [52.101.53.18]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4d6egbsbcj-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sun, 29 Mar 2026 23:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NNrMjszWHFOSAnx7K3xXR6V4zg4Ixiv4wZ1+BvnBB1uNBjTTBv6JSa+/+IFagse0d2qD8CKSw7PVkvmFCRon2juI1Q9EmQGa/RP9sBa2w4EldAzq7V6ien/1/jsSRYWrD6U7xetW1szHl9Z8XrpxziVmLS6a34/6wQHQJTTq8DX6RWd+IFWIxYqksyVHTcuJqTp6AA/wDFnw1aT4Y/uXdFFv8Uyl9Xbv86yRSTqatEm5Lqd8l3uN8sOHcSM0fFNtXJGkKVHQNOOHZEkgSzbJDbTltiw71UydCPYJatyzQoCtB0d0fmuAkgbN5bykEPDbLUWMpNpJoe3zZjMyf9V4Yg== 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=z0ekAY0brwJX6qt1jcn/ruK+awHnlB0H08nh1lPw5L0=; b=Fsh77UGBnKkSek1QJMC6ETomuIF3WesKKzff4UGDOC56CmnDPMswFtzzGLYoAu0HHMj973y4qtQ5xEkvZF53jLepyBqeJTrKehV5qQumHctxK+EAF1KH94nzoMlFqqPJSaV4BXhSzi1P7kX3dzEoHu5saQcrH+8bnwvsA1ksVZPwDl0TMRxB/dwkI/m5DUKBCA+ZVxc6WdcsgeWgIg4SjXJG3VAVR8xG2L9onHYv68mru0DGcfr9G9y7qXPNtRAOhp/TRVPGtn5HeZMhnchR/S13eb5tDGyQHX3GUgBreBZucNBT8JBT2/mbqkF1rMH1v8TXwBVu7gIkBgjrFtA+6w== 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 DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) by SJ2PR11MB7501.namprd11.prod.outlook.com (2603:10b6:a03:4d2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.8; Mon, 30 Mar 2026 06:32:00 +0000 Received: from DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6]) by DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6%5]) with mapi id 15.20.9769.014; Mon, 30 Mar 2026 06:32:00 +0000 From: Changqing Li To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/4] surf: upgrade to latest commit Date: Mon, 30 Mar 2026 14:31:43 +0800 Message-Id: <20260330063145.94013-2-changqing.li@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260330063145.94013-1-changqing.li@windriver.com> References: <20260330063145.94013-1-changqing.li@windriver.com> X-ClientProxiedBy: SL2P216CA0181.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1a::7) To DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7312:EE_|SJ2PR11MB7501:EE_ X-MS-Office365-Filtering-Correlation-Id: 1618de9a-4612-49fa-327a-08de8e260c9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: oASJ3d90b6H5uEsxY5nQj5kt9ygpnH+ug/0a7SynWqnPkqDeHp2p50zvzNUEAvxqSGLTbCQloGLwcKsyLvUhipo/DcDQWwuOQLHB6HOJb9GPPHJpUk4JK4vMNsIlC5Qu8YxaPLlS4pfUAFTeUf5A3mD4CPJcSyY3ZfG57Vg2GgAMe8t82eDTLypim1p8RZpzm9rFUESkQhN6bfmRavg9BnrAG/Hwu7o0HVAwZtYXwWGpZJzFxahfqEwSJwyOg7GVfG5CkLjoh77kXvbhWDZ25Tfvk0/SupONEp6Tj4lymrnVovHKD1yyqPCNtupL8VfAXTmvGCwpi1VvPp02168wGUP5q3CyVJ16WwSper+bhG4kOI/sVX5QMz0qrgWg7SognqJ3Ug0BtPC0GeSEiYujx4XBVtd5lOanBXXCC5ANnOVpz1iGCkFdOSFbk5hh3vnr1MwH9hZi9J5JG0Qxf7CojtLezjIwl/IiNSJcwqLH84/vAwPXHKsIZo+2MRmbDpYPvL2ANf34gqfcrJtQmYrTbROvco+8ItaJMabSY5n8rKvvDK3lHDydQ7yGswrTHqwdiNbZNfiZAxATRrfpQ8LmW4JRg3VMdVMomoFfRx6yj54psOi60khmNQkP3UyqOpMLkZFwBaSC901A12EQEtpgq3VTasHZiRf5UwlbIMYY2Ys4ZRtu6aOJTFnqLMc5KnECvKP8IxjZqS+DENwWMGhOWBRPT3wd9Isdt6/crQzZIBU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P7XdmvcZOIbGPqD3iXLwk4F5YBC6G//wJB5d4HVSg/HlHAntk1pnQ6UiGN5O4FXe6Yvzd5RKgoVZbH8HrujIL4CUpK169iTPrlON0Tel95EIbpykmelEgL+0DX2BY3kWBkfKe0TIb0+hh9po0MDQ+L9+F9xpfiQas1GeJaHyhAm9LTtMRtzkP73YpvNH12RHh+HJZjqqnpAJzCp93gljml0kXjCWkqkICmscHwQNpbEk+OkfWtxYNXw2gJGRdwYHSbDQZzjGtrlzdA6NdjIV0acw4tLEo/k1tDTG9b0Vv0FKXWy0ljk1H9Fywh/RavuoUcJ2noBe6NGGMxp9D8UAYKhqASOTwJp8HFQAy4dYrEJSHIRIGdmM6V1xgXX/lEB0Z2Hj3554dWPFdTTOAyn1gFY3PGr4ldIpDPxXUrJhknVovOAwXshQUBuxIeR7VxF4MK6ensGtyOjWk+s/QQZVYGaod0oJM4xqD5iIxI0DUCtpGkvBueEE9pAmJF8CLV6upKEWScPNM5V1C8vEuKFtLLifIoo1kT008Um+uyw+XrJhvyg1F+snyeNEGctMDqqMajgDkpIsxBkNY8AcHg1ceWvwT/Pl7efugAH1Y5NNUcXfRMwLlaXygeSV/aGrQXI/sZHuE9KaOnh8Do1SiwyWpgYeZZERArJtDF/pMbNRu9A2rQlKNIeeMu9Q+F3FwLSTDpCTYFxQvebyxJceLilAdkxHiS8yr7ttcmFtDujkMoKQpN/pJ1zK/aaHsUEa9c4RgL/ZHc4cHsJGMDfAN5zP9ew2A3+LGCoBsKk5NXpayf7Ygi62gJptV3bkrXwLnwnR+DuJhWOdf0KN5BLMc5hNOrdKnckzMN1dIwAhj6irtgh8ECyXEBB4/2ujov/98vbwJOPHTPYB9NRFsAQTqBhP+2+xmqNgUpUyD5DLD0hVb4mQ2RsG92S99WbVU1XssLdRXbz/YDFycwwWa4bDvuPikd5ngfCCUz6a2PgvHgfJTRTIAzb8rxg6Z8DmxoVmZEKiyUOKo5vQdQD5oFT2WiyQBIQGMZqOAjHb8KnD3BWsxGW5CnYzE1PBzqnLGQmol2VpFzABlJjbaZrwz9cK3dmuquGVed9+hyUkd3br3UUTL5EcBmsnKRVz7q55XaaYBS+X56OEkHC0RexOtSldAO5Lga7Kzoo3LJCn3WZN6q4eEikMzrcsmTaT28zEb1w+tVboG9itdxq39nTa92NG4z+WHRMv5EnX4fAlcoZDb6NHIwTCkjLeUL5RWBsrGRMLmQD/6DL23yZ6UxHOCKW2+mr6Sa/txFmV5LgCKH19cdytTpjB8ta2I3IWkukzlReTz76FQEw8NaZz9Qa1ZDC3mA+9kcp6i6pYI6dqag4TaxgSZXcSBOfvbeIyRx5fzdGCwHgNAbAKBEqzUWWib5olJxJNg+3nWL6AnCza9xhJZ7q8NU+oPXbz1XElHj7UGJMdgtrefxqvXScxBlsdOx9Fb8+qGz8M4Ytp/NZoBOmxau1ps+47SB9R+maQLy1HdTGBNll3/vSmEyKogf0g7czNuDbRhaPPkttDkH3/HYVXm0+652oJHJchH4vg2vKRJ0L5SAMh+QeFlAblR4ScdDe4NTChZ/p0sjCmJPdaOl4x8D49nbNGO0oPpHaUu1J9360nTG45p89/Cm7yhicZe5ZQxiD8+Yc1i36wfQwcOdMHM2+AW/LV88lDHt4s0koMg8rfsOBKJCDHtjYTAn3ux9Gye8Sk1vRXGlVezV/wB09T2pjqaxc= X-Exchange-RoutingPolicyChecked: SkEgOPVGur4+KF52pTrRTM3c/ZXSXLrpgtOvD9H0Cp1dJf8QAH7QN/xl6a+cYhetrwRb//IVpmzsZEbUjq1hacy7sNSXU31H51pev/wLRcOw0JrUEfC04Z2/ulGtNx/W0M++ryhVai2b7WBbnStDrq+xm9SXFkPdnKN2JpuTpuwo77AmL+U4bQ4mC8zk0HcoO6D/dfGZi5Kjrx92nFLWAyEaEs/7MH+1uKMZZl0CdHm/xjfQ/zrXS2FOs6Wr0s/7YX2SJ1FAEXFCgdL2fOh1YxOyBphQB861yzhy1gmHFqfLbKISKytHv5KjeVrCXKfMdTYTEmCOD3/uCYzdamRtsA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1618de9a-4612-49fa-327a-08de8e260c9a X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 06:32:00.6136 (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: huqrijAI/0njAbkcQwP0Jw29LMfWwMhh8iXeBPOTOeedvPmzWUsnwQgmxoPAioiAinjtGYyiLOVjdRn4sy81KbHUYVUDnrcspfEt+YbHt4Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7501 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzMwMDA0OSBTYWx0ZWRfX8XshVhl5f1Xx ukEoT3cDsY/mYEIBUG51CzGFkd8xhjlHUstIQNO4pbEYCYM0rVN5/mrnDJ0vdfm4IdKm4jafnTH Kz5uyYPNKu6QAYH8ylK0rRZltpyt7IGpQeTIucVpFwrcvQi2m07/JD29ucb/yHcFLwqvEheZo4y oqqmoQ/KDZkS9uOGDFPfkhe81llr+Lyxs3WEgefMGkrwuNRaMXIX0RIWSXsDS+S2zzr7ob3Hp5m tGmR0CESl/XjMEwLtk0SCwwbP1beh1VuRhmYkwLZ3sbydgRrzqKteV4czhQUzC8O9SO0D0KhRu8 PSs1WLWRi6NE2+L0FIYmiwuQD0lcrjt3N4ObYDx5c8DV6SfO/g/nkdAnUgh7YHpv3L3EZFlhXm9 5ztlzWJ2gv8BUNzDTgEKPjRhVDyIkyW3fkAaKa1jws4VbROg5JR88zXVUFGy7d/jlXiLQ1j/ylk h091XpP67g4BDrdxxVA== X-Proofpoint-ORIG-GUID: J-0QclSdUEWtZrijJzVbQYRW6juNk3KT X-Proofpoint-GUID: J-0QclSdUEWtZrijJzVbQYRW6juNk3KT X-Authority-Analysis: v=2.4 cv=fvrRpV4f c=1 sm=1 tr=0 ts=69ca18e3 cx=c_pps a=eZ5Ua+8tQ3RPWrQJUiaIvA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=I1_ynHwpAAAA:8 a=t7CeM3EgAAAA:8 a=JTETGA26Yv_lStVd6rAA:9 a=Q6MEtcudlToozrQ1I-fC:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-29_05,2026-03-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603300049 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 30 Mar 2026 06:32:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125829 * upgrade to latest commit * latest commit support soup3 by default, refer [1] [1] https://git.suckless.org/surf/commit/7f1156f9b0977a72e523e031cf67a4946cfee9b2.html Signed-off-by: Changqing Li --- ...ake-compatible-with-webkitgtk-2.34.0.patch | 42 ------------------- meta-oe/recipes-graphics/surf/surf_2.1.bb | 12 +----- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch deleted file mode 100644 index d273d1459f..0000000000 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0cd38e6dbcaff7eef39fd46a60ff8a47e5f488c4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 3 Oct 2021 23:08:48 +0200 -Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 - -Signed-off-by: Alexander Kanavin ---- -Upstream-Status: Pending - - config.mk | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/config.mk -+++ b/config.mk -@@ -2,6 +2,7 @@ - VERSION = 2.1 - - # Customize below to fit your system -+PKG_CONFIG ?= pkg-config - - # paths - PREFIX = /usr/local -@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man - LIBPREFIX = $(PREFIX)/lib - LIBDIR = $(LIBPREFIX)/surf - --X11INC = `pkg-config --cflags x11` --X11LIB = `pkg-config --libs x11` -+X11INC = $(shell $(PKG_CONFIG) --cflags x11) -+X11LIB = $(shell $(PKG_CONFIG) --libs x11) - --GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` --GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` --WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` --WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) -+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) -+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) -+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) - - # includes and libs - INCS = $(X11INC) $(GTKINC) diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 258c78e509..6da7a0d93e 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -9,20 +9,12 @@ DEPENDS = "webkitgtk3 gtk+3 glib-2.0 gcr3" REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" +SRCREV = "48517e586cdc98bc1af7115674b554cc70c8bc2e" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ + file://0001-config.mk-Fix-compiler-and-linker.patch \ " -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" - - inherit pkgconfig features_check -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" - -PACKAGECONFIG[soup2] = ",,," -PACKAGECONFIG[soup3] = ",,," - TARGET_CC_ARCH += "${LDFLAGS}" do_install () { From patchwork Mon Mar 30 06:31:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 84775 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 CFC00FF4953 for ; Mon, 30 Mar 2026 06:32:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.45004.1774852324327007065 for ; Sun, 29 Mar 2026 23:32:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=flMKZaFi; 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.166.238, mailfrom: prvs=8549bf16ac=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62U5efua411066 for ; Sun, 29 Mar 2026 23:32:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=/yPPg7C3Hu2LZdEdP1TM82/YXuKc3tfCr2EWjy6jbJ4=; b=flMKZaFiA70Y Mcah3xEbjAjD1QWoqV5dM0GgEDL/LFBDqI675CSYGB8xlEUxq5G1cUuMe/MFk8Dh 3TgV4/CDH1HGHWj+VFCBLE/TNZUiDvUzIFOS7U2856E4jhG5C2VN4HFKTkYBkQ0m zdKiohWGoxSt0T62VfZZGlmVgO0mgRkJKx32a8OJEhfwV1sYMXMxWH2nVCPeJ6qx FxpKUocL2vDsxpj5z5HIgRWUBl+wZ40G4ofU23pufV8Rb2vxDu5/JVs2eLTCZxqY l1Tfxwgj9kHA2+y6MNNp850CaKbN9RFtw4sVd0OEJUhzMwWJWfXaS/5dQPqLLYwb 9v37oYscUQ== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11012018.outbound.protection.outlook.com [52.101.53.18]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4d6egbsbcj-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sun, 29 Mar 2026 23:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=j3z4zunig/pZfEgHHDUSLLF8pCaEFFOQUn9QDbO54EKjXBVKpRa6bffUJuaojm0ef3xxKqqCeW6W/n7Qkn93XoyUA5gGrFf/w5QkAtnoJ8gjTwmZPEpXt35v/YI+CcgqKt6VJoZuX92WvLUiTI5crY0lLemV4i7S28TJV0Z0H+Sf3pnyPnL8zk7TpUSVeGmOrNkeTVG0XPorXwBSrjUpvV2rC9QIbMibTCVKcCLdd+wS3nXznbx0LMsw15IAAa9WRXQb8mZYAvW5OpZocstkKWOMf52DnqYtePEADWaPDwdnqlL+mKUEm/AoFkrnYvfAnYq1ThsJ9xNwFvXZ1244Kw== 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=/yPPg7C3Hu2LZdEdP1TM82/YXuKc3tfCr2EWjy6jbJ4=; b=Ndfue9bNQbt1L92hshBI6GgkK2abiEHM6SL0Cox/ai+32pXfkuVihH30sE1JMMD0p+so2+K/NNvUWDJ6q4YCsNSxD5RMEX6c1Jt6coLUCWZoWiL52A9GmLAGlFd/uv87W7Mycw8T8XHOWUjK+R25hICPnjJZs9Az9qSKSwb3XQ6Cj/liNBZIlzkgT7Zv7MYrCyOGREMrJ5V2nmDH1Z1xg+22RkC+hArswjeXL59ZS5SupnHfer4r+WTgxkSzV4QqFPdYdSQP2reLxh60eE9CazF8UqDjA26YZmvUAD8VBdKyzQg+ORx5TcPXgP2pEe6KfEP63lVRsqt5KX9zkzEGqA== 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 DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) by SJ2PR11MB7501.namprd11.prod.outlook.com (2603:10b6:a03:4d2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.8; Mon, 30 Mar 2026 06:32:02 +0000 Received: from DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6]) by DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6%5]) with mapi id 15.20.9769.014; Mon, 30 Mar 2026 06:32:01 +0000 From: Changqing Li To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 3/4] ostree: drop soup2 option Date: Mon, 30 Mar 2026 14:31:44 +0800 Message-Id: <20260330063145.94013-3-changqing.li@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260330063145.94013-1-changqing.li@windriver.com> References: <20260330063145.94013-1-changqing.li@windriver.com> X-ClientProxiedBy: SL2P216CA0181.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1a::7) To DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7312:EE_|SJ2PR11MB7501:EE_ X-MS-Office365-Filtering-Correlation-Id: f1fecb09-2d2e-4e74-0b65-08de8e260d55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 9gUb3L0owbf31DB5ocjRl9iZcCbqgxbsR4fetGzPyL7gp5td09Z5arS6ne4h1y3SaRMYQK9RQfMVJuyq6tud60QwanrOQnHSz602RGORG4G1wKBDa1CtKZkdjzpEJ5Vr6iL6426jdjG0eY2yI+YsZmYH1Kt4Pz2XPbpmcHHzKJO4Mk9or14O+raNYWrCSJh5Z/MgYZoYrlTwwFmLOnEloAQq1bBgerAypUmeZvwWdv5US5/x0iGbk/cVjh3rQmM1kdNWbBVy5Af3DOX1D/Tfv+5fP1AbptxE/Kq7m5A39DVH8w7vgpXFHbQAhBYpCKzfB2Vaa89Adr/tFJeBjuY8/sE/X/N2dh+sxfOCxUtkk5c2fWZDUQT82pLaVsuSXNCpG2nFe4BBuNfxVyRo+68MVfEZl9vDnHdU64cv/p4bOyhe/Hn8Bh2REUz9YXb5JhfBA6eSUK16aisS5TFd7CwyMloa1BiDBc22vn5OD+NNkCDZStsybcXJSG+lWlYzQZBdWjDf7X8TiimYX88gAzBOYE6jJfo8SywpZu+6qDKaQ7hI0LKnFChx9GbUqC9BqPN1LNqJOYlAOEGN5ZHgRAtqY8KwEbeJhXQqPPWUPyHVrtKo09hYNtOgRufZ/tNvf9sT/8gxV82EgZurrI5uaVe5zo66OsMMcFhKOP++D1tOLysTKpryy8mH+vBKRlBQTqD4zeAbPdZlR0wTzV87FIJA66bICafwUvGKOhHQY6SRMppnZM8nFsP8NJUio1+5HL2gqINYodn7oSiZqcTyjaTiQKn2SN7EiciQKsw4rpc32fg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5heShvTvF5C7+yHvLRPDzYySHdM7mSjoJo+Bqv5qBKawHhI6b0WytCaBWHLZulOM9nBKLoZvrIxTWwcmrWR62swvatuazzBYKYTAPBGElN+ggWGzUZwASnJUBTA3Dfaj0jZ48KKbF6FcBVcsDObzcqztC5u1mj5W7MuAOXUS1DLHCnO3xflXW/+1e9lexwiHQbPMRikNq9sVB/jq2Vey0EcEHUp2MOojHuaSfiR5rAo/7cej2ux98rI2lzlaC6VVaO97IXDzpYyM+tHjUv3jeaIqxPAm0dc0odxNyWjoxxkvSm+juf75QIipN/XsjwqSar5xNSy37uKFP07n7pweZoJt8ZyeZd06XAHkpNRoYSxao5ZUH/4pDeMA55hVQ51xwJiOZcbX1Cx/L/yr3FvXD/76mBGpcQGhToHMRlx2AvyUO7gAVk6hRotpv46gu8XRpzGcoTGITLk00PLq1uHm7pTCQMDuEMs1SXP9h+Z1ObHT3coRMIKpy7m0tH/FPiQTEMUN6YxhOTGRWvFyNBem5KEx4HaqTPYWh4+oxYMGQdoKrSgGJPf9jKKMBlchgwDdCubQVDS4fNSxDFPCfQCXW3jpBVTW4x2rGTV2NWryM34Vc9uFNlqMjKEldbMmrFe4MKywubGGFdGl34JDVWZjwJWIqcEyOFmKtQDZZNT+qGDJwORl/NqYCZtp9a1HV5CG11s4aeXX+Qqo+e8BYAGDhlkLQ2VKOvg011bi5AVVfQP61XtoPvouXzwz1MP/6evGKcc7TcDWy2ubKSmmvDQGXr4Ee+GwllJp2ff7JEES7qOmIHBuQvlBk79HJyRSadHEY+zmcFFzX8uT+eO0wKkXXt/CMlx0dFK3VapJ3633s/4xcqUAOC9ElXvM46zY1P/rdKfb70IqbP0NxSiZIpMfY0RQTro6R5JleuVdVzLfDvzvAo+ognUwTcDuHNmu08OzzLbGO5GJXZsd9SutcJc2ksY9898EysFlBY2g33IWsgvB7lGMlqYyOqYO8rsyuULU+Brd3htmt/QAwyx13jL65Qmnm9KL+mWzWY0Jw8dTX3rx/LRLgWxmXgVqYz2huP9aatF1I73WcQg9ohgR/uJUWMZhFq2nwSN2uLtEdskPWr9XVo2qNKHTvqIiYZIfvGetJBPA20tXSxcJlOvTxFPren6/CO+wZYcCNBE0TnBIhf3/CjCyuTugj1FaVHPxsVgBNsvpd/x3I2RtyRhNF7Yviogm/ZY/qIk3tu2mrLkHFmBK7sJ8lzgBnok2IF11nKU+bZsBQiH9vqkQBQMtZpYlQ19/689a93FYWSTA+CWZw/c/ZidN4YOYUDWbkl3FKqfZXAPl6feV4Sa/X9pzB5+bozKVyLy7pRxfHZefAovC5764/oSwAdD5Whzh2b/cK/bDJMzP6Q9kILFJLtcNBF/ukRXQ6l+xxDDHFgrL3PlsIqgDD86QuJzskD1K6b00BlRBg0S1sDppC04NNSjlscrYiELnbvaXjGmFQiMPHeS8hXu15+NS1wzG7cCB/C4ASQgAIZKsSGCPq5jpyS8eCqXb6shkZfeDDnDxLo5KET2KWRR61L7vk7F7GWItIrIeJzTqSJGgmFa0jvz6bfhRwLrm1RR1n8xO8aS43GDHKOFH2drG3A8cdPpa7xgvb4D7X1gHPYsE4o+gN7hfJuizqQfqCXTtbOnejDifjVZ0beR7cOGVrNvakVaPaOWz7m2VNIjU+oNJbt6TfJhx9PSIzui6ZxzY1lgC7cCvZ7KKMgtX5FM= X-Exchange-RoutingPolicyChecked: rLFD2y04bu9QTL1s5rSXJMjbPIo8BvDpu6maiYd54WQqPBPHmGQBCtICYegr//sIfYWnWJ4KaFV+r1LGbToLq5F6qF32eIUM2Sk3UB2lV1Bvv1TC2FpXVlIFREEym91v+A8pOqI7FPmX+2BdcLWYVi8OKTnrlw8Y0sUHS2/kz8r3U0sk/01npTUxl3r5TppldVNDxX7/+8uqC8HxCCv0iBDuwhofxim48l0PAbVq8KmkmTWjz7nfF4E4hiOOJ7EdBsFPq1FI54Q20j88yeQMxnCSXWSw8FFckU2znSsfrofJM98uh57kKVaKy9BPuGa1XDNlJCJnop+qrYN0RymEPQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1fecb09-2d2e-4e74-0b65-08de8e260d55 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 06:32:01.8336 (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: wszZEMdisgd9yZA/SsQ+cJD5vxruJpBtxjqG6/8qtcEm0Ni5sP++Q5GuqH/DhxOij5QwOviaR8FkgQNdRGabdyFiCPIcf/KqE3/hoVCFdN0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7501 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzMwMDA0OSBTYWx0ZWRfXycp3Idz32B2F rKHr9b5HNzdgxuH9CRf/CUjEZ3EFywP069aJfiQePWpkIkro1Z6MC+bh1M6CgDTk+7TIfbvCvqB R7HSJ2wivlwthWii8sQgS1k24nue9XeHVy5sHHwPb4Wu8J1jSyk0GzvteRRn3kTxX5nKB7zAD8L 4cFOiOQPZHyyno/HA9FTy5g8NrP+qYXX5usy6+T7HgNhaGAQXEv0+MBOswftEcrqOIQ3L2bmOR/ YYktiSDXdvnqD2Ge/xmInUpWjVk2Whjmuw5ktltBiotOpes0c/IeqXJjbNuKFETFcNGs4hEU0HR ayskvVuE2Q0h+zEfibMHjNy/QWMvYCCIq0HLuydsU4AovBVR7Zq8/scIyLgR6YqzffRMxB7315a /uU+ZKZT8lqYATTzSp4ufWNMoe8ZCXs6M1Ifw6YCOR96q0JK7mUzwWZgwLhOpnJqS5Z67v+SH5v RRfxwo1HsFPLzQnF8SQ== X-Proofpoint-ORIG-GUID: fL4NEMulM7xhdRskeNAJSC1ck2FTy3XB X-Proofpoint-GUID: fL4NEMulM7xhdRskeNAJSC1ck2FTy3XB X-Authority-Analysis: v=2.4 cv=fvrRpV4f c=1 sm=1 tr=0 ts=69ca18e3 cx=c_pps a=eZ5Ua+8tQ3RPWrQJUiaIvA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=dDYjRZACXro9N1CdzxgA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-29_05,2026-03-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603300049 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 30 Mar 2026 06:32:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125830 * libsoup-2.4 is deprecated, and some recipes already stop support of soup2, soup2 and soup3 cannot be used together * ostree upstream already stop test of soup2, refer [1] * Remove unnecessary comments, PACKAGECONFIG for ptest already set in bb [1] https://github.com/ostreedev/ostree/pull/3531 Signed-off-by: Changqing Li --- meta-oe/recipes-extended/ostree/ostree_2025.7.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb index 764daa8e37..a2094f68c3 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb @@ -39,9 +39,7 @@ BUILD_OPTIMIZATION:remove = "-Og" BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems and swap -# soup for curl to avoid bringing in deprecated libsoup2 (though -# to run ptest requires that you have soup2 or soup3). +# otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -87,13 +85,13 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" -PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" +PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup" PACKAGECONFIG[static] = "" PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" EXTRA_OECONF = " \ ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ + --without-soup \ " # Makefile-libostree.am overrides this to avoid a build problem with clang, @@ -185,7 +183,6 @@ RDEPENDS:${PN}:class-target = " \ # # Something like this in your local.conf: # -# PACKAGECONFIG:append:pn-ostree = " static soup3" # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" # TARGET_CFLAGS:append:pn-busybox = " -static" # From patchwork Mon Mar 30 06:31:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 84778 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 E755CFF4952 for ; Mon, 30 Mar 2026 06:32:15 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.45006.1774852326328465762 for ; Sun, 29 Mar 2026 23:32:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=krVZqc+J; 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.166.238, mailfrom: prvs=8549bf16ac=changqing.li@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62U5U1RA167297 for ; Sun, 29 Mar 2026 23:32:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=Bs7XllYrUv57JZTc3kw3WrPKbO7heAxMVYgP6RDjb7k=; b=krVZqc+JMJbX n7Fse7F7AV5DPMZ/1htNyCVj/JtO8PZVtdWgvXnHf5KqlYGdF51i2LXsfMz31WX+ Mc708U0x7bvRse6T3kQleWvGRclswl7kEyzuHY2CuuQEHPIVeL7OUmz9I/qEDV44 4FOHPdXKogeP3UzKvwBIBeQuXmW+TUudY3/xGdwDdtxAr8xO6xK0fLG2lTny482M z47MdBEjTb1WGtubjX10Rk+EJ9XVweDUpGFzQAXAI4io9iFW3xeXUhfTKhugkBeH yN3I/iWbS1+6YuAUt3pqyqdsXNAWEKLVM+jc4MZFQk3qKYDHm7MPKi3VTQ1QSzOK p36P3k0vdg== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11012026.outbound.protection.outlook.com [52.101.53.26]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4d6a8v9gpb-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sun, 29 Mar 2026 23:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iHUJyH37iss+acKnH510zo41Qd+83Y/UiqN/DA12KigdNjAhjlGnlBYgf6BdGdPw+NIGWkVdtI/2eE9ey9QseknGNYjaMNhok5Bk456dFpAc9dn4+DktobBLyyJnqH/b484W2QNNe+9HUF5DuRLsLJhaAW4fDYuXhy2bCnGbYgTl3PgyuONgznvJ2ras4hihYeNIkJKWEtuolavSaa/SWk1rHYhmbPap+Qq7+we8vLDdPAHHqzEvTrE7DkaI/IdyIrHqAnRsiUcpzmIFOz0wPgQj8Fv490hcaPIzR/r0inxiqF0ynPbYo/gHFyv0JEnew27nWj1BMHalqJ9ydDQOzA== 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=Bs7XllYrUv57JZTc3kw3WrPKbO7heAxMVYgP6RDjb7k=; b=IkWX5sLKBjVlUw9kH7g1zEfmTN+dcXu0kB7exztCOOOu/tJblg3VkYzZlx83k4xKfh1UXIsJHsvVQ/gWjHSBinlP1PW6vTNqB9lYc0KyAoRhzl5kBcf2Hn2z2WC5pZc3jjn5QtASYyODpaXHvY0UAjSHjpz1Tz1ZWkyEq0emwfjiO1WE5EIDuY5n+4/FtdMSbBW1s9/3XffyydRH7QYwkeAWqz2axjqn9/z/moit2i4EXuRocC4d6N6AXlHkN8UGXA/HVjJuYAa3kL/fG9paaB5DXU/BjX2k4+7rlqX/WAr2Xjq0np3veaoQifR1yX7dX6lA1L8/qOKOw4y2zhIr/A== 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 DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) by SJ2PR11MB7501.namprd11.prod.outlook.com (2603:10b6:a03:4d2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.8; Mon, 30 Mar 2026 06:32:03 +0000 Received: from DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6]) by DS0PR11MB7312.namprd11.prod.outlook.com ([fe80::531e:6ef5:812b:48f6%5]) with mapi id 15.20.9769.014; Mon, 30 Mar 2026 06:32:03 +0000 From: Changqing Li To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 4/4] libsoup-2.4: remove deprecated recipe Date: Mon, 30 Mar 2026 14:31:45 +0800 Message-Id: <20260330063145.94013-4-changqing.li@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260330063145.94013-1-changqing.li@windriver.com> References: <20260330063145.94013-1-changqing.li@windriver.com> X-ClientProxiedBy: SL2P216CA0181.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1a::7) To DS0PR11MB7312.namprd11.prod.outlook.com (2603:10b6:8:11f::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7312:EE_|SJ2PR11MB7501:EE_ X-MS-Office365-Filtering-Correlation-Id: fd07cb80-65ef-4db3-66f1-08de8e260e0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014|13003099007|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: gszuCNcnjZKCpoG45mK4tr0ceJPW4JBeddsJ4d3yPSPUYtMyGtqQo432VIGtZzIK9CI/MDDxXHaFPxKsOgdVK7zBYytUjrPGX3hXyE3spEyiJNnfva+8XcD7Dopx/MhIxWzO213f5MbHEXjoR25z+B0/B7iMgIzZOtUoyu9GkFXx0rObYFVnBd+59xZEoPs43ixSHYiJJIoy46bN1el+soUxHWVtJfS+D0kzytpDYYSWMNXE01+Hxjjd8vtpjX2+HzSbH1OZKhj3dQDIM7aidc5VzY7hnXi4H+VNI4QB8/M0z4kGoJCO6qamnOwXpooic9BNfc13h7abeQ1Yxoa1NL+5Vh8YRdz2zv2aMYRXV73M2a2fhIu2ZY7TCRcBCOpt+BbAnpTTRsb2POhXSby7yQgMXPsuX8eloXaDrUu+G6vigdCR9PTlolg5R/Sc9wZzLfBuaTCMisdrYQkhjNWjJZpS8V+uR3xC2qacakulf0pqjiqO5qELWkMVAbpaM6HfvlEAX7sUAbW64lNzpskkHqyy2EF37JI61oqC9q5Zv251rF/mM1yXtNp/cUk7cpBvEBB9cItLCO1NuDcsue/HrXWwnaZy2fKgbXcCgdB7IlsB+Ktv74JZhS5UZcs3/B3nY5SzZOBNMihfDRBih5SZMMO04ug2HZU30cAgg2Iig/V03BcxObVVnv/JvkBhogS4O3Mq5sG/z4Z6Fu5FANIlK79wGv6D9q0XfU4/pQZse4LFQgcaS7tJH//75Nu7eg94 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014)(13003099007)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ux0eN7UPkUvT2J79V6bBdzouhKoi9tBU3bBolvPQ6SVLXDou4q91GwIKqImjl+zdppUZ57e0ilXu8+92iaD/SkF4Pp51yG3HxaIsvNeKyzVEIV8Cby9HDAa5Vmsn5D3NGzXpyOQWKG8MR0OzjDh5KmbUYcaCoB/yDx09nyfcWZ6m1DOGuuSuvbEH8B/nzBt1C9AjygfC1AGUvm44Lhldr9MsCSOhuZmdh/YhnVEFWz5sBDKWlG+k4pfj9bUwQQaRkTYczITz5K+BCPF6IgGWmbXflwpQuRG6Ke40qez1vGfPD2Hw3xREgqgmp5jcLb1bPPw+BTtPW1PBSx72hGyc2dyJaVBWtOEpn0p5n7LBsHXUyI1PolW3wAE6b8c453SeYf62UDDSCLOA+MpunSuPycZStl3dOLyFuEFIUHA7glCfHka0KHITPpxP2GvZ12wnmeVPE+zt6tzbSocUMTSMMOIJvm1aHiX+a6DFBMhJSwz1T+kaRWAfc+5F8H4GWowqE5Y+w478mDlcWh7jWxUMYA7MAv+wZNTiDyx/nTka/Gf4cvKquPmC/4fBNv3tegWWnVD0LI3B2EnIBkgyvFUkl5dg3HZnTJo+Dg/yeFHsyjJxELQU6U25Qv8w5fNtM66hzRmkedQRp+zzNHom+TVCV6dDlc24unJG12HEoW9Ilgxj+BUFmMfS3djF6ns0XnoFpYbrf2Fpb22M2yUkiDyh5V826Bv2R5wDtzQcrqDPE9yH2Lv/jEwnbxk3QbkKn60dMzoTOim+4eX6sv2znXJ+FvXO8i6GfGEzdBBnH7abxuJPjWr2imK3DIMVrfV9cyGJd+ng4Za2hDe2i+NtsiEKRX4CnllkPVAt4Jt4Wnq+UxFh8Xcf9upDC+5+byl1JnI3WnMH3cWTMZ6T5R8c4ZL+8fVqWwIhr/os8e1nvJg4BVSiyGq3kEk0MzCHxmQkQ5Tk+N3AbvtgsCfI3sh9DLY5qz3ji6Vll/r4Vk+4wyqVmfzYuj5y9gUFgem/7+J5Tv00jlu3/vk93TCP5q8ouuU/5NLqGMec+qCUODgFHtPqihF+x/hJ0pgTTqWc7bRaSU+SsvAloFFZsGZAn3gewo5xVsT0FOl4v8xMFY10ioZwBzWajFmFIhurNDZQzn7yWzJZRUnLn+QnYuL5GUAmShZCc5Wxp0YpPcWv/oxPHmN4q0q+hpw8yruUYVPRDTviGQCfz52/w0BcmVdhi918VrgAZ6U96h+E2NRUPICsNWbpyWLrW3FggNtVEuNTnOgRhGEk2I+1Wp0izQKXwWn4KA9w9YUR0Ejvnvy5357W7jt03Rs/BHMAR043Kmde2RfeTRSYRZIfn5MA4IkwAw3kvIGxN2mMjIX+FSIr5+DGT4MwJXjbjcWkkNo45M4oC5jPYj3FCQakk3oDzgYiolq3Sk6Ube2+8XyVZBNmqYiW8zpYR2lZmg2OUJTYuz5H0HhDzkUvlkcuJgfTzYRZIL1yoD4uy1kgeMd6OB+3RpB+Cyz4GIdix8VE28tLqHmwyQt6XOTCy1wcySiccISGRJBNnco3Og+GuirdK/4oappLfIcJ2DUD0iP3wLSA+h7fBAdTaWY+/VAZ6gLq/9fAXMAJ8O8qUKavILxbfk+oH5TIshsAM97mefsaRHTonUCE5xD4VMVgl9ijGK8F4V9ExYvE8EsNa2iANr0bsdVDuioMgoAK3IPDY1bzLc9qp4VGgN66CeHR1eMt6hIJp9NrI69/n8Gl8ogaHpPKG5iae9uE4N7vnak= X-Exchange-RoutingPolicyChecked: NUH7TemjyDsw3eNl7vajHqv+4wskzZEgR+78tHpQjPG/QVjsv7CwsZYzQcfWqhszMyIJZI6ZXw3ajsjEfBK1sNSRQx85lVLtaN2g+EUVEHnJe0oi/BqHaBcReIIUTenZtZPL6JrZrD+KUY+uoX3YRQ8MHG+nuizeTvrYUVDtU73VmzY0q+u5KAMjojPqKAiAIU3zu4zz2K3M/mnycALwVD2bwN94LBCkuA82D9QMNtj6mh3Sv2bj1T7fXj8hpOx3pi0+YQZR+aUAIj4nitmjR08n36HPtC+vkyonFfLavtiSZxlg9vrxk5gf7LQCUAmLY2iZC92bH4hhBqdS56R0vw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd07cb80-65ef-4db3-66f1-08de8e260e0d X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 06:32:03.2230 (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: FC4EG3Y3Ls8Td5BaPhGwUq2OKJnk7P8XYefLJfiKtXwAmBoCwgQFqj6vj93SiU8NNN8t+T/l44SEbkAwrt8npfMXLNHJo595xqje/ilQLSs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7501 X-Proofpoint-GUID: qO9kFTsHWJOQsicva9_pzFsbob4Mt3TX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzMwMDA0OSBTYWx0ZWRfXwnNpIcia0Z16 XL6ugAL1Mo2KdSUI4u8L6XUieDfNAs5L5FCkNag7u2c0sXCcJQEnPIe+r5mYp+VM2a/azMM1VdD IQKUxdGxz83s1r9X9MJSVTnj3ks30judnEXXHi6ffdwneTGlR7U7e+uptV6ksZqb8QBDeefCCGB Tp1DX69diRGj9ZSosHzjLojRqXT99GPvQb2KGMU+FHmVHnPElI4ywE939a/WQDYHy6ehWd+vnjb em73Z1aekHN/s1hNxH/oxIoz2+suGIg/FmzQpkQz9cjEMHbvWYVn/ZWAz5a04HMPCyHrFHtyrSR PJv7SoFhtYR2fLFahMEIHt+PNQgsZhYPnRKcozFH0OfdEbcJ/k8WK6AAoAVfE+YQJrLxVNiTpCS w+QThwdxXskH3Q676mtfkjjlElAqN+BbBbZudyC47m7CTh6FHKyy2OCcfHV5y3ontE2TzOHKnVC zEWPxwDuZ77KmQq2sQg== X-Proofpoint-ORIG-GUID: qO9kFTsHWJOQsicva9_pzFsbob4Mt3TX X-Authority-Analysis: v=2.4 cv=ZKHaWH7b c=1 sm=1 tr=0 ts=69ca18e5 cx=c_pps a=Rzgcbe2yxP2fEJMfMKkCcw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=GHR8O2WEAAAA:20 a=26qUNFTaAAAA:20 a=aiIX5UjjAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=V2sgnzSHAAAA:8 a=A1X0JdhQAAAA:8 a=vggBfdFIAAAA:8 a=xNf9USuDAAAA:8 a=sfOm8-O8AAAA:8 a=20KFwNOVAAAA:8 a=tJ4YlzTwcDrvuw3PQLYA:9 a=KjajHbNYfbpGmCzC:21 a=FdTzh2GWekK77mhwV6Dw:22 a=Z31ocT7rh6aUJxSkT1EX:22 a=TvTJqdcANYtsRzA46cdi:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-29_05,2026-03-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 adultscore=0 clxscore=1015 impostorscore=0 malwarescore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603300049 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 30 Mar 2026 06:32:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125832 remove deprecated libsoup-2.4, no one depends on it now Signed-off-by: Changqing Li --- .../libsoup-2.4/0001-CVE-2025-32911.patch | 74 --------- ...ild-with-libxml2-2.12.0-and-clang-17.patch | 44 ----- ...-Fix-possibly-uninitialized-warnings.patch | 43 ----- ...-http-and-https-aliases-support-test.patch | 145 ----------------- .../libsoup/libsoup-2.4/CVE-2024-52530.patch | 150 ------------------ .../libsoup-2.4/CVE-2024-52531-1.patch | 39 ----- .../libsoup-2.4/CVE-2024-52531-2.patch | 133 ---------------- .../libsoup-2.4/CVE-2024-52532-1.patch | 37 ----- .../libsoup-2.4/CVE-2024-52532-2.patch | 43 ----- .../libsoup-2.4/CVE-2024-52532-3.patch | 48 ------ .../libsoup/libsoup-2.4/CVE-2025-2784.patch | 56 ------- .../libsoup/libsoup-2.4/CVE-2025-32050.patch | 29 ---- .../libsoup/libsoup-2.4/CVE-2025-32052.patch | 32 ---- .../libsoup/libsoup-2.4/CVE-2025-32053.patch | 39 ----- .../libsoup/libsoup-2.4/CVE-2025-32906.patch | 71 --------- .../libsoup/libsoup-2.4/CVE-2025-32907.patch | 39 ----- .../libsoup/libsoup-2.4/CVE-2025-32909.patch | 38 ----- .../libsoup-2.4/CVE-2025-32910-1.patch | 32 ---- .../libsoup-2.4/CVE-2025-32910-2.patch | 94 ----------- .../libsoup-2.4/CVE-2025-32910-3.patch | 28 ---- .../libsoup/libsoup-2.4/CVE-2025-32912.patch | 32 ---- .../libsoup/libsoup-2.4/CVE-2025-32914.patch | 35 ---- .../libsoup/libsoup-2.4/CVE-2025-4476.patch | 38 ----- .../libsoup/libsoup-2.4/CVE-2025-46420.patch | 61 ------- .../libsoup/libsoup-2.4/CVE-2025-46421.patch | 47 ------ .../libsoup/libsoup-2.4/CVE-2025-4945.patch | 117 -------------- .../libsoup/libsoup-2.4/CVE-2025-4948.patch | 38 ----- .../libsoup/libsoup-2.4/CVE-2025-4969.patch | 37 ----- .../libsoup/libsoup-2.4_2.74.3.bb | 87 ---------- 29 files changed, 1706 deletions(-) delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch delete mode 100644 meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch deleted file mode 100644 index d75594bb4f..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 52c5859b82fe79f2c32d883e048d218e0d7f2182 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 30 Apr 2025 14:59:55 +0800 -Subject: [PATCH] CVE-2025-32911 - -CVE: CVE-2025-32911 CVE-2025-32913 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/422/commits] - -Signed-off-by: Changqing Li ---- - libsoup/soup-message-headers.c | 13 +++++++++---- - tests/header-parsing-test.c | 15 +++++++++++++++ - 2 files changed, 24 insertions(+), 4 deletions(-) - -diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c -index 39ad14a..78b2455 100644 ---- a/libsoup/soup-message-headers.c -+++ b/libsoup/soup-message-headers.c -@@ -1454,10 +1454,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs, - */ - if (params && g_hash_table_lookup_extended (*params, "filename", - &orig_key, &orig_value)) { -- char *filename = strrchr (orig_value, '/'); -- -- if (filename) -- g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); -+ if (orig_value) { -+ char *filename = strrchr (orig_value, '/'); -+ -+ if (filename) -+ g_hash_table_insert (*params, g_strdup (orig_key), g_strdup(filename + 1)); -+ } else { -+ /* filename with no value isn't valid. */ -+ g_hash_table_remove (*params, "filename"); -+ } - } - return TRUE; - } -diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c -index 946f118..752196e 100644 ---- a/tests/header-parsing-test.c -+++ b/tests/header-parsing-test.c -@@ -1034,6 +1034,7 @@ do_param_list_tests (void) - #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\"" - #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\"" - #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar" -+#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename" - - static void - do_content_disposition_tests (void) -@@ -1133,6 +1134,20 @@ do_content_disposition_tests (void) - g_assert_cmpstr (filename, ==, RFC5987_TEST_FALLBACK_FILENAME); - parameter2 = g_hash_table_lookup (params, "foo"); - g_assert_cmpstr (parameter2, ==, "bar"); -+ g_hash_table_destroy (params); -+ -+ /* Empty filename */ -+ soup_message_headers_clear (hdrs); -+ soup_message_headers_append (hdrs, "Content-Disposition", -+ RFC5987_TEST_HEADER_EMPTY_FILENAME); -+ if (!soup_message_headers_get_content_disposition (hdrs, -+ &disposition, -+ ¶ms)) { -+ soup_test_assert (FALSE, "empty filename decoding FAILED"); -+ return; -+ } -+ g_free (disposition); -+ g_assert_false (g_hash_table_contains (params, "filename")); - g_hash_table_destroy (params); - - soup_message_headers_free (hdrs); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch deleted file mode 100644 index d867e5bc17..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 22 Nov 2023 18:49:10 -0800 -Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 - -Fixes build errors about missing function prototypes with clang-17 - -Fixes -| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385] -Signed-off-by: Khem Raj ---- - libsoup/soup-xmlrpc-old.c | 1 + - libsoup/soup-xmlrpc.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c -index c57086b6..527e3b23 100644 ---- a/libsoup/soup-xmlrpc-old.c -+++ b/libsoup/soup-xmlrpc-old.c -@@ -11,6 +11,7 @@ - - #include - -+#include - #include - - #include "soup-xmlrpc-old.h" -diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c -index 42dcda9c..e991cbf0 100644 ---- a/libsoup/soup-xmlrpc.c -+++ b/libsoup/soup-xmlrpc.c -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include "soup-xmlrpc.h" - #include "soup.h" --- -2.43.0 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch deleted file mode 100644 index fcd442c13a..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1159686379184a1c899eabb2174258aba5e0fd79 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Mon, 20 Sep 2021 15:41:31 -0500 -Subject: [PATCH] Fix possibly uninitialized warnings - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/fb98e9a8c3062c75357b961543af091de2dd5459] - -Signed-off-by: Changqing Li ---- - libsoup/soup-websocket-connection.c | 2 +- - tests/samesite-test.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c -index 65c1492..585d45c 100644 ---- a/libsoup/soup-websocket-connection.c -+++ b/libsoup/soup-websocket-connection.c -@@ -471,7 +471,7 @@ send_message (SoupWebsocketConnection *self, - GByteArray *bytes; - gsize frame_len; - guint8 *outer; -- guint8 mask_offset; -+ guint8 mask_offset = 0; - GBytes *filtered_bytes; - GList *l; - GError *error = NULL; -diff --git a/tests/samesite-test.c b/tests/samesite-test.c -index 0b081b2..60c9b8e 100644 ---- a/tests/samesite-test.c -+++ b/tests/samesite-test.c -@@ -60,6 +60,9 @@ assert_highest_policy_visible (GSList *cookies, SoupSameSitePolicy policy) - case SOUP_SAME_SITE_POLICY_NONE: - expected_count = 1; - break; -+ default: -+ g_assert_not_reached (); -+ break; - } - - g_assert_cmpuint (size, ==, expected_count); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch deleted file mode 100644 index 0d4139ec08..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0e3bfa22b23451531caf8cc30b1771ac6a41fcad Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Thu, 11 Feb 2021 10:47:09 +0100 -Subject: [PATCH] Remove http and https aliases support test - -Upstream has removed the whole function of http and https aliases -support, this commit partially cherry pick it, only remove the test to -mute the warning: -| ../libsoup-2.74.3/tests/server-test.c: In function 'do_one_server_aliases_test': -| ../libsoup-2.74.3/tests/server-test.c:180:17: warning: 'g_socket_client_set_tls_validation_flags' is deprecated [-Wdeprecated-declarations] -| 180 | g_socket_client_set_tls_validation_flags (client, 0); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/111ae4ebe7cc2e389573cff5b9ac76509d6cbac0] - -Signed-off-by: Changqing Li ---- - tests/server-test.c | 104 -------------------------------------------- - 1 file changed, 104 deletions(-) - -diff --git a/tests/server-test.c b/tests/server-test.c -index 8976103..cb7e815 100644 ---- a/tests/server-test.c -+++ b/tests/server-test.c -@@ -154,108 +154,6 @@ do_star_test (ServerData *sd, gconstpointer test_data) - soup_uri_free (star_uri); - } - --static void --do_one_server_aliases_test (SoupURI *uri, -- const char *alias, -- gboolean succeed) --{ -- GSocketClient *client; -- GSocketConnectable *addr; -- GSocketConnection *conn; -- GInputStream *in; -- GOutputStream *out; -- GError *error = NULL; -- GString *req; -- static char buf[1024]; -- -- debug_printf (1, " %s via %s\n", alias, uri->scheme); -- -- /* There's no way to make libsoup's client side send an absolute -- * URI (to a non-proxy server), so we have to fake this. -- */ -- -- client = g_socket_client_new (); -- if (uri->scheme == SOUP_URI_SCHEME_HTTPS) { -- g_socket_client_set_tls (client, TRUE); -- g_socket_client_set_tls_validation_flags (client, 0); -- } -- addr = g_network_address_new (uri->host, uri->port); -- -- conn = g_socket_client_connect (client, addr, NULL, &error); -- g_object_unref (addr); -- g_object_unref (client); -- if (!conn) { -- g_assert_no_error (error); -- g_error_free (error); -- return; -- } -- -- in = g_io_stream_get_input_stream (G_IO_STREAM (conn)); -- out = g_io_stream_get_output_stream (G_IO_STREAM (conn)); -- -- req = g_string_new (NULL); -- g_string_append_printf (req, "GET %s://%s:%d HTTP/1.1\r\n", -- alias, uri->host, uri->port); -- g_string_append_printf (req, "Host: %s:%d\r\n", -- uri->host, uri->port); -- g_string_append (req, "Connection: close\r\n\r\n"); -- -- if (!g_output_stream_write_all (out, req->str, req->len, NULL, NULL, &error)) { -- g_assert_no_error (error); -- g_error_free (error); -- g_object_unref (conn); -- g_string_free (req, TRUE); -- return; -- } -- g_string_free (req, TRUE); -- -- if (!g_input_stream_read_all (in, buf, sizeof (buf), NULL, NULL, &error)) { -- g_assert_no_error (error); -- g_error_free (error); -- g_object_unref (conn); -- return; -- } -- -- if (succeed) -- g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 200 ")); -- else -- g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 400 ")); -- -- g_io_stream_close (G_IO_STREAM (conn), NULL, NULL); -- g_object_unref (conn); --} -- --static void --do_server_aliases_test (ServerData *sd, gconstpointer test_data) --{ -- char *http_aliases[] = { "dav", NULL }; -- char *https_aliases[] = { "davs", NULL }; -- char *http_good[] = { "http", "dav", NULL }; -- char *http_bad[] = { "https", "davs", "fred", NULL }; -- char *https_good[] = { "https", "davs", NULL }; -- char *https_bad[] = { "http", "dav", "fred", NULL }; -- int i; -- -- g_test_bug ("703694"); -- -- g_object_set (G_OBJECT (sd->server), -- SOUP_SERVER_HTTP_ALIASES, http_aliases, -- SOUP_SERVER_HTTPS_ALIASES, https_aliases, -- NULL); -- -- for (i = 0; http_good[i]; i++) -- do_one_server_aliases_test (sd->base_uri, http_good[i], TRUE); -- for (i = 0; http_bad[i]; i++) -- do_one_server_aliases_test (sd->base_uri, http_bad[i], FALSE); -- -- if (tls_available) { -- for (i = 0; https_good[i]; i++) -- do_one_server_aliases_test (sd->ssl_base_uri, https_good[i], TRUE); -- for (i = 0; https_bad[i]; i++) -- do_one_server_aliases_test (sd->ssl_base_uri, https_bad[i], FALSE); -- } --} -- - static void - do_dot_dot_test (ServerData *sd, gconstpointer test_data) - { -@@ -1382,8 +1280,6 @@ main (int argc, char **argv) - - g_test_add ("/server/OPTIONS *", ServerData, NULL, - server_setup, do_star_test, server_teardown); -- g_test_add ("/server/aliases", ServerData, NULL, -- server_setup, do_server_aliases_test, server_teardown); - g_test_add ("/server/..-in-path", ServerData, NULL, - server_setup, do_dot_dot_test, server_teardown); - g_test_add ("/server/ipv6", ServerData, NULL, --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch deleted file mode 100644 index 04713850e1..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 4a2bb98e03d79146c729dca52c8d6edc635218ff Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Mon, 8 Jul 2024 12:33:15 -0500 -Subject: [PATCH] headers: Strictly don't allow NUL bytes - -In the past (2015) this was allowed for some problematic sites. However Chromium also does not allow NUL bytes in either header names or values these days. So this should no longer be a problem. - -CVE: CVE-2024-52530 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/402/diffs?commit_id=04df03bc092ac20607f3e150936624d4f536e68b] - -Signed-off-by: Changqing Li ---- - libsoup/soup-headers.c | 15 +++------ - tests/header-parsing-test.c | 62 +++++++++++++++++-------------------- - 2 files changed, 32 insertions(+), 45 deletions(-) - -diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c -index eec28ad..e5d3c03 100644 ---- a/libsoup/soup-headers.c -+++ b/libsoup/soup-headers.c -@@ -50,13 +50,14 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest) - * ignorable trailing whitespace. - */ - -+ /* No '\0's are allowed */ -+ if (memchr (str, '\0', len)) -+ return FALSE; -+ - /* Skip over the Request-Line / Status-Line */ - headers_start = memchr (str, '\n', len); - if (!headers_start) - return FALSE; -- /* No '\0's in the Request-Line / Status-Line */ -- if (memchr (str, '\0', headers_start - str)) -- return FALSE; - - /* We work on a copy of the headers, which we can write '\0's - * into, so that we don't have to individually g_strndup and -@@ -68,14 +69,6 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest) - headers_copy[copy_len] = '\0'; - value_end = headers_copy; - -- /* There shouldn't be any '\0's in the headers already, but -- * this is the web we're talking about. -- */ -- while ((p = memchr (headers_copy, '\0', copy_len))) { -- memmove (p, p + 1, copy_len - (p - headers_copy)); -- copy_len--; -- } -- - while (*(value_end + 1)) { - name = value_end + 1; - name_end = strchr (name, ':'); -diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c -index 752196e..c1d3b33 100644 ---- a/tests/header-parsing-test.c -+++ b/tests/header-parsing-test.c -@@ -358,24 +358,6 @@ static struct RequestTest { - } - }, - -- { "NUL in header name", "760832", -- "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36, -- SOUP_STATUS_OK, -- "GET", "/", SOUP_HTTP_1_1, -- { { "Host", "example.com" }, -- { NULL } -- } -- }, -- -- { "NUL in header value", "760832", -- "GET / HTTP/1.1\r\nHost: example\x00" "com\r\n", 35, -- SOUP_STATUS_OK, -- "GET", "/", SOUP_HTTP_1_1, -- { { "Host", "examplecom" }, -- { NULL } -- } -- }, -- - /************************/ - /*** INVALID REQUESTS ***/ - /************************/ -@@ -448,6 +430,21 @@ static struct RequestTest { - SOUP_STATUS_EXPECTATION_FAILED, - NULL, NULL, -1, - { { NULL } } -+ }, -+ -+ // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377 -+ { "NUL in header name", NULL, -+ "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36, -+ SOUP_STATUS_BAD_REQUEST, -+ NULL, NULL, -1, -+ { { NULL } } -+ }, -+ -+ { "NUL in header value", NULL, -+ "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28, -+ SOUP_STATUS_BAD_REQUEST, -+ NULL, NULL, -1, -+ { { NULL } } - } - }; - static const int num_reqtests = G_N_ELEMENTS (reqtests); -@@ -620,22 +617,6 @@ static struct ResponseTest { - { NULL } } - }, - -- { "NUL in header name", "760832", -- "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28, -- SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK", -- { { "Foo", "bar" }, -- { NULL } -- } -- }, -- -- { "NUL in header value", "760832", -- "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28, -- SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK", -- { { "Foo", "bar" }, -- { NULL } -- } -- }, -- - /********************************/ - /*** VALID CONTINUE RESPONSES ***/ - /********************************/ -@@ -768,6 +749,19 @@ static struct ResponseTest { - { { NULL } - } - }, -+ -+ // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377 -+ { "NUL in header name", NULL, -+ "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28, -+ -1, 0, NULL, -+ { { NULL } } -+ }, -+ -+ { "NUL in header value", "760832", -+ "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28, -+ -1, 0, NULL, -+ { { NULL } } -+ }, - }; - static const int num_resptests = G_N_ELEMENTS (resptests); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch deleted file mode 100644 index 9de0310c8d..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8331e681c85c3b1893d8d5193783f631bfc07acb Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 13:42:08 +0800 -Subject: [PATCH] tests: Add test for passing invalid UTF-8 to - soup_header_parse_semi_param_list() - -CVE: CVE-2024-52531 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=825fda3425546847b42ad5270544e9388ff349fe] - -Signed-off-by: Changqing Li ---- - tests/header-parsing-test.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c -index b811115..cfcc003 100644 ---- a/tests/header-parsing-test.c -+++ b/tests/header-parsing-test.c -@@ -836,6 +836,17 @@ static struct ParamListTest { - { "filename", "t\xC3\xA9st.txt" }, - }, - }, -+ -+/* This tests invalid UTF-8 data which *should* never be passed here but it was designed to be robust against it. */ -+ { TRUE, -+ "invalid*=\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; filename*=iso-8859-1''\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; foo", -+ { -+ { "filename", "i''\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" }, -+ { "invalid", "\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" }, -+ { "foo", NULL }, -+ }, -+ } -+ - }; - static const int num_paramlisttests = G_N_ELEMENTS (paramlisttests); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch deleted file mode 100644 index 740c28c016..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 12523a592f1216450d18706bcf6c16e0f1ab0ce0 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 13:52:37 +0800 -Subject: [PATCH] headers: Be more robust against invalid input when - parsing params - -If you pass invalid input to a function such as soup_header_parse_param_list_strict() -it can cause an overflow if it decodes the input to UTF-8. - -This should never happen with valid UTF-8 input which libsoup's client API -ensures, however it's server API does not currently. - -CVE: CVE-2024-52531 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=a35222dd0bfab2ac97c10e86b95f762456628283] - -Signed-off-by: Changqing Li ---- - libsoup/soup-headers.c | 45 +++++++++++++++++++++--------------------- - 1 file changed, 23 insertions(+), 22 deletions(-) - -diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c -index 67905b2..39e8d34 100644 ---- a/libsoup/soup-headers.c -+++ b/libsoup/soup-headers.c -@@ -642,8 +642,9 @@ soup_header_contains (const char *header, const char *token) - } - - static void --decode_quoted_string (char *quoted_string) -+decode_quoted_string_inplace (GString *quoted_gstring) - { -+ char *quoted_string = quoted_gstring->str; - char *src, *dst; - - src = quoted_string + 1; -@@ -657,10 +658,11 @@ decode_quoted_string (char *quoted_string) - } - - static gboolean --decode_rfc5987 (char *encoded_string) -+decode_rfc5987_inplace (GString *encoded_gstring) - { - char *q, *decoded; - gboolean iso_8859_1 = FALSE; -+ const char *encoded_string = encoded_gstring->str; - - q = strchr (encoded_string, '\''); - if (!q) -@@ -689,14 +691,7 @@ decode_rfc5987 (char *encoded_string) - decoded = utf8; - } - -- /* If encoded_string was UTF-8, then each 3-character %-escape -- * will be converted to a single byte, and so decoded is -- * shorter than encoded_string. If encoded_string was -- * iso-8859-1, then each 3-character %-escape will be -- * converted into at most 2 bytes in UTF-8, and so it's still -- * shorter. -- */ -- strcpy (encoded_string, decoded); -+ g_string_assign (encoded_gstring, decoded); - g_free (decoded); - return TRUE; - } -@@ -706,15 +701,16 @@ parse_param_list (const char *header, char delim, gboolean strict) - { - GHashTable *params; - GSList *list, *iter; -- char *item, *eq, *name_end, *value; -- gboolean override, duplicated; - - params = g_hash_table_new_full (soup_str_case_hash, - soup_str_case_equal, -- g_free, NULL); -+ g_free, g_free); - - list = parse_list (header, delim); - for (iter = list; iter; iter = iter->next) { -+ char *item, *eq, *name_end; -+ gboolean override, duplicated; -+ GString *parsed_value = NULL; - item = iter->data; - override = FALSE; - -@@ -729,19 +725,19 @@ parse_param_list (const char *header, char delim, gboolean strict) - - *name_end = '\0'; - -- value = (char *)skip_lws (eq + 1); -+ parsed_value = g_string_new ((char *)skip_lws (eq + 1)); - - if (name_end[-1] == '*' && name_end > item + 1) { - name_end[-1] = '\0'; -- if (!decode_rfc5987 (value)) { -+ if (!decode_rfc5987_inplace (parsed_value)) { -+ g_string_free (parsed_value, TRUE); - g_free (item); - continue; - } - override = TRUE; -- } else if (*value == '"') -- decode_quoted_string (value); -- } else -- value = NULL; -+ } else if (parsed_value->str[0] == '"') -+ decode_quoted_string_inplace (parsed_value); -+ } - - duplicated = g_hash_table_lookup_extended (params, item, NULL, NULL); - -@@ -749,11 +745,16 @@ parse_param_list (const char *header, char delim, gboolean strict) - soup_header_free_param_list (params); - params = NULL; - g_slist_foreach (iter, (GFunc)g_free, NULL); -+ if (parsed_value) -+ g_string_free (parsed_value, TRUE); - break; -- } else if (override || !duplicated) -- g_hash_table_replace (params, item, value); -- else -+ } else if (override || !duplicated) { -+ g_hash_table_replace (params, item, parsed_value ? g_string_free (parsed_value, FALSE) : NULL); -+ } else { -+ if (parsed_value) -+ g_string_free (parsed_value, TRUE); - g_free (item); -+ } - } - - g_slist_free (list); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch deleted file mode 100644 index cb1f096110..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a693d49bff058fc20a448dc4e7d324ff0dc6597e Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Wed, 11 Sep 2024 11:52:11 +0200 -Subject: [PATCH 1/3] websocket: process the frame as soon as we read data - -Otherwise we can enter in a read loop because we were not -validating the data until the all the data was read. - -Fixes #391 - -CVE: CVE-2024-52532 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be#f1d67ca0386b145ea201cf88d27f72724d7c6715] - -Signed-off-by: Changqing Li ---- - libsoup/soup-websocket-connection.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c -index a4095e1..65c1492 100644 ---- a/libsoup/soup-websocket-connection.c -+++ b/libsoup/soup-websocket-connection.c -@@ -1140,9 +1140,8 @@ soup_websocket_connection_read (SoupWebsocketConnection *self) - } - - pv->incoming->len = len + count; -- } while (count > 0); -- -- process_incoming (self); -+ process_incoming (self); -+ } while (count > 0 && !pv->close_sent && !pv->io_closing); - - if (end) { - if (!pv->close_sent || !pv->close_received) { --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch deleted file mode 100644 index dcadafe944..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f5b76410de1318f49844dacf6e68692522b6c856 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Wed, 2 Oct 2024 11:17:19 +0200 -Subject: [PATCH] websocket-test: disconnect error copy after the test ends - -Otherwise the server will have already sent a few more wrong -bytes and the client will continue getting errors to copy -but the error is already != NULL and it will assert - -CVE: CVE-2024-52532 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c] - -Signed-off-by: Changqing Li ---- - tests/websocket-test.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/websocket-test.c b/tests/websocket-test.c -index 5e40cf3..1ec9ff6 100644 ---- a/tests/websocket-test.c -+++ b/tests/websocket-test.c -@@ -1331,8 +1331,9 @@ test_receive_invalid_encode_length_64 (Test *test, - GError *error = NULL; - InvalidEncodeLengthTest context = { test, NULL }; - guint i; -+ guint error_id; - -- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); -+ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); - g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received); - - /* We use 127(\x7f) as payload length with 65535 extended length */ -@@ -1345,6 +1346,7 @@ test_receive_invalid_encode_length_64 (Test *test, - WAIT_UNTIL (error != NULL || received != NULL); - g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR); - g_clear_error (&error); -+ g_signal_handler_disconnect (test->client, error_id); - g_assert_null (received); - - g_thread_join (thread); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch deleted file mode 100644 index ab6af72291..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d97bb2e340f5a6d7e56a7738403f9d18bc406b70 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Wed, 13 Nov 2024 14:14:23 +0000 -Subject: [PATCH 3/3] websocket-test: Disconnect error signal in another place - -This is the same change as commit 29b96fab "websocket-test: disconnect -error copy after the test ends", and is done for the same reason, but -replicating it into a different function. - -Fixes: 6adc0e3e "websocket: process the frame as soon as we read data" -Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399 -Signed-off-by: Simon McVittie - -CVE: CVE-2024-52532 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6676a37b6485620c332e568e1a3f530ff] - -Signed-off-by: Changqing Li ---- - tests/websocket-test.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/websocket-test.c b/tests/websocket-test.c -index 2b19a7b..0699a06 100644 ---- a/tests/websocket-test.c -+++ b/tests/websocket-test.c -@@ -1300,8 +1300,9 @@ test_receive_invalid_encode_length_16 (Test *test, - GError *error = NULL; - InvalidEncodeLengthTest context = { test, NULL }; - guint i; -+ guint error_id; - -- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); -+ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); - g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received); - - /* We use 126(~) as payload length with 125 extended length */ -@@ -1314,6 +1315,7 @@ test_receive_invalid_encode_length_16 (Test *test, - WAIT_UNTIL (error != NULL || received != NULL); - g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR); - g_clear_error (&error); -+ g_signal_handler_disconnect (test->client, error_id); - g_assert_null (received); - - g_thread_join (thread); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch deleted file mode 100644 index 106f907168..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2eacbd762332795e00692ddab2515c6da23198d3 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 12 May 2025 14:06:41 +0800 -Subject: [PATCH] sniffer: Add better coverage of skip_insignificant_space() - -CVE: CVE-2025-2784 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304; - https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d] - -Test code is not added since it uses some functions not defined in -version 2.74. These tests are not used now, so just ignore them. - -Signed-off-by: Changqing Li ---- - libsoup/soup-content-sniffer.c | 9 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c -index 5f2896e..9554636 100644 ---- a/libsoup/soup-content-sniffer.c -+++ b/libsoup/soup-content-sniffer.c -@@ -612,8 +612,10 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, SoupBuffer *buffer) - } - - static gboolean --skip_insignificant_space (const char *resource, int *pos, int resource_length) -+skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length) - { -+ if (*pos >= resource_length) -+ return TRUE; - while ((resource[*pos] == '\x09') || - (resource[*pos] == '\x20') || - (resource[*pos] == '\x0A') || -@@ -632,7 +634,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) - { - const char *resource = (const char *)buffer->data; - int resource_length = MIN (512, buffer->length); -- int pos = 0; -+ gsize pos = 0; - - if (resource_length < 3) - goto text_html; -@@ -642,9 +644,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) - pos = 3; - - look_for_tag: -- if (pos > resource_length) -- goto text_html; -- - if (skip_insignificant_space (resource, &pos, resource_length)) - goto text_html; - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch deleted file mode 100644 index c032846ef0..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5709dfffb6fdc5b66ce001bf82a755ad8ad1d992 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Mon, 28 Oct 2024 12:29:48 -0500 -Subject: [PATCH] Fix using int instead of size_t for strcspn return - -CVE: CVE-2025-32050 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323] - -Signed-off-by: Changqing Li ---- - libsoup/soup-headers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c -index 9707ca0..67905b2 100644 ---- a/libsoup/soup-headers.c -+++ b/libsoup/soup-headers.c -@@ -902,7 +902,7 @@ append_param_quoted (GString *string, - const char *name, - const char *value) - { -- int len; -+ gsize len; - - g_string_append (string, name); - g_string_append (string, "=\""); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch deleted file mode 100644 index 34bc8113a4..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f4a67a9a3033586edaee715d40d5992e02d32893 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Sat, 16 Nov 2024 12:07:30 -0600 -Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff - -Co-Author: Ar Jun - -CVE: CVE-2025-32052 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652#500da7cfde649872c49169be34b03a1c42a53ddb] - -Signed-off-by: Changqing Li ---- - libsoup/soup-content-sniffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c -index 9554636..eac9e7b 100644 ---- a/libsoup/soup-content-sniffer.c -+++ b/libsoup/soup-content-sniffer.c -@@ -504,7 +504,7 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer, - guint index_pattern = 0; - gboolean skip_row = FALSE; - -- while ((index_stream < resource_length) && -+ while ((index_stream < resource_length - 1) && - (index_pattern <= type_row->pattern_length)) { - /* Skip insignificant white space ("WS" in the spec) */ - if (type_row->pattern[index_pattern] == ' ') { --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch deleted file mode 100644 index 0d829d6200..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d9bcffd6cd5e8ec32889a594f7348d67a5101b3a Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 12 May 2025 13:58:42 +0800 -Subject: [PATCH] Fix heap buffer overflow in - soup-content-sniffer.c:sniff_feed_or_html() - -CVE: CVE-2025-32053 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a] - -Signed-off-by: Changqing Li ---- - libsoup/soup-content-sniffer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c -index 967ec61..5f2896e 100644 ---- a/libsoup/soup-content-sniffer.c -+++ b/libsoup/soup-content-sniffer.c -@@ -620,7 +620,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length) - (resource[*pos] == '\x0D')) { - *pos = *pos + 1; - -- if (*pos > resource_length) -+ if (*pos >= resource_length) - return TRUE; - } - -@@ -682,7 +682,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) - do { - pos++; - -- if (pos > resource_length) -+ if ((pos + 1) > resource_length) - goto text_html; - } while (resource[pos] != '>'); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch deleted file mode 100644 index c33ebf8056..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4b8809cca4bbcbf9514314d86227f985362258b0 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Wed, 12 Feb 2025 11:30:02 -0600 -Subject: [PATCH] headers: Handle parsing only newlines - -Closes #404 -Closes #407 - -CVE: CVE-2025-32906 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f] - -Signed-off-by: Changqing Li ---- - libsoup/soup-headers.c | 4 ++-- - tests/header-parsing-test.c | 11 +++++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c -index e5d3c03..87bb3dc 100644 ---- a/libsoup/soup-headers.c -+++ b/libsoup/soup-headers.c -@@ -185,7 +185,7 @@ soup_headers_parse_request (const char *str, - /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s) - * received where a Request-Line is expected." - */ -- while ((*str == '\r' || *str == '\n') && len > 0) { -+ while (len > 0 && (*str == '\r' || *str == '\n')) { - str++; - len--; - } -@@ -369,7 +369,7 @@ soup_headers_parse_response (const char *str, - * after a response, which we then see prepended to the next - * response on that connection. - */ -- while ((*str == '\r' || *str == '\n') && len > 0) { -+ while (len > 0 && (*str == '\r' || *str == '\n')) { - str++; - len--; - } -diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c -index c1d3b33..b811115 100644 ---- a/tests/header-parsing-test.c -+++ b/tests/header-parsing-test.c -@@ -6,6 +6,10 @@ typedef struct { - const char *name, *value; - } Header; - -+static char only_newlines[] = { -+ '\n', '\n', '\n', '\n' -+}; -+ - static struct RequestTest { - const char *description; - const char *bugref; -@@ -445,6 +449,13 @@ static struct RequestTest { - SOUP_STATUS_BAD_REQUEST, - NULL, NULL, -1, - { { NULL } } -+ }, -+ -+ { "Only newlines", NULL, -+ only_newlines, sizeof (only_newlines), -+ SOUP_STATUS_BAD_REQUEST, -+ NULL, NULL, -1, -+ { { NULL } } - } - }; - static const int num_reqtests = G_N_ELEMENTS (reqtests); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch deleted file mode 100644 index 41dd3ff3f4..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 15 Apr 2025 12:17:39 +0200 -Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges - -It had been skipping every second range, which generated an array -of a lot of insane ranges, causing large memory usage by the server. - -Closes #428 - -Part-of: - -CVE: CVE-2025-32907 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836] - -Test part not applied since test codes use some functions not in this -version - -Signed-off-by: Changqing Li ---- - libsoup/soup-message-headers.c | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c -index 78b2455..00b9763 100644 ---- a/libsoup/soup-message-headers.c -+++ b/libsoup/soup-message-headers.c -@@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders *hdrs, - if (cur->start <= prev->end) { - prev->end = MAX (prev->end, cur->end); - g_array_remove_index (array, i); -+ i--; - } - } - } --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch deleted file mode 100644 index 2f5366348d..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e6e088e62c10ab91fa2f2ad5c122332aa7cde97c Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 12 May 2025 16:55:37 +0800 -Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than - 4 bytes - -CVE: CVE-2025-32909 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92] - -Signed-off-by: Changqing Li ---- - libsoup/soup-content-sniffer.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c -index eac9e7b..73d2245 100644 ---- a/libsoup/soup-content-sniffer.c -+++ b/libsoup/soup-content-sniffer.c -@@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer) - { - const char *resource = (const char *)buffer->data; - guint resource_length = MIN (512, buffer->length); -- guint32 box_size = *((guint32*)resource); -+ guint32 box_size; - guint i; - -+ if (resource_length < sizeof (guint32)) -+ return FALSE; -+ -+ box_size = *((guint32*)resource); -+ - #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - box_size = ((box_size >> 24) | - ((box_size << 8) & 0x00FF0000) | --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch deleted file mode 100644 index c1dc6860f2..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a7e711d0f162c6edc8acad2a96981d4890784ea3 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 12 May 2025 17:02:55 +0800 -Subject: [PATCH] auth-digest: Handle missing realm/nonce in authenticate - header - -CVE: CVE-2025-32910 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=e40df6d48a1cbab56f5d15016cc861a503423cfe] - -Signed-off-by: Changqing Li ---- - libsoup/soup-auth-digest.c | 3 +++ - 1 files changed, 3 insertions(+) - -diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c -index e8ba990..0ab3499 100644 ---- a/libsoup/soup-auth-digest.c -+++ b/libsoup/soup-auth-digest.c -@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, - guint qop_options; - gboolean ok = TRUE; - -+ if (!soup_auth_get_realm (auth)) -+ return FALSE; -+ - g_free (priv->domain); - g_free (priv->nonce); - g_free (priv->opaque); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch deleted file mode 100644 index 019a35e3be..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch +++ /dev/null @@ -1,94 +0,0 @@ -From eccfca1074fc485a0b60dfb9c8385429a226bf73 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 13:19:38 +0800 -Subject: [PATCH] auth-digest: Handle missing nonce - -CVE: CVE-2025-32910 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=405a8a34597a44bd58c4759e7d5e23f02c3b556a] - -Signed-off-by: Changqing Li ---- - libsoup/soup-auth-digest.c | 45 ++++++++++++++++++++++++++++---------- - 1 files changed, 28 insertions(+), 10 deletions(-) - -diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c -index 0ab3499..10a8591 100644 ---- a/libsoup/soup-auth-digest.c -+++ b/libsoup/soup-auth-digest.c -@@ -132,6 +132,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop) - return g_string_free (out, FALSE); - } - -+static gboolean -+validate_params (SoupAuthDigest *auth_digest) -+{ -+ SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest); -+ -+ if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) { -+ if (!priv->nonce) -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static gboolean - soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, - GHashTable *auth_params) -@@ -169,17 +182,22 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, - if (priv->algorithm == -1) - ok = FALSE; - -- stale = g_hash_table_lookup (auth_params, "stale"); -- if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp) -- recompute_hex_a1 (priv); -- else { -- g_free (priv->user); -- priv->user = NULL; -- g_free (priv->cnonce); -- priv->cnonce = NULL; -- memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); -- memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); -- } -+ if (!validate_params (auth_digest)) -+ ok = FALSE; -+ -+ if (ok) { -+ stale = g_hash_table_lookup (auth_params, "stale"); -+ if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp) -+ recompute_hex_a1 (priv); -+ else { -+ g_free (priv->user); -+ priv->user = NULL; -+ g_free (priv->cnonce); -+ priv->cnonce = NULL; -+ memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); -+ memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); -+ } -+ } - - return ok; - } -@@ -359,6 +377,8 @@ soup_auth_digest_compute_response (const char *method, - if (qop) { - char tmp[9]; - -+ g_assert (cnonce); -+ - g_snprintf (tmp, 9, "%.8x", nc); - g_checksum_update (checksum, (guchar *)tmp, strlen (tmp)); - g_checksum_update (checksum, (guchar *)":", 1); -@@ -422,6 +442,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg) - g_return_val_if_fail (uri != NULL, NULL); - url = soup_uri_to_string (uri, TRUE); - -+ g_assert (priv->nonce); -+ g_assert (!priv->qop || priv->cnonce); -+ - soup_auth_digest_compute_response (msg->method, url, priv->hex_a1, - priv->qop, priv->nonce, - priv->cnonce, priv->nc, - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch deleted file mode 100644 index bdf4d64ca3..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 74c95d54fe42041fe161cb74c76d942ffd37a5dd Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 13:21:43 +0800 -Subject: [PATCH] auth-digest: Fix leak - -CVE: CVE-2025-32910 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=ea16eeacb052e423eb5c3b0b705e5eab34b13832] - -Signed-off-by: Changqing Li ---- - libsoup/soup-auth-digest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c -index 10a8591..6d965d2 100644 ---- a/libsoup/soup-auth-digest.c -+++ b/libsoup/soup-auth-digest.c -@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object) - g_free (priv->nonce); - g_free (priv->domain); - g_free (priv->cnonce); -+ g_free (priv->opaque); - - memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); - memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch deleted file mode 100644 index b3ce9d8bc3..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0984dddb11daf14fdf5ca24077cd0ebda796439a Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 13:25:32 +0800 -Subject: [PATCH] auth-digest: Handle missing nonce - -CVE: CVE-2025-32912 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992?merge_request_iid=434 -https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f] - -Signed-off-by: Changqing Li ---- - libsoup/soup-auth-digest.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c -index 6d965d2..f1621ec 100644 ---- a/libsoup/soup-auth-digest.c -+++ b/libsoup/soup-auth-digest.c -@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, - guint qop_options; - gboolean ok = TRUE; - -- if (!soup_auth_get_realm (auth)) -+ if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce")) - return FALSE; - - g_free (priv->domain); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch deleted file mode 100644 index 9f3bb21a25..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ac844b9fc7945c38ea21fb7cf1a49a5c226d7c9c Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 12 May 2025 16:17:20 +0800 -Subject: [PATCH] Resolve "(CVE-2025-32914) (#YWH-PGM9867-23) OOB Read on - libsoup through function "soup_multipart_new_from_message" in - soup-multipart.c leads to crash or exit of process" - -CVE: CVE-2025-32914 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450/diffs?commit_id=5bfcf8157597f2d327050114fb37ff600004dbcf] - -Test code are not added since some functions not aligned with version -2.74.3 - -Signed-off-by: Changqing Li ---- - libsoup/soup-multipart.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c -index a7e550f..dd93973 100644 ---- a/libsoup/soup-multipart.c -+++ b/libsoup/soup-multipart.c -@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, - return NULL; - } - -- split = strstr (start, "\r\n\r\n"); -+ split = g_strstr_len (start, body_end - start, "\r\n\r\n"); - if (!split || split > end) { - soup_multipart_free (multipart); - soup_buffer_free (flattened); - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch deleted file mode 100644 index 874f62e7ad..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 52a0f9234d384b9dab368835b22e5a5a01542168 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 16 May 2025 14:16:10 +0800 -Subject: [PATCH] auth-digest: fix crash in - soup_auth_digest_get_protection_space() - -We need to validate the Domain parameter in the WWW-Authenticate header. - -Unfortunately this crash only occurs when listening on default ports 80 -and 443, so there's no good way to test for this. The test would require -running as root. - -Fixes #440 - -CVE: CVE-2025-4476 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c?merge_request_iid=457] - -Signed-off-by: Changqing Li ---- - libsoup/soup-auth-digest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c -index f1621ec..a2dc560 100644 ---- a/libsoup/soup-auth-digest.c -+++ b/libsoup/soup-auth-digest.c -@@ -229,7 +229,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, SoupURI *source_uri) - uri = soup_uri_new (d); - if (uri && uri->scheme == source_uri->scheme && - uri->port == source_uri->port && -- !strcmp (uri->host, source_uri->host)) -+ !g_strcmp0 (uri->host, source_uri->host)) - dir = g_strdup (uri->path); - else - dir = NULL; --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch deleted file mode 100644 index c970661694..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 81e03c538d6a102406114567f4f1c468033ce2e4 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Thu, 26 Dec 2024 18:31:42 -0600 -Subject: [PATCH] soup_header_parse_quality_list: Fix leak - -When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings. - -CVE: CVE-2025-46420 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/421/diffs?commit_id=c9083869ec2a3037e6df4bd86b45c419ba295f8e] - - Signed-off-by: Changqing Li ---- - libsoup/soup-headers.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c -index 87bb3dc..9707ca0 100644 ---- a/libsoup/soup-headers.c -+++ b/libsoup/soup-headers.c -@@ -528,7 +528,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) - GSList *unsorted; - QualityItem *array; - GSList *sorted, *iter; -- char *item, *semi; -+ char *semi; - const char *param, *equal, *value; - double qval; - int n; -@@ -541,9 +541,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) - unsorted = soup_header_parse_list (header); - array = g_new0 (QualityItem, g_slist_length (unsorted)); - for (iter = unsorted, n = 0; iter; iter = iter->next) { -- item = iter->data; - qval = 1.0; -- for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) { -+ for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) { - param = skip_lws (semi + 1); - if (*param != 'q') - continue; -@@ -575,15 +574,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) - if (qval == 0.0) { - if (unacceptable) { - *unacceptable = g_slist_prepend (*unacceptable, -- item); -+ g_steal_pointer (&iter->data)); - } - } else { -- array[n].item = item; -+ array[n].item = g_steal_pointer (&iter->data); - array[n].qval = qval; - n++; - } - } -- g_slist_free (unsorted); -+ g_slist_free_full (unsorted, g_free); - - qsort (array, n, sizeof (QualityItem), sort_by_qval); - sorted = NULL; --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch deleted file mode 100644 index 3318093400..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5eb225f02bb35de56cfeedd87bde716bf1cb750b Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Wed, 5 Feb 2025 16:18:10 -0600 -Subject: [PATCH] session: Strip authentication credentails on - cross-origin redirect - -This should match the behavior of Firefox and Safari but not of Chromium. - -CVE: CVE-2025-46421 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b] - -Test code not added since it included some headers not in version 2.74.3 - -Signed-off-by: Changqing Li ---- - libsoup/soup-session.c | 8 ++++- - 2 files changed, 85 insertions(+), 1 deletion(-) - -diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c -index 83421ef..8d6ac61 100644 ---- a/libsoup/soup-session.c -+++ b/libsoup/soup-session.c -@@ -1189,12 +1189,18 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg) - SOUP_ENCODING_NONE); - } - -+ /* Strip all credentials on cross-origin redirect. */ -+ if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) { -+ soup_message_headers_remove (msg->request_headers, "Authorization"); -+ soup_message_set_auth (msg, NULL); -+ } -+ - soup_message_set_uri (msg, new_uri); - soup_uri_free (new_uri); - - soup_session_requeue_message (session, msg); - return TRUE; --} -+} - - static void - redirect_handler (SoupMessage *msg, gpointer user_data) - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch deleted file mode 100644 index c9fbdbacc8..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3844026f74a41dd9ccab955899e005995293d246 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 8 Jul 2025 14:58:30 +0800 -Subject: [PATCH] soup-date-utils: Add value checks for date/time parsing - -Reject date/time when it does not represent a valid value. - -Closes #448 - -CVE: CVE-2025-4945 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/8988379984e33dcc7d3aa58551db13e48755959f] - -Signed-off-by: Changqing Li ---- - libsoup/soup-date.c | 21 +++++++++++++++------ - tests/cookies-test.c | 10 ++++++++++ - 2 files changed, 25 insertions(+), 6 deletions(-) - -diff --git a/libsoup/soup-date.c b/libsoup/soup-date.c -index 9602d1f..4c114c1 100644 ---- a/libsoup/soup-date.c -+++ b/libsoup/soup-date.c -@@ -284,7 +284,7 @@ parse_day (SoupDate *date, const char **date_string) - while (*end == ' ' || *end == '-') - end++; - *date_string = end; -- return TRUE; -+ return date->day >= 1 && date->day <= 31; - } - - static inline gboolean -@@ -324,7 +324,7 @@ parse_year (SoupDate *date, const char **date_string) - while (*end == ' ' || *end == '-') - end++; - *date_string = end; -- return TRUE; -+ return date->year > 0 && date->year < 9999; - } - - static inline gboolean -@@ -348,7 +348,7 @@ parse_time (SoupDate *date, const char **date_string) - while (*p == ' ') - p++; - *date_string = p; -- return TRUE; -+ return date->hour >= 0 && date->hour < 24 && date->minute >= 0 && date->minute < 60 && date->second >= 0 && date->second < 60; - } - - static inline gboolean -@@ -361,8 +361,15 @@ parse_timezone (SoupDate *date, const char **date_string) - gulong val; - int sign = (**date_string == '+') ? -1 : 1; - val = strtoul (*date_string + 1, (char **)date_string, 10); -+ if (val > 9999) -+ return FALSE; - if (**date_string == ':') -- val = 60 * val + strtoul (*date_string + 1, (char **)date_string, 10); -+ { -+ gulong val2 = strtoul (*date_string + 1, (char **)date_string, 10); -+ if (val > 99 || val2 > 99) -+ return FALSE; -+ val = 60 * val + val2; -+ } - else - val = 60 * (val / 100) + (val % 100); - date->offset = sign * val; -@@ -407,7 +414,8 @@ parse_textual_date (SoupDate *date, const char *date_string) - if (!parse_month (date, &date_string) || - !parse_day (date, &date_string) || - !parse_time (date, &date_string) || -- !parse_year (date, &date_string)) -+ !parse_year (date, &date_string) || -+ !g_date_valid_dmy(date->day, date->month, date->year)) - return FALSE; - - /* There shouldn't be a timezone, but check anyway */ -@@ -419,7 +427,8 @@ parse_textual_date (SoupDate *date, const char *date_string) - if (!parse_day (date, &date_string) || - !parse_month (date, &date_string) || - !parse_year (date, &date_string) || -- !parse_time (date, &date_string)) -+ !parse_time (date, &date_string) || -+ !g_date_valid_dmy(date->day, date->month, date->year)) - return FALSE; - - /* This time there *should* be a timezone, but we -diff --git a/tests/cookies-test.c b/tests/cookies-test.c -index 2e2a54f..6035a86 100644 ---- a/tests/cookies-test.c -+++ b/tests/cookies-test.c -@@ -413,6 +413,15 @@ do_remove_feature_test (void) - soup_uri_free (uri); - } - -+static void -+do_cookies_parsing_int32_overflow (void) -+{ -+ SoupCookie *cookie = soup_cookie_parse ("Age=1;expires=3Mar9 999:9:9+ 999999999-age=main=gne=", NULL); -+ g_assert_nonnull (cookie); -+ g_assert_null (soup_cookie_get_expires (cookie)); -+ soup_cookie_free (cookie); -+} -+ - int - main (int argc, char **argv) - { -@@ -434,6 +443,7 @@ main (int argc, char **argv) - g_test_add_func ("/cookies/accept-policy-subdomains", do_cookies_subdomain_policy_test); - g_test_add_func ("/cookies/parsing", do_cookies_parsing_test); - g_test_add_func ("/cookies/parsing/no-path-null-origin", do_cookies_parsing_nopath_nullorigin); -+ g_test_add_func ("/cookies/parsing/int32-overflow", do_cookies_parsing_int32_overflow); - g_test_add_func ("/cookies/get-cookies/empty-host", do_get_cookies_empty_host_test); - g_test_add_func ("/cookies/remove-feature", do_remove_feature_test); - g_test_add_func ("/cookies/secure-cookies", do_cookies_strict_secure_test); --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch deleted file mode 100644 index b15b8c763d..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 15 May 2025 17:49:11 +0200 -Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body - -It could happen that the boundary started at a place which resulted into -a negative number, which in an unsigned integer is a very large value. -Check the body size is not a negative value before setting it. - -Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449 - -Part-of: - -CVE: CVE-2025-4948 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0] - -Signed-off-by: Changqing Li ---- - libsoup/soup-multipart.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c -index dd93973..ce2fc10 100644 ---- a/libsoup/soup-multipart.c -+++ b/libsoup/soup-multipart.c -@@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, - */ - part_body = soup_buffer_new_subbuffer (flattened, - split - flattened->data, -- end - 2 - split); -+ end - 2 >= split ? end - 2 - split : 0); - g_ptr_array_add (multipart->bodies, part_body); - - start = end; --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch deleted file mode 100644 index 7bc3e8da99..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a7d0c58608ed830bedfb6b92aea11e00feb55aa9 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 19 May 2025 17:48:27 +0200 -Subject: [PATCH] soup-multipart: Verify array bounds before accessing its - members - -The boundary could be at a place which, calculated, pointed -before the beginning of the array. Check the bounds, to avoid -read out of the array bounds. - -Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447 - -CVE: CVE-2025-4969 -Upstream-Status: Backport -[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/467/diffs?commit_id=b5b4dd10d4810f0c87b4eaffe88504f06e502f33] - -Signed-off-by: Changqing Li ---- - libsoup/soup-multipart.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c -index ce2fc10..a29cdf0 100644 ---- a/libsoup/soup-multipart.c -+++ b/libsoup/soup-multipart.c -@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end, - continue; - - /* Check that it's at start of line */ -- if (!(b == start || (b[-1] == '\n' && b[-2] == '\r'))) -+ if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r'))) - continue; - - /* Check for "--" or "\r\n" after boundary */ --- -2.34.1 - diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb deleted file mode 100644 index 68ec576d9b..0000000000 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY = "An HTTP library implementation in C" -DESCRIPTION = "libsoup is an HTTP client/server library for GNOME. It uses GObjects \ -and the glib main loop, to integrate well with GNOME applications." -HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome/libs" -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ - file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \ - file://0001-CVE-2025-32911.patch \ - file://0001-Fix-possibly-uninitialized-warnings.patch \ - file://0001-Remove-http-and-https-aliases-support-test.patch \ - file://CVE-2024-52532-1.patch \ - file://CVE-2024-52532-2.patch \ - file://CVE-2024-52532-3.patch \ - file://CVE-2025-32053.patch \ - file://CVE-2025-2784.patch \ - file://CVE-2024-52530.patch \ - file://CVE-2025-32906.patch \ - file://CVE-2025-32914.patch \ - file://CVE-2025-46420.patch \ - file://CVE-2025-46421.patch \ - file://CVE-2025-32050.patch \ - file://CVE-2025-32052.patch \ - file://CVE-2025-32909.patch \ - file://CVE-2025-32910-1.patch \ - file://CVE-2025-32910-2.patch \ - file://CVE-2025-32910-3.patch \ - file://CVE-2025-32912.patch \ - file://CVE-2024-52531-1.patch \ - file://CVE-2024-52531-2.patch \ - file://CVE-2025-4476.patch \ - file://CVE-2025-32907.patch \ - file://CVE-2025-4948.patch \ - file://CVE-2025-4969.patch \ - file://CVE-2025-4945.patch \ -" -SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" - -CVE_PRODUCT = "libsoup" - -S = "${UNPACKDIR}/libsoup-${PV}" - -inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc - -UPSTREAM_CHECK_REGEX = "libsoup-(?P2(\.(?!99)\d+)+)\.tar" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -PACKAGECONFIG ??= "" -PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards -PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" -PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" -PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled" -PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof" - -# Tell libsoup where the target ntlm_auth is installed -do_write_config:append:class-target() { - cat >${WORKDIR}/soup.cross <