From patchwork Mon May 27 01:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 44192 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 01588C25B7A for ; Mon, 27 May 2024 01:37:10 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.18708.1716773828506193483 for ; Sun, 26 May 2024 18:37:08 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=5877813c0a=changqing.li@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44R1Ku9L003429 for ; Sun, 26 May 2024 18:37:08 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ybb909811-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 26 May 2024 18:37:07 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 26 May 2024 18:37:07 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sun, 26 May 2024 18:37:06 -0700 From: To: Subject: [PATCH 1/4] libgpg-error: upgrade 1.48 -> 1.49 Date: Mon, 27 May 2024 09:37:02 +0800 Message-ID: <20240527013705.2781009-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: bMmUP1QRqByn7kJEvk-PxAOvfGz5W5Ht X-Proofpoint-GUID: bMmUP1QRqByn7kJEvk-PxAOvfGz5W5Ht X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-26_09,2024-05-24_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 clxscore=1011 impostorscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405270012 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 May 2024 01:37:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199890 From: Changqing Li Noteworthy changes in version 1.49 (2024-04-25) [C36/A36/R0] ----------------------------------------------- * Two new functions to improve the logging interface. The gpgrt_logv_domain is currently the same as gpgrt_logv_prefix but allows to pass a domain string so that in future we will be able to select log output by domain. It also provide a non yet functional feature to include a hex dump. * Add a "trunc" keyword to gpgrt_log_printhex. [rE0a39fbefcb] * Avoid an endless loop in the argparser due to a conf file read error. [rE2dc93cfecc] * Interface changes relative to the 1.48 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgrt_add_post_log_func NEW. gpgrt_logv_domain NEW. Release-info: https://dev.gnupg.org/T7012 [1] https://github.com/gpg/libgpg-error/blob/libgpg-error-1.49/NEWS Signed-off-by: Changqing Li --- .../libgpg-error/{libgpg-error_1.48.bb => libgpg-error_1.49.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libgpg-error/{libgpg-error_1.48.bb => libgpg-error_1.49.bb} (95%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.49.bb similarity index 95% rename from meta/recipes-support/libgpg-error/libgpg-error_1.48.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.49.bb index 9f2b49209d..b7d41ab489 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.49.bb @@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[sha256sum] = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f" +SRC_URI[sha256sum] = "8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9" BINCONFIG = "${bindir}/gpg-error-config" From patchwork Mon May 27 01:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 44195 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 09EB0C25B7E for ; Mon, 27 May 2024 01:37:20 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.18583.1716773830451868833 for ; Sun, 26 May 2024 18:37:10 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=5877813c0a=changqing.li@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44R1ODB0031020 for ; Mon, 27 May 2024 01:37:09 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3yb6y5hcta-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 27 May 2024 01:37:09 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 26 May 2024 18:37:08 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sun, 26 May 2024 18:37:07 -0700 From: To: Subject: [PATCH 2/4] ghostscript: upgrade 10.03.0 -> 10.03.1 Date: Mon, 27 May 2024 09:37:03 +0800 Message-ID: <20240527013705.2781009-2-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240527013705.2781009-1-changqing.li@windriver.com> References: <20240527013705.2781009-1-changqing.li@windriver.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Gk0YH_qWAsI9FIHxElLz1wHUTFXc7XD0 X-Proofpoint-GUID: Gk0YH_qWAsI9FIHxElLz1wHUTFXc7XD0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-26_09,2024-05-24_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=808 bulkscore=0 impostorscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405270012 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 May 2024 01:37:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199892 From: Changqing Li Patch release to address security bugs: CVE-2024-33869 CVE-2023-52722 CVE-2024-33870 CVE-2024-33871 CVE-2024-29510 Signed-off-by: Changqing Li --- .../{ghostscript_10.03.0.bb => ghostscript_10.03.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/ghostscript/{ghostscript_10.03.0.bb => ghostscript_10.03.1.bb} (97%) diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb similarity index 97% rename from meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb rename to meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb index ff7d38676e..0504f5244f 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb @@ -27,7 +27,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://avoid-host-contamination.patch \ " -SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" +SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" From patchwork Mon May 27 01:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 44193 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 E9CBEC25B7A for ; Mon, 27 May 2024 01:37:19 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.18710.1716773830502855834 for ; Sun, 26 May 2024 18:37:10 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=5877813c0a=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44R1JciM006470 for ; Sun, 26 May 2024 18:37:10 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ybfgg92te-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 26 May 2024 18:37:10 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 26 May 2024 18:37:09 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sun, 26 May 2024 18:37:08 -0700 From: To: Subject: [PATCH 3/4] libxml2: upgrade 2.12.6 -> 2.12.7 Date: Mon, 27 May 2024 09:37:04 +0800 Message-ID: <20240527013705.2781009-3-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240527013705.2781009-1-changqing.li@windriver.com> References: <20240527013705.2781009-1-changqing.li@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: hXXJvSNbPaFngGKaivUaJVHSzzyMqjeB X-Proofpoint-ORIG-GUID: hXXJvSNbPaFngGKaivUaJVHSzzyMqjeB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-26_09,2024-05-24_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 malwarescore=0 mlxlogscore=916 priorityscore=1501 adultscore=0 spamscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405270012 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 May 2024 01:37:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199891 From: Changqing Li Changes: - [CVE-2024-34459] Fix buffer overread with `xmllint --htmlout` - xmllint: Fix --pedantic option - save: Handle invalid parent pointers in xhtmlNodeDumpOutput Signed-off-by: Changqing Li --- .../libxml/{libxml2_2.12.6.bb => libxml2_2.12.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxml/{libxml2_2.12.6.bb => libxml2_2.12.7.bb} (97%) diff --git a/meta/recipes-core/libxml/libxml2_2.12.6.bb b/meta/recipes-core/libxml/libxml2_2.12.7.bb similarity index 97% rename from meta/recipes-core/libxml/libxml2_2.12.6.bb rename to meta/recipes-core/libxml/libxml2_2.12.7.bb index 14fcff7fa4..84601c282f 100644 --- a/meta/recipes-core/libxml/libxml2_2.12.6.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.7.bb @@ -20,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://install-tests.patch \ " -SRC_URI[archive.sha256sum] = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb" +SRC_URI[archive.sha256sum] = "24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" # Disputed as a security issue, but fixed in d39f780 From patchwork Mon May 27 01:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 44194 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 E888CC25B75 for ; Mon, 27 May 2024 01:37:19 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.18711.1716773831626366448 for ; Sun, 26 May 2024 18:37:11 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=5877813c0a=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44R103kh014227 for ; Sun, 26 May 2024 18:37:11 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ybfgg92tf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 26 May 2024 18:37:11 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 26 May 2024 18:37:10 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sun, 26 May 2024 18:37:09 -0700 From: To: Subject: [PATCH 4/4] man-pages: upgrade 6.06 -> 6.8 Date: Mon, 27 May 2024 09:37:05 +0800 Message-ID: <20240527013705.2781009-4-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240527013705.2781009-1-changqing.li@windriver.com> References: <20240527013705.2781009-1-changqing.li@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: xiKUpIHF7M_FF4lSFD1CoHsUWpdO2Pll X-Proofpoint-ORIG-GUID: xiKUpIHF7M_FF4lSFD1CoHsUWpdO2Pll X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-26_09,2024-05-24_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 adultscore=0 spamscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405270012 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 May 2024 01:37:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199893 From: Changqing Li * drop 0001-man.ml-do-not-use-dev-stdin.patch since upstream already fix the issue, see [1] * drop 0001-GNUmakefile-use-env-from-PATH.patch and drop depends on coreutils-native since ubuntu18.04 is not supported linux distro now [1] https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/share/mk/install/man.mk?id=9524f0f63badd896ccf6da7d79511100d86c4721 Signed-off-by: Changqing Li --- .../0001-GNUmakefile-use-env-from-PATH.patch | 31 ----------------- .../0001-man.ml-do-not-use-dev-stdin.patch | 33 ------------------- .../{man-pages_6.06.bb => man-pages_6.8.bb} | 10 ++---- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch delete mode 100644 meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch rename meta/recipes-extended/man-pages/{man-pages_6.06.bb => man-pages_6.8.bb} (84%) diff --git a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch b/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch deleted file mode 100644 index a644d24328..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 13 Mar 2024 17:30:02 +0100 -Subject: [PATCH] GNUmakefile: use env from PATH - -This allows using env from coreutils-native (rather than host env), -which resolves the problem of missing -S option on distributions -with much older coreutils such as Ubuntu 18.04. - -Once all autobuilder distros are newer than that, this patch -can be dropped, together with corutils-native dependency. - -Upstream-Status: Inappropriate [made for obsolete host distros] -Signed-off-by: Alexander Kanavin ---- - GNUmakefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 1234194..65ba327 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -21,7 +21,7 @@ - ######################################################################## - - --SHELL := /usr/bin/env -+SHELL := env - .SHELLFLAGS := -S bash -Eeuo pipefail -c - - diff --git a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch b/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch deleted file mode 100644 index ec2d0600c7..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 4 Mar 2024 14:35:16 +0100 -Subject: [PATCH] man.ml: do not use /dev/stdin - -This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e -(presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence), -but it doesn't work under pseudo where /dev/stdin is absent. - -Upstream-Status: Inappropriate [yocto specific] -Signed-off-by: Alexander Kanavin ---- - share/mk/install/man.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk -index b9865b9..06880f0 100644 ---- a/share/mk/install/man.mk -+++ b/share/mk/install/man.mk -@@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \ - - $(_manpages): - $(info INSTALL $@) -- <$< \ -- $(SED) $(foreach s, $(MANSECTIONS), \ -+ $(INSTALL_DATA) -T $< $@ -+ $(SED) -i $(foreach s, $(MANSECTIONS), \ - -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ -- | $(INSTALL_DATA) -T /dev/stdin $@ -+ $@ - ifeq ($(LINK_PAGES),symlink) - if $(GREP) '^\.so ' <$@ >/dev/null; then \ - $(GREP) '^\.so ' <$@ \ diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.8.bb similarity index 84% rename from meta/recipes-extended/man-pages/man-pages_6.06.bb rename to meta/recipes-extended/man-pages/man-pages_6.8.bb index 0f091bbd7d..fd19fa3b97 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.8.bb @@ -17,18 +17,12 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ file://LICENSES/Linux-man-pages-copyleft-var.txt;md5=d33708712c5918521f47f23b0c4e0d20 \ file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ " -SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ - file://0001-man.ml-do-not-use-dev-stdin.patch \ - file://0001-GNUmakefile-use-env-from-PATH.patch \ - " +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" +SRC_URI[sha256sum] = "f4d5b9756b4ee52e34ca9d895095c92312ced6292395b811e11069ab007e6f06" inherit manpages -# can be dropped when ubuntu 18.04 is not in use anymore -DEPENDS += "coreutils-native" - MAN_PKG = "${PN}" PACKAGECONFIG ??= ""