From patchwork Tue Nov 18 00:27:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74827 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 23A2FCEBF92 for ; Tue, 18 Nov 2025 00:27:36 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.362.1763425651271230698 for ; Mon, 17 Nov 2025 16:27:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bs6+DoWA; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2958db8ae4fso45290245ad.2 for ; Mon, 17 Nov 2025 16:27:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425650; x=1764030450; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x8rwKXg40rnw33IHXw8jb25EBKtc+JtVPOuleINME8k=; b=bs6+DoWAxjR1dDq0/ugOv57NLbLwzNrVF/tdPLvKBcwqg0auTEjrzrBEfWBqY8ydQY HXewt38UDVzE1aSSKmZ4OlDYfhZEBHxS6aGOWQ0WoWustwEJfWh9Ah4W7v17QJWnUYIy pC+HpEv2jSs8RptlZlP4wfhGZDd6ofWNRGPQwW6BUo4556Sd6FFynoMpjGDWQhrX+4/C l3Y+XoqLyaZLe3fjZ1yeRmo7CbiMbVE0GMUxFu/2D22vEvxVBWpFr/kYFDoSuib9ce1I ys7nPGTEXxT+iQZM0ex/vqwSxQ06C2P8ryfwPbMfq2erWjJZ6g4LZjSy4j9sKHqpkuy2 Y07w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425650; x=1764030450; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=x8rwKXg40rnw33IHXw8jb25EBKtc+JtVPOuleINME8k=; b=WXqHCvheWa/1s+MaHUVNux4HTKC2B0QRrvUg+bN83ZKT5gRvDeQGSnNwQdfruWHRn3 bJtpiz3eeEVyl41VkjOLhBUzKX4RQ5I2CXhG/GONrlxwFs6fuBmtfYFBjga78CHVGvfZ 7DtvaF7dkb3XBmL4k6/IkdFJd/hNGkjiyGSPjRUpkJwa1HE8rpT56NW/4r1qNV1xJuSi FQw+SxdHWJdrppBQ1i8UlHqSGpKUA0qOU1XXJyucv4SY3sxmkuCpZNkgl/apxS4qYNNU AIVXRFvTdqcERWKpF3rsiaWsqup7/yswWfnNglk90sRvUiRLwrdfnuV+BRZBA9qXkkvi nrSA== X-Gm-Message-State: AOJu0YyxYqtL9GcMDVVBkRl9voBfUWzVBUq22TgtWKn9fVYsNwIT8opY aziTELsFeJtjqb1h1LwJqVpOH70Lfp4dhosLvsO0IPg3Fb7itDXt2qtz4tW8OQ== X-Gm-Gg: ASbGncvkDk+h4OUcIYHZR2KxyUvMK9IQtTBvtdN1/x2ED8qDJbNMsAM2PR01Jooj3E5 SC7V2darJ6x4oeYqwfJLLwax8Hra0XEq7AU+zYUxlCtmue4NkffKm0hGo6LYOsRJkTz2i1Togva RL2yWRjzv63Rw9qPWlCec6s4VYeK+8Snsku5YHjsVF6kO+EEews5V4GvLpIWhhIoRLz67LmG24G X70n6OuUri1GEEJubxXT9Dn8U7whHQIGsuziscEi623y/Hp9X4ixau4ztBTeQk0PlBlp4lM0TKs 8Zd2iq+if/x4U05iCCUNPoi3HO02Kbu8C+9zh1Cbof/uucEXyD0ZfW97LJVa/jAVF7DDwNhWvnu nqUQ99XJc4DRzsK55y/MHAr8m6bWS6RKhGolzUg7hS4G0U1ErCQD6K+BLehXVXtmZ9jUyHO94Dl KPZnmTYC11qaVSMmqtCLefgrA= X-Google-Smtp-Source: AGHT+IHtanz1dmmdYuQIIW6KamlVPhVGWRpzJybE+fRTmP+GjrFxx1AewwaiITcjioyXbMmt2vk8Dg== X-Received: by 2002:a17:902:e947:b0:290:b53b:7455 with SMTP id d9443c01a7336-2986a6b8746mr165180925ad.10.1763425650426; Mon, 17 Nov 2025 16:27:30 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:30 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 1/6] zchunk: upgrade 1.5.1 -> 1.5.2 Date: Tue, 18 Nov 2025 13:27:18 +1300 Message-ID: <20251118002723.829508-1-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121787 From: Ankur Tyagi Changelog: https://github.com/zchunk/zchunk/compare/1.5.1...1.5.2 Signed-off-by: Ankur Tyagi --- .../recipes-support/zchunk/{zchunk_1.5.1.bb => zchunk_1.5.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/zchunk/{zchunk_1.5.1.bb => zchunk_1.5.2.bb} (92%) diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb b/meta-oe/recipes-support/zchunk/zchunk_1.5.2.bb similarity index 92% rename from meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb rename to meta-oe/recipes-support/zchunk/zchunk_1.5.2.bb index 9ef380005c..bbdd06dfda 100644 --- a/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb +++ b/meta-oe/recipes-support/zchunk/zchunk_1.5.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" -SRCREV = "69dd7d6764e333413dd12848607d72cab310e406" +SRCREV = "222d1a4da3661dd95c2445b96f7e1e208f55d219" DEPENDS = "zstd" DEPENDS:append:libc-musl = " argp-standalone" From patchwork Tue Nov 18 00:27:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74826 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 24860CEBF93 for ; Tue, 18 Nov 2025 00:27:36 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.363.1763425653166900079 for ; Mon, 17 Nov 2025 16:27:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZTc6QaCz; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-297d4a56f97so54192405ad.1 for ; Mon, 17 Nov 2025 16:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425652; x=1764030452; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TPwjWxpYxu5XHF4J+u4+fC2RElQVYeZTkVsAQBeIKeo=; b=ZTc6QaCzI6UKa4eDkFBi2VGGCs8GZHTeEJWcFmHTbt8txw4HfcPHDqr2whDSyjxncg fjoFAYHwPrk8wQqMH7PqQEcuv1iDu8l4F2NC1/HiLAJqqBNNCXvERG5i3FobBzarqLcR TvkD9d55DwPOIVPjn6T1WZUj4wrBe0VpR0gWstg+sLaFOoJ1JqHGa3/q2c2yxTbOlN3I 9NLgV1rr2/N1dL0HV8a5Pggto9VpeNW2ha79JpgxAyvpAgaag4YUOUjsS7QzdeyWZ4+q MwbmdnbCjYMBKW2GdIAWo4HYNxqVXHufHbn6lM6lE+fBBf7hxDXBB4N8viuDOSByTeUh lV7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425652; x=1764030452; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TPwjWxpYxu5XHF4J+u4+fC2RElQVYeZTkVsAQBeIKeo=; b=wv9yvJ7FMzmxZw01yN1WDtCGlysF2MrayZ1ASstxaGWhKibA9rP+ZXTCGxpWY3DT50 4zUa8yCtx4jUR2AvBlp1Qemsi+7gL4qb/ycTJ/nV6W+luIt3i9Nlf3n0dxHmfoTaZSxO e8AGb7iDXfFtB6UYiastig5PKOBY8SHv637FBzg2zxQ+FCs+b2QaqN20t8YEVB1e9SId XE82fN4zrype064Ph1ZC2mE8VyB7N9nZAIGznB24GBWvkt5cHY7tfuyMvuThS58tWzaN bF528yU06khd24OinM/cr0FC1B0wPQX1if1Pnnv7PVVn5UDkCS0JKxxsGFyc9Obqf+H5 8jWg== X-Gm-Message-State: AOJu0Yxw5gyL9DHyYK0w1iwl3uKGqt9T5NvDcKK+wCEroOFhpsk25M3C iSkS8Ie8CSPksLBxUcmRTsjDWkuklkDIavq7A9TGOr/poJP+GnlIbkmp8ikQLw== X-Gm-Gg: ASbGnct3ZbZWDCNhCIJSP0siTWbCfqdoLRlGWNEblBrS1/A3iJDK7AXI9CMlOHnMaOB FX6o5A9ssWXH/4IsHaghPmz2wpyjf0n2E7mr6eq2gZjvdKC7p66U13fxhE/eytH4cpxRid5FBP3 d3voCqO+cocLIJ/2QPuwEpDGaz/6ix6FRiiWHXlLK9+dG9/KDeI18qXt2V/C+Urko0s/7zLm47z 2BI5HkQyVxW7aNO39GzgcDoDwyYYUGGgbhsOV2B9CcjCir7MoKqBh9Jl/qGlInSq99ETGFCesE8 RS1Enj3hjhLk/Yxfk25aGNKE6KV3NB/nG1wF3S0ZEufSSc6tb9CQexnsKLzPh2gcn/b3YB8Eb69 diKm3Wh6Y3GTPPVtwOvpW9UhsfLWH/xPFJq1CND54uNVy9S9of5H8a5tef8Yb4M+u4L5WB2sBmP 9G22PwzaetbIydoD+cDpqOV2ovky0mwnJeunvnNDhBawm5 X-Google-Smtp-Source: AGHT+IE2sQX82J54MjQDj1CNqQGafqEk+w+AlMUGoV6BEEXMEioWZI+Aqc7HncUFMRTs6XizROa0Og== X-Received: by 2002:a17:902:f70c:b0:298:3e3a:ae6 with SMTP id d9443c01a7336-2986a7420f6mr163624125ad.48.1763425652434; Mon, 17 Nov 2025 16:27:32 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:32 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 2/6] smarty: upgrade 5.4.5 -> 5.6.0 Date: Tue, 18 Nov 2025 13:27:19 +1300 Message-ID: <20251118002723.829508-2-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118002723.829508-1-ankur.tyagi85@gmail.com> References: <20251118002723.829508-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121788 From: Ankur Tyagi Also update CVE_PRODUCT. Changelog: https://github.com/smarty-php/smarty/blob/v5.6.0/CHANGELOG.md --- .../smarty/{smarty_5.4.5.bb => smarty_5.6.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/smarty/{smarty_5.4.5.bb => smarty_5.6.0.bb} (82%) diff --git a/meta-oe/recipes-support/smarty/smarty_5.4.5.bb b/meta-oe/recipes-support/smarty/smarty_5.6.0.bb similarity index 82% rename from meta-oe/recipes-support/smarty/smarty_5.4.5.bb rename to meta-oe/recipes-support/smarty/smarty_5.6.0.bb index 047f10589d..88afc55c15 100644 --- a/meta-oe/recipes-support/smarty/smarty_5.4.5.bb +++ b/meta-oe/recipes-support/smarty/smarty_5.6.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master;tag=v${PV}" -SRCREV = "e26f82d02c4d18fc82094c28fbc65f711e39ed5d" +SRCREV = "1fc41e385da8a27a87bec5914392ab662a7bb8ec" INHIBIT_DEFAULT_DEPS = "1" @@ -34,4 +34,4 @@ FILES:${PN} += "${datadir}/php/smarty3/" RDEPENDS:${PN} = "php" -CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue." +CVE_PRODUCT = "smarty:smarty" From patchwork Tue Nov 18 00:27:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74828 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 257DBCEBF96 for ; Tue, 18 Nov 2025 00:27:36 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.349.1763425655255963457 for ; Mon, 17 Nov 2025 16:27:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bohWdFqN; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-297d4ac44fbso43755695ad.0 for ; Mon, 17 Nov 2025 16:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425654; x=1764030454; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=up0s1DwiIAdcKQgyhH77INWUwhtX4j7FgmTxkyj+Zss=; b=bohWdFqNNS1J4YrwzhOb8EMsWQsq259BQsyKrqpNGU/id8IsvfRXQ+z8dR2aZRUOt2 DeJY8LqZuV9mkkXdIMu2zHVYxUX5cELo+E2QCydhBOYSIwF7Snd4D9KO2bgA+EtNbZsw a4Mexyoj982mzO3NpuEWHZ6BPcaRQPeWjAlffxjY6du4Uhg46DXkMRN1Uxjfq0lylXSf aIx3C1FmhNGAZu76LHu5ZAvWotvx+0G0Fx3MUi8WRtFTKGNdHQo6YbxtZgcT4DFormBW XGwHhzxT4RZY0urUq+6YXIufwGvUyi42iIig082+epgWvvfMNxbdGjSl5gAGqjD/jwMi ZFbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425654; x=1764030454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=up0s1DwiIAdcKQgyhH77INWUwhtX4j7FgmTxkyj+Zss=; b=XDM7CRfE2nFU17e0Asda2z+MVAimPCoWyF4MpMGiLw2Ew0sly4etUytw42xlmU69W3 coXa3MGjx2y8khh0mofTh9NGc7C/8H5JSsyr66gnNTCoiw7BChT3GiUpX1vWQ0b7E2ej ymcmq1uD8069LQvm01fuLhfj2WVF2n2Xof7jPSV2H3j35sLv9HyZkpuJoVSBrwku8DrW P/JK5rfv5RmOimicLdb2ENfhrRfp5LzHWQmAe5MUTquCX7VRJHvSnHccWR4y+QVOzeRF WiaTCD2BcbsyqU/GcldQFLFeJJraI6SQheJ3V4WfzbzBo7bQ83ntIWGATWfJb44HAhEI ZLHQ== X-Gm-Message-State: AOJu0Yy5O2Tc0Oc06BO1gpqqcMj5l0vhP6yHwAug7Sxx49gwkiu2Ogfx rmZK9988Eivh346nCKG088C1b+dm5mpVKO7VKlVT8KtBdqRoYvY37UmTrTXybg== X-Gm-Gg: ASbGnctnfFl2o96dKlMa+IvZgy6r/jNFX/lVZKWoQFcZpDxEB3u8k2btKhI8fMKGYXv Vh0Nsc6Pl9cdDuflx+LQxTGIe5egiI7L9Hv9+cFwzFJFMOT0RSCkT4e9kMlEzaDM2MxyEfG0Umn /5gX7v/x4+CuckgLV6Rg+LpGSNgRxAmTg8M//Lek5hFHpINAPu0agsalcLVYKt6J+fqpCl4k1RI fYfTuPVVEzNQGwrVnGHjsl4w9MmmJC5jcfYmNbVtrLblaY6Ie6ln3LIPo4BpPZi9ial4w5Rnwju Xq2zQ/jmPwXm2/qcAJOX3j4Z6c//ReGCWVzN1gNLfkLB/A5kkKc0VfC5hZbJFDid/nUSp4gpXnY l76bWTMs995lFJttu+qmMA9xUuZiPOya4rDimXcmc105gz+Goh03+b6CxFl4+VgeOUnWtAW/5Zu JC8ZI49HVE9N/WE2oBLaoqrgBhEl/wJ8s48w== X-Google-Smtp-Source: AGHT+IG420H/iJJ9Fc6a6Ix8pdJrxTLK59YD3d7jNtTopFQCmYcCzByzM3Tp3Ms6dhYMRIT67lZudA== X-Received: by 2002:a17:903:292:b0:295:5898:ff5c with SMTP id d9443c01a7336-299f55841b6mr13645765ad.16.1763425654464; Mon, 17 Nov 2025 16:27:34 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:34 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 3/6] librdkafka: upgrade 2.11.0 -> 2.11.1 Date: Tue, 18 Nov 2025 13:27:20 +1300 Message-ID: <20251118002723.829508-3-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118002723.829508-1-ankur.tyagi85@gmail.com> References: <20251118002723.829508-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121789 From: Ankur Tyagi Changelog: https://github.com/confluentinc/librdkafka/releases/tag/v2.11.1 Signed-off-by: Ankur Tyagi --- .../librdkafka/{librdkafka_2.11.0.bb => librdkafka_2.11.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/librdkafka/{librdkafka_2.11.0.bb => librdkafka_2.11.1.bb} (92%) diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb b/meta-oe/recipes-support/librdkafka/librdkafka_2.11.1.bb similarity index 92% rename from meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb rename to meta-oe/recipes-support/librdkafka/librdkafka_2.11.1.bb index b1f5196f93..23ae2fbb29 100644 --- a/meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb +++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.11.1.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=40b04809b5d6f648f20f45143cbcb1ad" SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master" -SRCREV = "c56a3e68483ae33622901988ab9c4085f0785c3c" +SRCREV = "69b1865efdc0118cd017760d038d34e52fb3f0d0" DEPENDS = "zlib openssl zstd curl" From patchwork Tue Nov 18 00:27:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74829 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 E08D5CEBF92 for ; Tue, 18 Nov 2025 00:27:45 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.366.1763425657432531704 for ; Mon, 17 Nov 2025 16:27:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GHgKukAp; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-29853ec5b8cso57334445ad.3 for ; Mon, 17 Nov 2025 16:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425657; x=1764030457; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SkIB1W3RIShV3Eb/437Ww8B8wTb9wOud6m6//CZK+dU=; b=GHgKukApHPzUH5N59kzZ35JlvdBESnIYwjUKxQzuUgSSiMigKrWW/1xGprwZn8yfc8 bnv1XubaHTMjS695uCHcydW8JJrc+eIOuqfiuZ0Su8lONlOlvQcTERnpWertIhSs/t1B tJ6SwW9qwYqQe5UcVI3zN8IpSjhnv3llwC0zJdxQY8lfr3GhZLLyX36ZA9hI+1eAbqZF Rwb/Q13C1Lk5FE8eEjPqNC369PafZ0YAM0iPrfoJwq5YEMHSluC+g3zA3YcdnVB9ECD4 2lhNN6iqDauEWrfUCWGHrzXhdwg/BU/nRLwWD9e2QnxndrYGmXpi8e9hV8tMDO9pkukE Q5tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425657; x=1764030457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SkIB1W3RIShV3Eb/437Ww8B8wTb9wOud6m6//CZK+dU=; b=wJauvXuH3PAVII9ZlN6G71QxgSwFZrpYnPTqx6PY3lwwkjgux23Y4RW23ka+wUf1em SiqVLRGItjEA+YWC8ca0mq83ETz6VJWT/3PGbYbo5dUKpJa013SlNEv6WfKjXHBA8SfF sF8hWLiFPMlvpXVSKHTcKTwSyYIKqXORGscXiVdrSv62T96HDjwB7tKx8UqmJB/SmMz7 27nPoEFNfWj3IL7+4jAJeb5t0EcjrT55AuPhHYGreBGBvEXlIh9KkIUyc/f2dpI8vU6Q 1ECPty/IojPpuqHKQ9llXYgiIKykgpwNJWNLvBKsU66toqUZFkUZb/HnoQMw+gO8v6k5 DLdg== X-Gm-Message-State: AOJu0Yx1q4B/u/Ta1dYwTpJlXkgF47jTHm+YLhNdwRowc5Z4DqtBgcku JnoYlHXoYUGbRN/2c803knoM6uiVIaqbkzu0vd4XD9XH9P/kRlXdntwoHA8NhA== X-Gm-Gg: ASbGnctxS/8UmId43imtltXjZS2qYLMlEacErNu3mz+jDyau/DUhFodrCJfZ3Tioo9J fbjGI+MX9sUyDHos8hbj6ryX/smnCYqgSYH2Hx/pkhf2hyQKhjBgRbC8X25/NGaYdLQ4dMVaOXp moEaJs0kQKKhpXuAxuaaQKTITdkZ0KNTIZaDa07OCeQ0+d59bW11Jko53tRv0UR7PY/cH7w487c 93/ZoxX3vjipjZROG0Ls6ujqT/lToCtVM3bBmuCk/UghfDIMlNpGN6/zo6Rgzuxj1ZuqW7/mdws 430Z82iXvt2s37TvEZBCERMBEqNJw2fOvkMUqWY2WqkVJ8Pt2nmWHTq6+WftFJjKj9JZsZ49NYl zo0stBgiIhwWHvK1F4cyvZKKtd9MY6FMfqjKA82q0dMqfFP4xFY1qaVu1DcxeR8eCAZ8WFEyCqX v0VLNMrSTVrNfIZYd6hoLYb88= X-Google-Smtp-Source: AGHT+IFlic6wB9Lzx8AGVFAV64vzsV0MrdYm7A5AXqKlmB+b5L9sArUD/xnzf0d1bm0hhklNQz+hGg== X-Received: by 2002:a17:903:3bc7:b0:290:9a74:a8ad with SMTP id d9443c01a7336-2986a76f2b7mr162118775ad.53.1763425656581; Mon, 17 Nov 2025 16:27:36 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:36 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 4/6] proj: upgrade 9.6.2 -> 9.7.0 Date: Tue, 18 Nov 2025 13:27:21 +1300 Message-ID: <20251118002723.829508-4-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118002723.829508-1-ankur.tyagi85@gmail.com> References: <20251118002723.829508-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121790 From: Ankur Tyagi Also update HOMEPAGE and SRC_URI. Changelog: https://proj.org/en/stable/news.html#id2 Signed-off-by: Ankur Tyagi --- .../proj/{proj_9.6.2.bb => proj_9.7.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-navigation/proj/{proj_9.6.2.bb => proj_9.7.0.bb} (79%) diff --git a/meta-oe/recipes-navigation/proj/proj_9.6.2.bb b/meta-oe/recipes-navigation/proj/proj_9.7.0.bb similarity index 79% rename from meta-oe/recipes-navigation/proj/proj_9.6.2.bb rename to meta-oe/recipes-navigation/proj/proj_9.7.0.bb index 046950a1c0..2a41f1ec52 100644 --- a/meta-oe/recipes-navigation/proj/proj_9.6.2.bb +++ b/meta-oe/recipes-navigation/proj/proj_9.7.0.bb @@ -1,12 +1,12 @@ SUMMARY = "PROJ.4 - Cartographic Projections library" -HOMEPAGE = "http://trac.osgeo.org/proj/" +HOMEPAGE = "https://proj.org/en/stable/" SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" DEPENDS = "sqlite3 sqlite3-native" -SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "53d0cafaee3bb2390264a38668ed31d90787de05e71378ad7a8f35bb34c575d1" +SRC_URI = "https://download.osgeo.org/${BPN}/${BP}.tar.gz" +SRC_URI[sha256sum] = "65705ecd987b50bf63e15820ce6bd17c042feaabda981249831bd230f6689709" inherit bash-completion cmake lib_package pkgconfig From patchwork Tue Nov 18 00:27:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74830 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 02FEFCE8D6B for ; Tue, 18 Nov 2025 00:27:46 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.353.1763425659896189984 for ; Mon, 17 Nov 2025 16:27:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gB+BzeQx; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-29844c68068so49083385ad.2 for ; Mon, 17 Nov 2025 16:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425659; x=1764030459; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2nTxBwnap5goyvDFmIU80rkfxAJ6fbnyKMYHjVl4Gds=; b=gB+BzeQxTIyMAyFCtzUSquLau4ttSQCSquNAuE6SZM2sYkYnHkxxypOFGNbwtuAM7g dvuO50rwpmnrQbzv3ra33jOc0bAr5o7uzePsKBb+j6hoBjPjKfMX175zaHOS++zLKI2c YPGTuZcEfdMtFf4CzFgyUdoITpLgrbN1kZDrteZ5dnvBEeDKXv7k22b6WMO1KUlnfwZo 1y/WdqH8CU+UWv9pRzqLLncY5EWuMpGLCXW0hn/QReeuSNkmKN3VeS/9K6U9Qlophtln uC+szOrOsENsBOL7FknU7GaRypPlM882XD7Uc8cKQ5tXTy0XhbUo6rKea+XiN5/oClv9 l1hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425659; x=1764030459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2nTxBwnap5goyvDFmIU80rkfxAJ6fbnyKMYHjVl4Gds=; b=gIiZ/BHRsXWSQLhHeAUxLdl3sW7Y1vwbMQd5kTd69UKvcdeESi9W3hrizWs4P09i8j xxWG81lXitXf9nfJCFicMK9ZhwUxId4zO8wlwlv3fjviC7D72dWPHQ8u3w2VzkF8KG9j JjVq+z5m+zqJo0K2uEF/RoEGlOqSTYNMAkmNpHNBRROo+sKyJVsCwZEJmuLTc5haCoU/ 947U0C+zY17eVXA307wACbZ6bwfBvwVUJ7oHT2R+yuYkscdN5QMVobW5q+RGk1jtN8zs wtXlU7Z+XonL5ZR+p642TQtTWlnWqKxAmP37PgdQ6i84PLAKSdMFUnJKqke4eY3ikxPj 2S+Q== X-Gm-Message-State: AOJu0YxXMq0K4fZsPg2q4gwBXySLI5I0n8A75e+tJgobMenfNfOJXMUL RxbHiQp8dYtirCyV4KtJxdcyaOKvf+AqfuHRTRUBbzS46XZ/dFB58p7/gRXhzg== X-Gm-Gg: ASbGnctK/u2M2KPAfz1bhDtZF5g6Tql8hCe42q8g191FiYD2L2g0omItrxdlMRma86I Mv8iDcM/BU0Nr40iXa8942e4Pi8HekdoIF2mn3S+ifd+d7ov7fV+f6nHmPO1794PxEQdAOz9xBi KbfNuO26SHCmqLeuii8AoXIQ9WJtTvOJJ38aAxUCzAU0QHxKN1SF+hsBGyxa0SkzfEBcycgt+eo LVqjFuUQiQw4znMYSYrDySGqWk3uf1RLB4WdL0fm6a47vHcBPzR/ARXIgSrAOuTJvW6fXOwAJ5G 30zBzqITV5oYumIb8d+1zguzabwlH7jKeCi7/C2Imykndu1Kg/UI0JSVDvhTjA3j8N4v+u/iaYR Bcl69Rmq6KAO70eFLYzvbhzd5My5Y4ZmktbJdNO2dh+GQrczRknAyHxVnNVEpr0uHPPsn+rwbQ2 CieQ9lHtswOGN3ynh/GlUyDj4IfcZhWDTgrg== X-Google-Smtp-Source: AGHT+IFrUAy1dTu8AXYQ2RBDZSVyUzpsZn57Xa4JSwl8g4NSzAmJTT2cXzulNbiafLbu0VoK0yMk4w== X-Received: by 2002:a17:903:234a:b0:297:dad8:f25b with SMTP id d9443c01a7336-2986a5fd92fmr172085835ad.0.1763425658825; Mon, 17 Nov 2025 16:27:38 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:38 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 5/6] multipath-tools: upgrade 0.11.1 -> 0.11.3 Date: Tue, 18 Nov 2025 13:27:22 +1300 Message-ID: <20251118002723.829508-5-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118002723.829508-1-ankur.tyagi85@gmail.com> References: <20251118002723.829508-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121791 From: Ankur Tyagi Dropped 0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch and 0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch which are now merged in the upstream. Refreshed other patches for the new version. Release Note: https://github.com/opensvc/multipath-tools/blob/0.11.3/NEWS.md Signed-off-by: Ankur Tyagi --- .../0001-RH-fixup-udev-rules-for-redhat.patch | 7 ++--- ...uxsock.c-Include-string.h-for-memcpy.patch | 28 ------------------ ...property-blacklist-exception-builtin.patch | 5 +--- ...RH-don-t-start-without-a-config-file.patch | 6 ++-- .../0004-RH-use-rpm-optflags-if-present.patch | 11 +++---- .../files/0005-RH-add-mpathconf.patch | 2 +- ...om-kernel-cmdline-mpath.wwids-with-A.patch | 5 +--- ...-on-invalid-regex-instead-of-failing.patch | 5 +--- ...-default-find_mutipaths-value-to-off.patch | 5 +--- ...modify-create-config.mk-for-cross-co.patch | 7 ++--- .../files/0010-Always-use-devmapper.patch | 7 ++--- ...fix-bug-of-do_compile-and-do_install.patch | 5 +--- ...add-explicit-dependency-on-libraries.patch | 5 +--- ...Add-target-docs-man-dmmp_strerror.3.patch} | 4 +-- ...ile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch | 29 ------------------- ...ls_0.11.1.bb => multipath-tools_0.11.3.bb} | 6 ++-- 16 files changed, 24 insertions(+), 113 deletions(-) delete mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch rename meta-oe/recipes-support/multipath-tools/files/{0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch => 0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch} (95%) delete mode 100644 meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch rename meta-oe/recipes-support/multipath-tools/{multipath-tools_0.11.1.bb => multipath-tools_0.11.3.bb} (94%) diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch index 909fd77ba2..e7a36af622 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch @@ -1,4 +1,4 @@ -From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001 +From 9fb89db1bb09efc5b31a140c26d540072083c5e5 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Thu, 13 Apr 2017 07:22:23 -0500 Subject: [PATCH] RH: fixup udev rules for redhat @@ -28,7 +28,7 @@ Signed-off-by: Yi Zhao 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.inc b/Makefile.inc -index 729618bd..69521882 100644 +index 65f6efc8..596e68c0 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -62,7 +62,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d @@ -74,6 +74,3 @@ index 67fb5e62..2ea9e528 100644 $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch deleted file mode 100644 index 128a0c4d8d..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1d444772db14f4acb8d47b874462b0cc171ab672 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 17 Feb 2025 12:01:59 -0800 -Subject: [PATCH] libmpathutils/uxsock.c: Include string.h for memcpy - -Fixes -uxsock.c:72:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - -Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250217200503.4166910-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj -Cc: Benjamin Marzinski -Cc: Martin Wilck ---- - libmpathutil/uxsock.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libmpathutil/uxsock.c b/libmpathutil/uxsock.c -index 2135476d..a474874e 100644 ---- a/libmpathutil/uxsock.c -+++ b/libmpathutil/uxsock.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch index a578280491..3ed340c2cf 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -1,4 +1,4 @@ -From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001 +From 14716a10c22206722ee48b44b88f0eec5203f228 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 1 Mar 2024 10:34:06 +0800 Subject: [PATCH] RH: Remove the property blacklist exception builtin @@ -58,6 +58,3 @@ index 17e1b54a..2cfb18b8 100644 } static void free_ble(struct blentry *ble) --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch index 649f1fa778..6ff738cdec 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch @@ -1,4 +1,4 @@ -From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001 +From 2cb4657779cbb6ba2309f158366df4cb32f32785 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 23 Nov 2018 17:25:15 +0800 Subject: [PATCH] RH: don't start without a config file @@ -101,11 +101,11 @@ index 7bc8806e..315884eb 100644 . .\" ---------------------------------------------------------------------------- diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in -index b6a25b31..f78bb91b 100644 +index eb58943c..553e27f9 100644 --- a/multipathd/multipathd.service.in +++ b/multipathd/multipathd.service.in @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target - Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + Wants=systemd-udevd-kernel.socket multipathd-queueing.service @MODPROBE_UNIT@ After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ After=multipathd.socket systemd-remount-fs.service +ConditionPathExists=/etc/multipath.conf diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch index 6556d4af85..5f65ceaa29 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch @@ -1,4 +1,4 @@ -From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 Mon Sep 17 00:00:00 2001 +From c34eca043178e60ff04dc88953a71b36ce9dc1b0 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 26 Nov 2018 09:19:17 +0800 Subject: [PATCH] RH: use rpm optflags if present @@ -24,7 +24,7 @@ Signed-off-by: Yi Zhao 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc -index 69521882..2127f208 100644 +index 596e68c0..42766867 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo @@ -48,11 +48,8 @@ index 69521882..2127f208 100644 -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \ -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \ -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP --CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \ +-CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ ++CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \ -fexceptions BIN_CFLAGS := -fPIE -DPIE LIB_CFLAGS := -fPIC --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch index e7ea374cd1..26fcbd918d 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch @@ -1,4 +1,4 @@ -From 4035b48b512b5010b1c33aeba8c58cf2705bca83 Mon Sep 17 00:00:00 2001 +From 4ce6abf6f30fc6cadc9c9fc50b66363078a0162e Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 26 Nov 2018 09:55:12 +0800 Subject: [PATCH] RH: add mpathconf diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 04160eaac5..7ce5f8b08d 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,4 +1,4 @@ -From bd65cdc704666dd4153779c74cdbb2cac6efea71 Mon Sep 17 00:00:00 2001 +From 95f4611621ed7cc5144c68c51adc58409210ad1d Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 26 Sep 2019 16:29:48 +0800 Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A @@ -90,6 +90,3 @@ index ee47ad9f..1ed0d85e 100644 enum { WWID_IS_NOT_FAILED = 0, --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch index b435e6d677..a174aa44c6 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -1,4 +1,4 @@ -From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001 +From 74051f361ce0b9b4405afc789c62a277aa37cc05 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 1 Mar 2024 11:45:10 +0800 Subject: [PATCH] RH: warn on invalid regex instead of failing @@ -100,6 +100,3 @@ index a06a6138..a734ba9b 100644 declare_hw_snprint(bl_product, print_str) declare_hw_arg_str_handler(hwhandler, 0) --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch index 9ea255cbcb..cf528447ac 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch @@ -1,4 +1,4 @@ -From 87e19d273c46fe78933627fc4e8046e3a76da47a Mon Sep 17 00:00:00 2001 +From 261ef06a4fb24f533c240a0a747a165eec0ee0dd Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 26 Nov 2018 11:12:01 +0800 Subject: [PATCH] RH: reset default find_mutipaths value to off @@ -29,6 +29,3 @@ index 02f7e57c..98dd66f7 100644 #define DEFAULT_FAST_IO_FAIL 5 #define DEFAULT_DEV_LOSS_TMO 600 #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch index 661e38f684..c85d1411a9 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch @@ -1,4 +1,4 @@ -From c22c897e7c55fc0b8c5bdd113a0357654ee895ae Mon Sep 17 00:00:00 2001 +From 3491d5ed1633a42d1f46d50ebce324d28e02ed32 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 4 Jun 2019 11:39:39 +0800 Subject: [PATCH] multipath-tools: modify create-config.mk for @@ -21,7 +21,7 @@ Signed-off-by: Changqing Li 1 file changed, 4 deletions(-) diff --git a/create-config.mk b/create-config.mk -index 8bd2c20c..40d2446a 100644 +index e8fa391c..f620da5a 100644 --- a/create-config.mk +++ b/create-config.mk @@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) @@ -35,6 +35,3 @@ index 8bd2c20c..40d2446a 100644 # $(call TEST_CC_OPTION,option,fallback) # Test if the C compiler supports the option. # Evaluates to "option" if yes, and "fallback" otherwise. --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch index cf053680f6..61f06e633e 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch @@ -1,4 +1,4 @@ -From c34c65a3f5ddec22cb417872f90c2c9540a1847b Mon Sep 17 00:00:00 2001 +From 4d68ea4a75c63cf92469be95579542c434561871 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 26 Nov 2018 11:17:41 +0800 Subject: [PATCH] Always use devmapper @@ -21,7 +21,7 @@ Signed-off-by: Changqing Li 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/create-config.mk b/create-config.mk -index 40d2446a..f5eb2803 100644 +index f620da5a..8ffcde02 100644 --- a/create-config.mk +++ b/create-config.mk @@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ @@ -67,6 +67,3 @@ index 40d2446a..f5eb2803 100644 libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch index 0c5015142c..6910146c70 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch @@ -1,4 +1,4 @@ -From 698361847e6fae321bc277a5fc518b2bd55751b8 Mon Sep 17 00:00:00 2001 +From 85c4bdd939b7f77a773d24fcc5330fc35542d7d3 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sun, 10 May 2020 21:22:53 +0800 Subject: [PATCH] fix bug of do_compile and do_install @@ -38,6 +38,3 @@ index f06f7faa..690dc050 100644 libmultipath/checkers.install \ libmultipath/prioritizers.install \ libmultipath/foreign.install: libmultipath.install --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch index f47d8afe4b..bb411e3499 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch @@ -1,4 +1,4 @@ -From 69ee17207574ca032c3cb46a3db99736de3eedf8 Mon Sep 17 00:00:00 2001 +From edb01d9a3c29d31493a0435ab35e9d438f391267 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 25 May 2020 23:22:55 -0700 Subject: [PATCH] add explicit dependency on libraries @@ -35,6 +35,3 @@ index 690dc050..b775f949 100644 DEPS_ON_MULTIPATH := \ multipath \ --- -2.25.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch similarity index 95% rename from meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch rename to meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch index aad46c229b..ca71a68ac4 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch @@ -1,4 +1,4 @@ -From 6e231d887c20b2139db75e6dc6c20107273aaacd Mon Sep 17 00:00:00 2001 +From 83734bbf19bb9e256da6f92a3bda26aa0f63245d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= Date: Thu, 3 Apr 2025 10:25:30 +0200 Subject: [PATCH] libdmmp/Makefile: Add target docs/man/dmmp_strerror.3 to @@ -12,7 +12,7 @@ Sometimes, the timestamps are updated in the man pages, sometimes not. Upstream-Status: Denied https://lore.kernel.org/dm-devel/72355f1d0984647e91f8c50f1c2295071af49e33.camel@suse.com/ -The patch has been rejected by upstream, who will update the timestamps of the +The patch has been rejected by upstream, who will update the timestamps of the manpages with a new commit. In order to be reproducible without having a random result, forcing the target rebuild by adding it to .PHONY is the more acceptable solution, the alternative diff --git a/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch deleted file mode 100644 index 4cca7decb8..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bcb052a8dadbd0a837986b1e15924b469fc59edc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= -Date: Thu, 3 Apr 2025 10:08:49 +0200 -Subject: [PATCH] libdmmp/Makefile: Fix KBUILD_BUILD_TIMESTAMP usage - -Add missing $ (Makefile need to escape '$' as '$$') - -Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250404122902.2750036-1-sofiane.hamam@smile.fr/] - -Signed-off-by: Yoann Congal -Signed-off-by: Sofiane HAMAM -Signed-off-by: Kelefa Sane ---- - libdmmp/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdmmp/Makefile b/libdmmp/Makefile -index 172ba045..7e0e2509 100644 ---- a/libdmmp/Makefile -+++ b/libdmmp/Makefile -@@ -74,7 +74,7 @@ doc: docs/man/dmmp_strerror.3 - docs/man/dmmp_strerror.3: $(HEADERS) - $(Q)TEMPFILE=$(shell mktemp); \ - cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \ -- [ "$KBUILD_BUILD_TIMESTAMP" ] || \ -+ [ "$$KBUILD_BUILD_TIMESTAMP" ] || \ - KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^`; \ - export KBUILD_BUILD_TIMESTAMP; \ - LC_ALL=C \ diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.3.bb similarity index 94% rename from meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb rename to meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.3.bb index 07bc84ce8b..8e26d4c2a8 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.3.bb @@ -44,14 +44,12 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st file://0010-Always-use-devmapper.patch \ file://0011-fix-bug-of-do_compile-and-do_install.patch \ file://0012-add-explicit-dependency-on-libraries.patch \ - file://0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch \ - file://0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch \ - file://0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \ + file://0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f" -SRCREV = "cb8de98b2cc3b62fd1a578ba479c0820778e9c02" +SRCREV = "7a84cc602ea0884ae0c767e6c89592059012db04" inherit systemd pkgconfig From patchwork Tue Nov 18 00:27:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 74831 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 EEA3ACEBF93 for ; Tue, 18 Nov 2025 00:27:45 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.368.1763425662709841836 for ; Mon, 17 Nov 2025 16:27:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RCPGhHGU; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-297ec50477aso35543455ad.1 for ; Mon, 17 Nov 2025 16:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425662; x=1764030462; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HCOiF4/x74rTxpZSeMjMtZhaiJ7V34nD2gZu+APBEf8=; b=RCPGhHGUbHK3GOyv4LLuvT6LpmB5rbcP8TVEPag4/GSW4WuCaxvxxxAanose0+11hi g4JrHS0leUjZaoBGHPCc7YCT3I9mL99UWAxSYFdWnqEA/ldJrPa4fXHPWp0QQBLP0aVI vTvQG+7c82sY9vI9dWyK6fH00IOqGIqt6369Pwai+LJ5otYtQUU7f0AduZQdHLj4YXxz cNJpTjXUwe+7ZXOUgtUqbZDknIVjFxNH1C0FpuGbmp9CJyJfiJegrohGwbNxyNfEgPwo XyzYy5tBEgPFVAcG3Xbr/p+KAgCrmbbUteG1aWQ5vQ4MlASL5FIpu7zFLoK19MzYQwnp u1XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425662; x=1764030462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HCOiF4/x74rTxpZSeMjMtZhaiJ7V34nD2gZu+APBEf8=; b=nxt/2bROb+HoqdbaDq2P7hpX5rJXVmQ6EZLy9RZNgZ2afa1JKdWcToyzdSovDPgO4C RpehZEePwgtnlUQruh0XJaPl5bV9MOyWj8ei2q9W7XE5ScXu6bxOVOXlS0/WmPgBsuNY C4iYHCznvIfGH7aOqRPIR59tkgwTZ3HCRv3br7/4yztKguZ769VNDakUZch1CaxjYs+x LE98x6vO8ZArMXl/G1zQkiyE82I3hk7P2kRPW5/7pZLZv2ts3pNHXNS/NcV3tU3LN9hb 636V/2VsEGfk012eC2xhK9FEUKyYYZVYNZjijsQ4UXVdih4moI64ak8ScZh/mW1pSIXG ru/g== X-Gm-Message-State: AOJu0YyP3XavMShFUUnIxT1Omj6XkDIHnlBCNHRFbJjWD4QoatOFE1Fo WYE1AlnHn3MUDu8AQ8xPRxEr/eb3ZbFY86CGrzFFFlQuBQT1Eqs+mxOr6moW8g== X-Gm-Gg: ASbGncvTrlnX4Ww1uPpHSVNlG6XRKWdScllaVDAJDxRD/FQlEwC35fs27TBfyIswZcy gu8kThvHm4MBPefLxT4G+hkdWJj7QaD5/4ZZzxzdJb8X02t4sT4LrRBUHUoq4TYZ82KC3emnIMK Q2VYK8Ab08bdaVOfXld8NlWBou/x6XMNNX9PLAu0i4AhJ/JWQQyR2QsnJaoKme+agfynEBfCtST jKSmZeBkI+aetVa1sVoEgpaN4qc+Df3XkOnv5FR0V/XKYnl4bL0bUxzBZ7POVAWZ2y4Oa56Sc6+ cZbcavh0RCRWuhlsZZBU1bwe9HK5CCRUA1uNFTRosGr5f7e8qAnfH2tF/j9K12d+5Biy0iEJpOI L56P7uj2bTYFfERK5DCKXzzeFuRXfulq5vnwVvNA6qnQEsS9TxS4UyTgEFxwN1LArP8ajQ9SYkz zIwAiaP+4FDDsxsQ8YPV6fWdT21hXL2eZoHw== X-Google-Smtp-Source: AGHT+IGKOmW4xUHB3ckyU2/VLrcRgWBnzmx6Q3gJyKf/9WyT6Tc3BJBwm8/yvcaWcdrkBYYfNLDqeQ== X-Received: by 2002:a17:902:f54e:b0:296:5ebe:8fa with SMTP id d9443c01a7336-299f55a1db8mr11556315ad.23.1763425661548; Mon, 17 Nov 2025 16:27:41 -0800 (PST) Received: from NVAPF55DW0D-IPD.. ([147.161.217.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c245fa1sm153866565ad.36.2025.11.17.16.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:41 -0800 (PST) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][PATCH 6/6] xmlsec1: upgrade 1.3.7 -> 1.3.9 Date: Tue, 18 Nov 2025 13:27:23 +1300 Message-ID: <20251118002723.829508-6-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118002723.829508-1-ankur.tyagi85@gmail.com> References: <20251118002723.829508-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 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 ; Tue, 18 Nov 2025 00:27:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121792 From: Ankur Tyagi Refreshed patches and updated ptest. Changelog: https://github.com/lsh123/xmlsec/releases/tag/1.3.8 https://github.com/lsh123/xmlsec/releases/tag/1.3.9 Signed-off-by: Ankur Tyagi --- ...> 0001-force-to-use-our-own-libtool.patch} | 7 +- ...change-finding-path-of-nss-and-nspr.patch} | 6 +- ...atch => 0003-xmlsec1-add-new-recipe.patch} | 7 +- ...xamples-allow-build-in-separate-dir.patch} | 7 +- ...h => 0005-nss-nspr-fix-for-multilib.patch} | 9 +- ...gure-QA-error-caused-by-host-lookup.patch} | 7 +- ...Fix-LibXML2-deprecation-warnings-and.patch | 1190 +++++++++++++++++ .../recipes-support/xmlsec1/xmlsec1/run-ptest | 112 +- .../{xmlsec1_1.3.7.bb => xmlsec1_1.3.9.bb} | 15 +- 9 files changed, 1296 insertions(+), 64 deletions(-) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{fix-ltmain.sh.patch => 0001-force-to-use-our-own-libtool.patch} (81%) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{change-finding-path-of-nss.patch => 0002-change-finding-path-of-nss-and-nspr.patch} (83%) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{makefile-ptest.patch => 0003-xmlsec1-add-new-recipe.patch} (91%) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{xmlsec1-examples-allow-build-in-separate-dir.patch => 0004-examples-allow-build-in-separate-dir.patch} (90%) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{0001-nss-nspr-fix-for-multilib.patch => 0005-nss-nspr-fix-for-multilib.patch} (94%) rename meta-oe/recipes-support/xmlsec1/xmlsec1/{ensure-search-path-non-host.patch => 0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch} (91%) create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch rename meta-oe/recipes-support/xmlsec1/{xmlsec1_1.3.7.bb => xmlsec1_1.3.9.bb} (79%) diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-force-to-use-our-own-libtool.patch similarity index 81% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0001-force-to-use-our-own-libtool.patch index 73c6ddb027..57c0ab36ff 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-force-to-use-our-own-libtool.patch @@ -1,4 +1,4 @@ -From 1b9701faf22f5a17a81a2a2732794d9627499fcb Mon Sep 17 00:00:00 2001 +From 37efc0ca231363aa9161c036ba12cc2b33f51a24 Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Thu, 21 Jan 2010 14:11:20 +0800 Subject: [PATCH] force to use our own libtool @@ -6,16 +6,15 @@ Subject: [PATCH] force to use our own libtool Upstream-Status: Inappropriate [ OE specific ] Signed-off-by: Yulong Pei - --- ltmain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ltmain.sh b/ltmain.sh -index 1dea62a..bfb9784 100755 +index 7271130e..4e0925a6 100755 --- a/ltmain.sh +++ b/ltmain.sh -@@ -7225,7 +7225,7 @@ func_mode_link () +@@ -7377,7 +7377,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0002-change-finding-path-of-nss-and-nspr.patch similarity index 83% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0002-change-finding-path-of-nss-and-nspr.patch index 61c56ffc8b..4a30f483a2 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0002-change-finding-path-of-nss-and-nspr.patch @@ -1,4 +1,4 @@ -From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001 +From 75d7dc918771483a6c4354ee77bc14c2ff83f467 Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -13,10 +13,10 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8add879..7f137c0 100644 +index b31b8bb6..b59acc86 100644 --- a/configure.ac +++ b/configure.ac -@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss +@@ -965,7 +965,7 @@ NSS_PACKAGE=mozilla-nss NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0003-xmlsec1-add-new-recipe.patch similarity index 91% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0003-xmlsec1-add-new-recipe.patch index 55ae9887f2..1b50e2ed0e 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0003-xmlsec1-add-new-recipe.patch @@ -1,4 +1,4 @@ -From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001 +From 2e66dbeeec7d75ed86c87b83b3ac300257363c04 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 15 Jun 2017 14:44:01 +0800 Subject: [PATCH] xmlsec1: add new recipe @@ -14,7 +14,7 @@ Signed-off-by: Jackie Huang 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 0b352bc..de3c217 100644 +index c6a25f09..3da1cb33 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -12,9 +12,17 @@ PROGRAMS = \ @@ -37,6 +37,3 @@ index 0b352bc..de3c217 100644 all: $(PROGRAMS) --- -2.43.0 - diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0004-examples-allow-build-in-separate-dir.patch similarity index 90% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0004-examples-allow-build-in-separate-dir.patch index 50706793b2..d7188083b3 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0004-examples-allow-build-in-separate-dir.patch @@ -1,4 +1,4 @@ -From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001 +From fab6503dca2046d32fa186c33c566c58110334a5 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 30 Dec 2014 11:18:17 +0800 Subject: [PATCH] examples: allow build in separate dir @@ -11,7 +11,7 @@ Signed-off-by: Jackie Huang 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index de3c217..2e0ab6e 100644 +index 3da1cb33..ff44cb7b 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -16,8 +16,10 @@ ifndef CC @@ -27,6 +27,3 @@ index de3c217..2e0ab6e 100644 DESTDIR = /usr/share/xmlsec1 install-ptest: --- -2.43.0 - diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0005-nss-nspr-fix-for-multilib.patch similarity index 94% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0005-nss-nspr-fix-for-multilib.patch index 9bb017b63b..a1cc4fd559 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0005-nss-nspr-fix-for-multilib.patch @@ -1,4 +1,4 @@ -From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001 +From 9f1e319a5f7dcbe611d1f41a551f644c293ac3f0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 4 Feb 2020 23:39:49 -0800 Subject: [PATCH] nss/nspr: fix for multilib @@ -11,10 +11,10 @@ Signed-off-by: Chen Qi 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 40e9c0d..8f42d4d 100644 +index b59acc86..b8b0542d 100644 --- a/configure.ac +++ b/configure.ac -@@ -966,24 +966,24 @@ fi +@@ -990,24 +990,24 @@ fi dnl Priority 1: User specifies the path to installation if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) @@ -47,6 +47,3 @@ index 40e9c0d..8f42d4d 100644 fi fi --- -2.43.0 - diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch similarity index 91% rename from meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch rename to meta-oe/recipes-support/xmlsec1/xmlsec1/0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch index 7b07628e5f..de2534ef78 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch @@ -1,4 +1,4 @@ -From c16d384fb64cf53351e150fb9e9b99cc6ba970b2 Mon Sep 17 00:00:00 2001 +From 67642a6bbf7261626f41b84cccf9b55b93c4cbc9 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 14 Jan 2021 17:36:23 +0000 Subject: [PATCH] xmlsec1: Fix configure QA error caused by host lookup path @@ -9,16 +9,15 @@ It will eventually arise after the configure QA as the configure script should o Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Anatol Belski - --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 3d23683..baf27b7 100644 +index b8b0542d..795355af 100644 --- a/configure.ac +++ b/configure.ac -@@ -286,8 +286,8 @@ fi +@@ -306,8 +306,8 @@ fi dnl ========================================================================== dnl Common installation locations dnl ========================================================================== diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch new file mode 100644 index 0000000000..156c7d8402 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch @@ -0,0 +1,1190 @@ +From b68f4aa1d450b1a940dd950e1e5eadc2c91ac82f Mon Sep 17 00:00:00 2001 +From: lsh123 +Date: Sat, 15 Nov 2025 09:38:02 -0800 +Subject: [PATCH] (xmlsec-examples) Fix LibXML2 deprecation warnings and update + README to show key name use (#990) + +See https://github.com/lsh123/xmlsec/issues/989 + +Upstream-Status: Backport +(cherry picked from commit f15b6dcb5276facfbdbcd8dfe1f23026aa079e7a) +Signed-off-by: Ankur Tyagi +--- + docs/xmldsig-verifier.html | 5 +- + examples/Makefile | 3 +- + examples/README.md | 40 +- + examples/decrypt1.c | 4 +- + examples/decrypt2.c | 4 +- + examples/decrypt3.c | 4 +- + examples/encrypt1-tmpl.xml | 8 +- + examples/encrypt1.c | 4 +- + examples/encrypt2.c | 4 +- + examples/encrypt3-res.xml | 8 +- + examples/encrypt3.c | 7 +- + examples/sign1-tmpl.xml | 6 +- + examples/sign1.c | 4 +- + examples/sign2.c | 4 +- + examples/sign3.c | 4 +- + examples/sign4.c | 4 +- + examples/verify-saml.c | 4 +- + examples/verify1.c | 4 +- + examples/verify2.c | 4 +- + examples/verify3.c | 2 - + examples/verify4.c | 2 - + examples/xmldsigverify.c | 379 ------------------ + .../aleksey-xmldsig-01/enveloped-gost2001.xml | 3 - + .../enveloped-x509-digest-sha1.tmpl | 3 - + .../enveloped-x509-digest-sha1.xml | 3 - + .../enveloped-x509-digest-sha224.tmpl | 3 - + .../enveloped-x509-digest-sha224.xml | 3 - + .../enveloped-x509-digest-sha256.tmpl | 3 - + .../enveloped-x509-digest-sha256.xml | 3 - + .../enveloped-x509-digest-sha384.tmpl | 3 - + .../enveloped-x509-digest-sha384.xml | 3 - + .../enveloped-x509-digest-sha512.tmpl | 3 - + .../enveloped-x509-digest-sha512.xml | 3 - + .../enveloped-x509-issuerserial.tmpl | 3 - + .../enveloped-x509-issuerserial.xml | 3 - + .../enveloped-x509-missing-cert.tmpl | 3 - + .../enveloped-x509-missing-cert.xml | 3 - + .../enveloped-x509-same-subj-cert.tmpl | 3 - + .../enveloped-x509-ski.tmpl | 3 - + .../aleksey-xmldsig-01/enveloped-x509-ski.xml | 3 - + .../enveloped-x509-subjectname.tmpl | 3 - + .../enveloped-x509-subjectname.xml | 3 - + 43 files changed, 46 insertions(+), 525 deletions(-) + delete mode 100644 examples/xmldsigverify.c + +diff --git a/docs/xmldsig-verifier.html b/docs/xmldsig-verifier.html +index befd21a6..c8381e98 100644 +--- a/docs/xmldsig-verifier.html ++++ b/docs/xmldsig-verifier.html +@@ -47,11 +47,8 @@ +
+

Online XML Digital Signature Verifer is retired as of October, 2022

+
+-

If you are interested in verifying an XML Digital Signature, then you should consider using ++

If you are interested in verifying an XML Digital Signature, then you should consider using + the xmlsec command line tool. +- The source code for the Online XML Digital Signature Verifer is available on +- GitHub and in the "examples/" +- folder of the source tarfile. +

+ + +diff --git a/examples/Makefile b/examples/Makefile +index ff44cb7b..945f3dab 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -9,8 +9,7 @@ PROGRAMS = \ + $(PROGRAMS_SIGN) \ + $(PROGRAMS_VERIFY) \ + $(PROGRAMS_ENC) \ +- $(PROGRAMS_DEC) \ +- xmldsigverify ++ $(PROGRAMS_DEC) + + ifndef CC + CC = gcc +diff --git a/examples/README.md b/examples/README.md +index f07a07cb..acf39c31 100644 +--- a/examples/README.md ++++ b/examples/README.md +@@ -35,9 +35,10 @@ To run this example: + ./sign1 sign1-tmpl.xml rsakey.pem + ``` + +-To sign a template file with `xmlsec1` command line utility (use `xmlsec` on Windows): ++To sign a template file with `xmlsec1` command line utility (use `xmlsec` on Windows). ++Note that in this example we set KeyName to be the same as the filename of the private key: + ``` +-xmlsec1 sign --privkey rsakey.pem --output sign1.xml sign1-tmpl.xml ++xmlsec1 sign --privkey:rsakey.pem rsakey.pem --output sign1.xml sign1-tmpl.xml + ``` + + ### sign2: signing a file with a dynamicaly created template +@@ -108,10 +109,11 @@ To run this example: + ./verify2 sign2-res.xml rsapub.pem + ``` + +-To verify a signed document with `xmlsec1` command line utility (use `xmlsec` on Windows): ++To verify a signed document with `xmlsec1` command line utility (use `xmlsec` on Windows). ++Note that in this example we set KeyName to be the same as the filename of the private key: + ``` +-xmlsec1 verify --pubkey rsapub.pem sign1-res.xml +-xmlsec1 verify --pubkey rsapub.pem sign2-res.xml ++xmlsec1 verify --pubkey:rsakey.pem rsapub.pem sign1-res.xml ++xmlsec1 verify --pubkey:rsakey.pem rsapub.pem sign2-res.xml + ``` + + ### verify3: verifying an enveloped signature using X509 certificate +@@ -185,9 +187,10 @@ To run this example: + ``` + + To encrypt binary data with a template file with `xmlsec1` command line +-utility (use `xmlsec` on Windows): ++utility (use `xmlsec` on Windows). Note that in this example we set KeyName to be ++the same as the filename of the key: + ``` +-xmlsec1 encrypt --deskey deskey.bin --binary-data binary.dat --output encrypt1.xml encrypt1-tmpl.xml ++xmlsec1 encrypt --deskey:deskey.bin deskey.bin --binary-data binary.dat --output encrypt1.xml encrypt1-tmpl.xml + ``` + + ### encrypt2: encrypting XML file using a dynamicaly created template +@@ -213,7 +216,8 @@ encrypt3-doc.xml An example XML file for encryption by encrypt3.c + encrypt3-res.xml The result of encryptin encrypt3-doc.xml by encrypt3.c + ``` + +-To run this example: ++To run this example (note: we are using the private key here instead of the public ++key to make decrypt3 example work)): + ``` + ./encrypt3 encrypt3-doc.xml rsakey.pem + ``` +@@ -244,11 +248,13 @@ To run this example: + ./decrypt2 encrypt2-res.xml deskey.bin + ``` + +-To decrypt binary data with `xmlsec1` command line utility (use `xmlsec` on Windows): ++To decrypt binary data with `xmlsec1` command line utility (use `xmlsec` on Windows). ++Note that in this example we set KeyName to be the same as the filename of the ++(private) key: + ``` +-xmlsec1 decrypt --deskey deskey.bin encrypt1-res.xml +-xmlsec1 decrypt --deskey deskey.bin encrypt2-res.xml +-xmlsec1 decrypt --privkey rsakey.pem encrypt3-res.xml ++xmlsec1 decrypt --deskey:deskey.bin deskey.bin encrypt1-res.xml ++xmlsec1 decrypt --deskey:deskey.bin deskey.bin encrypt2-res.xml ++xmlsec1 decrypt --privkey:rsakey.pem rsakey.pem encrypt3-res.xml + ``` + + ### decrypt3: decrypting binary file using custom keys manager +@@ -265,16 +271,6 @@ To run this example: + ./decrypt3 encrypt3-res.xml + ``` + +-### xmldsigverify: CGI script for signatures verifications +- +-Files: +-``` +-xmldsigverify.c The source code +-``` +- +-To run this example, install compiled xmldsigverify script into +-your web server cgi-bin directory. +- + ### Keys and certificates + ``` + cacert.pem Root (trusted) certificate +diff --git a/examples/decrypt1.c b/examples/decrypt1.c +index e069bd7a..c9d2ec38 100644 +--- a/examples/decrypt1.c ++++ b/examples/decrypt1.c +@@ -52,8 +52,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -149,7 +147,7 @@ decrypt_file(const char* enc_file, const char* key_file) { + assert(key_file); + + /* load template */ +- doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + goto done; +diff --git a/examples/decrypt2.c b/examples/decrypt2.c +index 522af222..49be8e60 100644 +--- a/examples/decrypt2.c ++++ b/examples/decrypt2.c +@@ -55,8 +55,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -232,7 +230,7 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { + assert(enc_file); + + /* load template */ +- doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + goto done; +diff --git a/examples/decrypt3.c b/examples/decrypt3.c +index e24effc0..8fddfa70 100644 +--- a/examples/decrypt3.c ++++ b/examples/decrypt3.c +@@ -58,8 +58,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -165,7 +163,7 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { + assert(enc_file); + + /* load template */ +- doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(enc_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + goto done; +diff --git a/examples/encrypt1-tmpl.xml b/examples/encrypt1-tmpl.xml +index 3d61a901..5c1a5f3f 100644 +--- a/examples/encrypt1-tmpl.xml ++++ b/examples/encrypt1-tmpl.xml +@@ -1,12 +1,12 @@ + +- + + + +- +- ++ deskey.bin ++ + + + +diff --git a/examples/encrypt1.c b/examples/encrypt1.c +index ee3eaa8b..dc52ccf5 100644 +--- a/examples/encrypt1.c ++++ b/examples/encrypt1.c +@@ -55,8 +55,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -156,7 +154,7 @@ encrypt_file(const char* tmpl_file, const char* key_file, + assert(data); + + /* load template */ +- doc = xmlReadFile(tmpl_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(tmpl_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + goto done; +diff --git a/examples/encrypt2.c b/examples/encrypt2.c +index 14b57af9..989afec3 100644 +--- a/examples/encrypt2.c ++++ b/examples/encrypt2.c +@@ -56,8 +56,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -154,7 +152,7 @@ encrypt_file(const char* xml_file, const char* key_file) { + assert(key_file); + + /* load template */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/encrypt3-res.xml b/examples/encrypt3-res.xml +index 2fca87e7..129771a6 100644 +--- a/examples/encrypt3-res.xml ++++ b/examples/encrypt3-res.xml +@@ -11,13 +11,13 @@ XML Security Library example: Original XML doc file before encryption (encrypt3 + rsakey.pem + + +-QYYKljhcX20QyP20hYmq8CSES875oIdbrsjMOxnb0VnYDn01Jk00OIPpb9gdIdZg +-MLOtSy26mWrQ+XqfPGuyaA== ++pFfhaCpQfHTOJ+mRN919Ia3JimY2AS/8u9pimLEWGGjh3egy3pE2st4+YoVkpS4G ++XyUU4Ps+KRzsdJcKI4moXQ== + + + + +-+UiDv73SE8K8KwXuOmHLHK7N2hNWDakTAEu6NprbCdULC1w/LXT9FLtNRJetmwwO +-XpBqTY56AAMeMgpxPWN3SPO0ETeQw7pR+bp0IjUvcGlFSXz6yE1qgQ== ++PMuoILFXjCmMg2pCzrmJYZcySLsTzgGYRX2ymYV9tLVrNSPhWV2mwMHWMchSWH9b ++8pRgdaJ3msWmN3EqqElV1Y5wEDQjB5nMz7Tsz3+QmrAxGfxj7bCPyw== + + +diff --git a/examples/encrypt3.c b/examples/encrypt3.c +index e3f23104..71a6a559 100644 +--- a/examples/encrypt3.c ++++ b/examples/encrypt3.c +@@ -7,7 +7,8 @@ + * Usage: + * ./encrypt3 + * +- * Example: ++ * Example (note: we are using the private key here instead of the public ++ * key to make decrypt3 example work): + * ./encrypt3 encrypt3-doc.xml rsakey.pem > encrypt3-res.xml + * + * The result could be decrypted with decrypt3 example: +@@ -58,8 +59,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -233,7 +232,7 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) + assert(key_name); + + /* load template */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/sign1-tmpl.xml b/examples/sign1-tmpl.xml +index ac71a949..34b96f6f 100644 +--- a/examples/sign1-tmpl.xml ++++ b/examples/sign1-tmpl.xml +@@ -1,6 +1,6 @@ + +- + + +@@ -20,7 +20,7 @@ XML Security Library example: Simple signature template file for sign1 example. + + + +- ++ rsakey.pem + + + +diff --git a/examples/sign1.c b/examples/sign1.c +index be107333..e86d3604 100644 +--- a/examples/sign1.c ++++ b/examples/sign1.c +@@ -54,8 +54,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -150,7 +148,7 @@ sign_file(const char* tmpl_file, const char* key_file) { + assert(key_file); + + /* load template */ +- doc = xmlReadFile(tmpl_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(tmpl_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + goto done; +diff --git a/examples/sign2.c b/examples/sign2.c +index 1a6ee936..a5408a0a 100644 +--- a/examples/sign2.c ++++ b/examples/sign2.c +@@ -57,8 +57,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -156,7 +154,7 @@ sign_file(const char* xml_file, const char* key_file) { + assert(key_file); + + /* load doc file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/sign3.c b/examples/sign3.c +index de372e42..c927d946 100644 +--- a/examples/sign3.c ++++ b/examples/sign3.c +@@ -61,8 +61,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -164,7 +162,7 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) { + assert(cert_file); + + /* load doc file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/sign4.c b/examples/sign4.c +index bb5f03b3..012e4b63 100644 +--- a/examples/sign4.c ++++ b/examples/sign4.c +@@ -60,8 +60,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -167,7 +165,7 @@ sign_file(const char* xml_file, const char* id_attr, const char* key_file, const + assert(cert_file); + + /* load doc file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/verify-saml.c b/examples/verify-saml.c +index fea78a7f..95abaf0e 100644 +--- a/examples/verify-saml.c ++++ b/examples/verify-saml.c +@@ -65,8 +65,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -221,7 +219,7 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { + assert(xml_file); + + /* load file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/verify1.c b/examples/verify1.c +index 00ad07e1..73c6063f 100644 +--- a/examples/verify1.c ++++ b/examples/verify1.c +@@ -53,8 +53,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -149,7 +147,7 @@ verify_file(const char* xml_file, const char* key_file) { + assert(key_file); + + /* load file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/verify2.c b/examples/verify2.c +index 377dccc5..f421f89f 100644 +--- a/examples/verify2.c ++++ b/examples/verify2.c +@@ -56,8 +56,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +@@ -232,7 +230,7 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { + assert(xml_file); + + /* load file */ +- doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET); ++ doc = xmlReadFile(xml_file, NULL, XML_PARSE_PEDANTIC | XML_PARSE_NONET | XML_PARSE_NOENT); + if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + goto done; +diff --git a/examples/verify3.c b/examples/verify3.c +index 558e3290..04dd32b0 100644 +--- a/examples/verify3.c ++++ b/examples/verify3.c +@@ -57,8 +57,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +diff --git a/examples/verify4.c b/examples/verify4.c +index 705d8a5f..23a96918 100644 +--- a/examples/verify4.c ++++ b/examples/verify4.c +@@ -57,8 +57,6 @@ main(int argc, char **argv) { + /* Init libxml and libxslt libraries */ + xmlInitParser(); + LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); + + /* Init libxslt */ + #ifndef XMLSEC_NO_XSLT +diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c +deleted file mode 100644 +index c6611f43..00000000 +--- a/examples/xmldsigverify.c ++++ /dev/null +@@ -1,379 +0,0 @@ +-/** +- * XML Security Library example: CGI verification script. +- * +- * This is free software; see Copyright file in the source +- * distribution for preciese wording. +- * +- * Copyright (C) 2002-2024 Aleksey Sanin . All Rights Reserved. +- */ +-#include +-#include +-#include +-#include +- +-#include +-#include +-#include +- +-#ifndef XMLSEC_NO_XSLT +-#include +-#include +-#endif /* XMLSEC_NO_XSLT */ +- +-#include +-#include +-#include +-#include +- +-#include +-/* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */ +-#define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def" +-#define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs" +- +- +-int load_keys(xmlSecKeysMngrPtr mngr, const char* path, int report_loaded_keys); +-int load_trusted_certs(xmlSecKeysMngrPtr mngr, const char* path, int report_loaded_certs); +-int verify_request(xmlSecKeysMngrPtr mngr); +-int url_decode(char *buf, size_t size); +- +-int +-main() { +- xmlSecKeysMngrPtr mngr; +-#ifndef XMLSEC_NO_XSLT +- xsltSecurityPrefsPtr xsltSecPrefs = NULL; +-#endif /* XMLSEC_NO_XSLT */ +- +- /* start response */ +- fprintf(stdout, "Content-type: text/plain\n"); +- fprintf(stdout, "\n"); +- +- /* Init libxml and libxslt libraries */ +- xmlInitParser(); +- LIBXML_TEST_VERSION +- xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; +- xmlSubstituteEntitiesDefault(1); +- +- /* make sure that we print out everything to stdout */ +- xmlGenericErrorContext = stdout; +- +- /* Init libxslt */ +-#ifndef XMLSEC_NO_XSLT +- /* disable everything */ +- xsltSecPrefs = xsltNewSecurityPrefs(); +- xsltSetSecurityPrefs(xsltSecPrefs, XSLT_SECPREF_READ_FILE, xsltSecurityForbid); +- xsltSetSecurityPrefs(xsltSecPrefs, XSLT_SECPREF_WRITE_FILE, xsltSecurityForbid); +- xsltSetSecurityPrefs(xsltSecPrefs, XSLT_SECPREF_CREATE_DIRECTORY, xsltSecurityForbid); +- xsltSetSecurityPrefs(xsltSecPrefs, XSLT_SECPREF_READ_NETWORK, xsltSecurityForbid); +- xsltSetSecurityPrefs(xsltSecPrefs, XSLT_SECPREF_WRITE_NETWORK, xsltSecurityForbid); +- xsltSetDefaultSecurityPrefs(xsltSecPrefs); +-#endif /* XMLSEC_NO_XSLT */ +- +- /* Init xmlsec library */ +- if(xmlSecInit() < 0) { +- fprintf(stdout, "Error: xmlsec initialization failed.\n"); +- return(-1); +- } +- +- /* Check loaded library version */ +- if(xmlSecCheckVersion() != 1) { +- fprintf(stdout, "Error: loaded xmlsec library version is not compatible.\n"); +- return(-1); +- } +- +- /* Load default crypto engine if we are supporting dynamic +- * loading for xmlsec-crypto libraries. Use the crypto library +- * name ("openssl", "nss", etc.) to load corresponding +- * xmlsec-crypto library. +- */ +-#ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING +- if(xmlSecCryptoDLLoadLibrary(NULL) < 0) { +- fprintf(stdout, "Error: unable to load default xmlsec-crypto library. Make sure\n" +- "that you have it installed and check shared libraries path\n" +- "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n"); +- return(-1); +- } +-#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */ +- +- /* Init crypto library */ +- if(xmlSecCryptoAppInit(XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER) < 0) { +- fprintf(stdout, "Error: crypto initialization failed.\n"); +- return(-1); +- } +- +- /* Init xmlsec-crypto library */ +- if(xmlSecCryptoInit() < 0) { +- fprintf(stdout, "Error: xmlsec-crypto initialization failed.\n"); +- return(-1); +- } +- +- /* create keys manager */ +- mngr = xmlSecKeysMngrCreate(); +- if(mngr == NULL) { +- fprintf(stdout, "Error: failed to create keys manager.\n"); +- return(-1); +- } +- if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { +- fprintf(stdout, "Error: failed to initialize keys manager.\n"); +- return(-1); +- } +- +- if(load_keys(mngr, XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER, 0) < 0) { +- xmlSecKeysMngrDestroy(mngr); +- return(-1); +- } +- +- if(load_trusted_certs(mngr, XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER, 0) < 0) { +- xmlSecKeysMngrDestroy(mngr); +- return(-1); +- } +- +- if(verify_request(mngr) < 0) { +- xmlSecKeysMngrDestroy(mngr); +- return(-1); +- } +- +- /* Destroy keys manager */ +- xmlSecKeysMngrDestroy(mngr); +- +- /* Shutdown xmlsec-crypto library */ +- xmlSecCryptoShutdown(); +- +- /* Shutdown crypto library */ +- xmlSecCryptoAppShutdown(); +- +- /* Shutdown xmlsec library */ +- xmlSecShutdown(); +- +- /* Shutdown libxslt/libxml */ +-#ifndef XMLSEC_NO_XSLT +- xsltFreeSecurityPrefs(xsltSecPrefs); +- xsltCleanupGlobals(); +-#endif /* XMLSEC_NO_XSLT */ +- +- xmlCleanupParser(); +- +- return(0); +-} +- +-/** +- * load_trusted_certs: +- * @mngr: the keys manager. +- * @path: the path to a folder that contains trusted certificates. +- * +- * Loads trusted certificates from @path. +- * +- * Returns 0 on success or a negative value if an error occurs. +- */ +-int load_trusted_certs(xmlSecKeysMngrPtr mngr, const char* path, int report_loaded_certs) { +- DIR* dir; +- struct dirent* entry; +- char filename[2048]; +- int len; +- +- assert(mngr); +- assert(path); +- +- dir = opendir(path); +- if(dir == NULL) { +- fprintf(stdout, "Error: failed to open folder \"%s\".\n", path); +- return(-1); +- } +- while((entry = readdir(dir)) != NULL) { +- assert(entry->d_name); +- len = strlen(entry->d_name); +- if((len > 4) && (strcmp(entry->d_name + len - 4, ".pem") == 0)) { +- snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name); +- if(xmlSecCryptoAppKeysMngrCertLoad(mngr, filename, xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) { +- fprintf(stdout,"Error: failed to load pem certificate from \"%s\"\n", filename); +- closedir(dir); +- return(-1); +- } +- if(report_loaded_certs) { +- fprintf(stdout, "Loaded trusted certificate from \"%s\"...\n", filename); +- } +- } else if((len > 4) && (strcmp(entry->d_name + len - 4, ".der") == 0)) { +- snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name); +- if(xmlSecCryptoAppKeysMngrCertLoad(mngr, filename, xmlSecKeyDataFormatDer, xmlSecKeyDataTypeTrusted) < 0) { +- fprintf(stdout,"Error: failed to load der certificate from \"%s\"\n", filename); +- closedir(dir); +- return(-1); +- } +- if(report_loaded_certs) { +- fprintf(stdout, "Loaded trusted certificate from \"%s\"...\n", filename); +- } +- } +- } +- closedir(dir); +- return(0); +-} +- +-int load_keys(xmlSecKeysMngrPtr mngr, const char* path, int report_loaded_keys) { +- char filename[256]; +- +- assert(mngr); +- +- snprintf(filename, sizeof(filename), "%s/keys.xml", path); +- if(xmlSecCryptoAppDefaultKeysMngrLoad(mngr, filename) < 0) { +- fprintf(stdout,"Error: failed to load keys from \"%s\"\n", filename); +- return(-1); +- } +- +- if(report_loaded_keys) { +- fprintf(stdout, "Loaded keys from \"%s\"...\n", filename); +- } +- return(0); +-} +- +- +-/** +- * verify_request: +- * @mng: the keys manager +- * +- * Verifies XML signature in the request (stdin). +- * +- * Returns 0 on success or a negative value if an error occurs. +- */ +-int +-verify_request(xmlSecKeysMngrPtr mngr) { +- xmlBufferPtr buffer = NULL; +- xmlSecByte buf[256]; +- xmlDocPtr doc = NULL; +- xmlNodePtr node = NULL; +- xmlSecDSigCtxPtr dsigCtx = NULL; +- int ret; +- int res = -1; +- +- assert(mngr); +- +- /* load request in the buffer */ +- buffer = xmlBufferCreate(); +- if(buffer == NULL) { +- fprintf(stdout,"Error: failed to create buffer\n"); +- goto done; +- } +- +- while(!feof(stdin)) { +- ret = fread(buf, 1, sizeof(buf), stdin); +- if(ret < 0) { +- fprintf(stdout,"Error: read failed\n"); +- goto done; +- } +- xmlBufferAdd(buffer, buf, (xmlSecSize)ret); +- } +- +- /* is the document submitted from the form? */ +- if(strncmp((char*)xmlBufferContent(buffer), "_xmldoc=", 8) == 0) { +- xmlBufferShrink(buffer, 8); +- buffer->use = url_decode((char*)xmlBufferContent(buffer), xmlBufferLength(buffer)); +- } +- +- /** +- * Load doc +- */ +- xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA | +- XML_PARSE_PEDANTIC | XML_PARSE_NOCDATA); +- doc = xmlReadMemory((const char*)xmlBufferContent(buffer), xmlBufferLength(buffer), +- NULL, NULL, xmlSecParserGetDefaultOptions()); +- if (doc == NULL) { +- fprintf(stdout, "Error: unable to parse xml document (syntax error)\n"); +- goto done; +- } +- +- /* +- * Check the document is of the right kind +- */ +- if(xmlDocGetRootElement(doc) == NULL) { +- fprintf(stdout,"Error: empty document\n"); +- goto done; +- } +- +- /* find start node */ +- node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeSignature, xmlSecDSigNs); +- if(node == NULL) { +- fprintf(stdout, "Error: start node not found\n"); +- goto done; +- } +- +- /* create signature context */ +- dsigCtx = xmlSecDSigCtxCreate(mngr); +- if(dsigCtx == NULL) { +- fprintf(stdout,"Error: failed to create signature context\n"); +- goto done; +- } +- +- /* we would like to store and print out everything */ +- /* actually we would not because it opens a security hole +- dsigCtx->flags = XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES | +- XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES | +- XMLSEC_DSIG_FLAGS_STORE_SIGNATURE; +- */ +- +- /* Verify signature */ +- if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) { +- fprintf(stdout,"Error: signature verification failed\n"); +- goto done; +- } +- +- /* print verification result to stdout */ +- if(dsigCtx->status == xmlSecDSigStatusSucceeded) { +- fprintf(stdout, "RESULT: Signature is OK\n"); +- } else { +- fprintf(stdout, "RESULT: Signature is INVALID\n"); +- } +- fprintf(stdout, "---------------------------------------------------\n"); +- xmlSecDSigCtxDebugDump(dsigCtx, stdout); +- +- /* success */ +- res = 0; +- +-done: +- /* cleanup */ +- if(dsigCtx != NULL) { +- xmlSecDSigCtxDestroy(dsigCtx); +- } +- +- if(doc != NULL) { +- xmlFreeDoc(doc); +- } +- +- if(buffer != NULL) { +- xmlBufferFree(buffer); +- } +- return(res); +-} +- +-/* not the best way to do it */ +-#define toHex(c) ( ( ('0' <= (c)) && ((c) <= '9') ) ? (c) - '0' : \ +- ( ( ('A' <= (c)) && ((c) <= 'F') ) ? (c) - 'A' + 10 : 0 ) ) +- +-/** +- * url_decode: +- * @buf: the input buffer. +- * @size: the input buffer size. +- * +- * Does url decoding in-place. +- * +- * Returns length of the decoded result on success or +- * a negative value if an error occurs. +- */ +-int url_decode(char *buf, size_t size) { +- size_t ii, jj; +- char ch; +- +- assert(buf); +- +- for(ii = jj = 0; ii < size; ++ii, ++jj) { +- ch = buf[ii]; +- if((ch == '%') && ((ii + 2) < size)) { +- buf[jj] = (char)(toHex(buf[ii + 1]) * 16 + toHex(buf[ii + 2])); +- ii += 2; +- } else if(ch == '+') { +- buf[jj] = ' '; +- } else if(ii != jj){ +- buf[jj] = buf[ii]; +- } +- } +- return((int)jj); +-} +- +- +diff --git a/tests/aleksey-xmldsig-01/enveloped-gost2001.xml b/tests/aleksey-xmldsig-01/enveloped-gost2001.xml +index a00b1a91..d2535e92 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-gost2001.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-gost2001.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.tmpl +index b1aef672..90c53215 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.xml b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.xml +index 51813562..d0b7272f 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha1.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.tmpl +index fe5e8e5d..6737c0e8 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.xml b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.xml +index 865770bf..06a76abd 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha224.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.tmpl +index 3ccee872..86755bc8 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.xml b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.xml +index 33c16f5d..283ebf57 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha256.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.tmpl +index 2342efb5..f0513280 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.xml b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.xml +index ca8581ce..384fcdaa 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha384.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.tmpl +index 4c4d5e2c..05572e63 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.xml b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.xml +index 2ff30400..c781cc0f 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-digest-sha512.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.tmpl +index 48160c0b..bc7f712d 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.xml b/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.xml +index d7ff383f..5adbecac 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-issuerserial.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.tmpl +index 915dd55c..9e1cd393 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.xml b/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.xml +index 2a517e0e..3dcba72e 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-missing-cert.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-same-subj-cert.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-same-subj-cert.tmpl +index 915dd55c..9e1cd393 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-same-subj-cert.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-same-subj-cert.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-ski.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-ski.tmpl +index 542680a9..adf7084c 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-ski.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-ski.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-ski.xml b/tests/aleksey-xmldsig-01/enveloped-x509-ski.xml +index 68b2c554..89e77f0f 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-ski.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-ski.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.tmpl b/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.tmpl +index ba982e63..868540cf 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.tmpl ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.tmpl +@@ -1,7 +1,4 @@ + +- + + + Hello, World! +diff --git a/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.xml b/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.xml +index daa82e85..b4cfdb85 100644 +--- a/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.xml ++++ b/tests/aleksey-xmldsig-01/enveloped-x509-subjectname.xml +@@ -1,7 +1,4 @@ + +- + + + Hello, World! diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest index afd8c69853..edb5f7a4b9 100755 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -8,78 +8,130 @@ check_return() { fi } -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Signing a template file..." ./sign1 sign1-tmpl.xml rsakey.pem > sign1-res.xml -./verify1 sign1-res.xml rsapub.pem check_return sign-tmpl -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" +echo "Signing a template file with xmlsec1..." +xmlsec1 sign --privkey:rsakey.pem rsakey.pem --output sign1-res-xmlsec1.xml sign1-tmpl.xml +check_return sign-tmpl-xmlsec1 + +echo "-----------------------------------------------------------------------------------------------" echo "Signing a dynamicaly created template..." ./sign2 sign2-doc.xml rsakey.pem > sign2-res.xml -./verify1 sign2-res.xml rsapub.pem check_return sign-dynamic-templ -echo "---------------------------------------------------" -echo "Signing with X509 certificate..." +echo "-----------------------------------------------------------------------------------------------" +echo "Signing a file with a dynamicaly created template and an X509 certificate..." ./sign3 sign3-doc.xml rsakey.pem rsacert.pem > sign3-res.xml -./verify3 sign3-res.xml ca2cert.pem cacert.pem -check_return sign-x509 +check_return sign-dynamic-templ-x509 -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" +echo "Signing a node in a file with a dynamicaly created template and an X509 certificate..." +./sign4 sign4-doc.xml "data" rsakey.pem rsacert.pem > sign4-res.xml +check_return sign-file-node-dynamic-templ-x509 + +echo "-----------------------------------------------------------------------------------------------" echo "Verifying a signature with a single key..." ./verify1 sign1-res.xml rsapub.pem +check_return verify-single-key-1 ./verify1 sign2-res.xml rsapub.pem -check_return verify-single-key +check_return verify-single-key-2 -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Verifying a signature with keys manager..." ./verify2 sign1-res.xml rsakey.pem +check_return verify-keys-1-manager ./verify2 sign2-res.xml rsakey.pem -check_return verify-keys-manager +check_return verify-keys-2-manager + +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a signature with xmlsec1..." +xmlsec1 verify --pubkey:rsakey.pem rsapub.pem sign1-res-xmlsec1.xml +check_return verify-keys-1-xmlsec1 +xmlsec1 verify --pubkey:rsakey.pem rsapub.pem sign2-res.xml +check_return verify-keys-2-xmlsec1 -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Verifying a signature with X509 certificates..." ./verify3 sign3-res.xml ca2cert.pem cacert.pem check_return verify-x509 -echo "---------------------------------------------------" -echo "Verifying a signature with additional restrictions..." -./verify4 verify4-res.xml ca2cert.pem cacert.pem -check_return verify-res +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a signature using X509 certificates with xmlsec1..." +xmlsec1 verify --untrusted ca2cert.pem --trusted cacert.pem sign3-res.xml +check_return verify-x509-xmlsec1 + +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a signature over a node using X509 certificate..." +./verify4 sign4-res.xml "data" ca2cert.pem cacert.pem +check_return verify-node-x509 + +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a signature over a node using X509 certificate with xmlsec1..." +xmlsec1 verify --add-id-attr ID --untrusted ca2cert.pem --trusted cacert.pem sign4-res.xml +check_return verify-node-x509-xmlsec1 -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a simple SAML response using X509 certificate..." +./verify-saml verify-saml-res.xml ca2cert.pem cacert.pem +check_return verify-sampl-x509 + +echo "-----------------------------------------------------------------------------------------------" +echo "Verifying a simple SAML response using X509 certificate with xmlsec1..." +xmlsec1 verify --trusted ca2cert.pem --trusted cacert.pem verify-saml-res.xml +check_return verify-sampl-x509-xmlsec1 + +echo "-----------------------------------------------------------------------------------------------" echo "Encrypting data with a template file..." ./encrypt1 encrypt1-tmpl.xml deskey.bin > encrypt1-res.xml -./decrypt1 encrypt1-res.xml deskey.bin check_return encrypt-tmpl -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" +echo "Encrypting data with a template file with xmlsec1..." +xmlsec1 encrypt --deskey:deskey.bin deskey.bin --binary-data binary.dat --output encrypt1-res-xmlsec1.xml encrypt1-tmpl.xml +check_return encrypt-tmpl-xmlsec1 + +echo "-----------------------------------------------------------------------------------------------" echo "Encrypting data with a dynamicaly created template..." ./encrypt2 encrypt2-doc.xml deskey.bin > encrypt2-res.xml -./decrypt1 encrypt2-res.xml deskey.bin check_return encrypt-dynamic-tmpl -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Encrypting data with a session key..." ./encrypt3 encrypt3-doc.xml rsakey.pem > encrypt3-res.xml -./decrypt3 encrypt3-res.xml check_return encrypt-session-key -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Decrypting data with a single key..." ./decrypt1 encrypt1-res.xml deskey.bin +check_return decrypt-single-key-1 ./decrypt1 encrypt2-res.xml deskey.bin -check_return encrypt-single-key +check_return decrypt-single-key-2 -echo "---------------------------------------------------" +echo "-----------------------------------------------------------------------------------------------" echo "Decrypting data with keys manager..." ./decrypt2 encrypt1-res.xml deskey.bin +check_return decrypt-keys-1-manager ./decrypt2 encrypt2-res.xml deskey.bin -check_return encrypt-keys-manager +check_return decrypt-keys-2-manager -echo "---------------------------------------------------" -echo "Writing a custom keys manager..." +echo "-----------------------------------------------------------------------------------------------" +echo "Decrypting data with xmlsec1..." +xmlsec1 decrypt --deskey:deskey.bin deskey.bin encrypt1-res-xmlsec1.xml +check_return decrypt-key-1-xmlsec1 +xmlsec1 decrypt --deskey:deskey.bin deskey.bin encrypt2-res.xml +check_return decrypt-key-2-xmlsec1 +xmlsec1 decrypt --privkey:rsakey.pem rsakey.pem encrypt3-res.xml +check_return decrypt-key-3-xmlsec1 + +echo "-----------------------------------------------------------------------------------------------" +echo "Decrypting using custom keys manager..." ./decrypt3 encrypt1-res.xml +check_return decrypt-keys-1-manager ./decrypt3 encrypt2-res.xml -check_return write-keys-manager +check_return decrypt-keys-2-manager +./decrypt3 encrypt3-res.xml +check_return decrypt-keys-3-manager diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb similarity index 79% rename from meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb rename to meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb index 1990444dcc..ca6ebba59c 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb @@ -13,16 +13,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" SECTION = "libs" SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz \ - file://fix-ltmain.sh.patch \ - file://change-finding-path-of-nss.patch \ - file://makefile-ptest.patch \ - file://xmlsec1-examples-allow-build-in-separate-dir.patch \ - file://0001-nss-nspr-fix-for-multilib.patch \ + file://0001-force-to-use-our-own-libtool.patch \ + file://0002-change-finding-path-of-nss-and-nspr.patch \ + file://0003-xmlsec1-add-new-recipe.patch \ + file://0004-examples-allow-build-in-separate-dir.patch \ + file://0005-nss-nspr-fix-for-multilib.patch \ + file://0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch \ + file://0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch \ file://run-ptest \ - file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea" +SRC_URI[sha256sum] = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f" UPSTREAM_CHECK_URI = "https://github.com/lsh123/xmlsec/releases" UPSTREAM_CHECK_REGEX = "releases/tag/(?P\d+(\.\d+)+)"