From patchwork Thu Nov 16 08:01:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 34691 X-Patchwork-Delegate: steve@sakoman.com 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 7A6DDC197A0 for ; Thu, 16 Nov 2023 08:01:46 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.2535.1700121704850952637 for ; Thu, 16 Nov 2023 00:01:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=AH0ZzoZD; 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=9684758189=archana.polampalli@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3AG6UBIo001097 for ; Thu, 16 Nov 2023 08:01:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PPS06212021; bh=4wrLu Oqa2j4ePUtjFCM9820GJzVraelVGy6lokG/1+U=; b=AH0ZzoZDrByE5vLvysyWU aDMwYpgDTWQMpwBtskdJQb5fsqx5gX8LC44N2X/m4VhLjy45wCqmdI83uEXUnIPr VvGD5sATaDbV49PM9rpk9gJK6G9MwauphpEGo+dhKI07m6XTQkDc3CX2KdAA+rfA EKBwF+/RiDcVzQOTbX9gf9ATAFzmo7ifUEl9bvZ7waMmO8F7ugFo3FxP0g8gM2l7 vNkpJbbPPGGiMnVnGAlxWTsOi4J8boud3Lr0nR0mCNuaX8lAGKkZdLfdrKcCx78c HZaRouo1QfbpIyLu9lSQo/wF7J4lLSomap6R9Xp2ju1l9hIltc1q8SZkUBDCipWA g== 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 3ua0k6cndx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 16 Nov 2023 08:01:44 +0000 (GMT) Received: from blr-linux-engg1.wrs.com (147.11.136.210) 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.34; Thu, 16 Nov 2023 00:01:46 -0800 From: To: Subject: [oe-core][dunfell][PATCH 1/3] vim: update obsolete comment Date: Thu, 16 Nov 2023 08:01:22 +0000 Message-ID: <20231116080124.3175506-1-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Originating-IP: [147.11.136.210] X-ClientProxiedBy: ala-exchng01.corp.ad.wrs.com (147.11.82.252) To ala-exchng01.corp.ad.wrs.com (147.11.82.252) X-Proofpoint-GUID: oC6dQAXDu1iJJo3rPFdRiWCgUWhQppQl X-Proofpoint-ORIG-GUID: oC6dQAXDu1iJJo3rPFdRiWCgUWhQppQl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_06,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=850 spamscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2311160062 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 ; Thu, 16 Nov 2023 08:01:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190764 From: Etienne Cordonnier vim 8.3 has been out for a long time, so this comment is obsolete. However we still need UPSTREAM_VERSION_UNKNOWN, since we ignore the last digit of the upstream version number. Test result: $ devtool check-upgrade-status vim ... INFO: vim 9.0.1592 UNKNOWN Tom Rini c0370529c027abc5b1698d53fcfb8c02a0c515da (From OE-Core rev: 65f5de85c3f488136d1ec2b1f7fe8d8426d6c5b3) (From OE-Core rev: 72af322b6b8afd64a59b30a4f0fc3f8c6dfaa06a) Signed-off-by: Etienne Cordonnier Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 868a19357841470eb55fb7f1c4ab1af09dea99ed) Signed-off-by: Steve Sakoman Signed-off-by: Archana Polampalli --- meta/recipes-support/vim/vim.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d8e88af22e..10406d8b26 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -22,11 +22,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ PV .= ".2048" SRCREV = "982ef16059bd163a77271107020defde0740bbd6" -# Remove when 8.3 is out -UPSTREAM_VERSION_UNKNOWN = "1" - # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" +# Ignore that the upstream version .z in x.y.z is always newer +UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/git" From patchwork Thu Nov 16 08:01:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 34692 X-Patchwork-Delegate: steve@sakoman.com 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 7E6ABC47071 for ; Thu, 16 Nov 2023 08:01:56 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.2536.1700121706542244371 for ; Thu, 16 Nov 2023 00:01:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=UOsv6hq6; 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=9684758189=archana.polampalli@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3AG7Z2cm009449 for ; Thu, 16 Nov 2023 08:01:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PPS06212021; bh=3a3ME+RzikPxgmYNfOEJTtCjxruIHN3JMPP8Nm/sCbc=; b= UOsv6hq6utnQ713XylENwzUiBlFIejm3lqym+tsSfDhYEYTMqUI8/YXch7Jqy+s0 S2JGq6K/UF1NBB5a/opKBZ87PUpEHEbsYAUlcXNCIlRFSA1WOPphYatH7NEQ03rS pybG5rgMnynsjFrbTWmHQnGfW8Y5fvtoKV1YZb9QutOsj1RD1tPh8jAYCG4G3eQ6 9bUsI49K/Rqn/KPqHexLsATJ137HFvdyz5B0qMDxHttBfL6iLrLAHLvsd9/AwsTh CJGKK6vfMdOxE7Tmg0Gs6BJiIi3GW6xFnfEXeNRzN5aH1sxVI9sS6lVLiO1vEaOt +FPN0Ep+me8uXIfFAqCPAg== 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 3ua0k6cndy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 16 Nov 2023 08:01:45 +0000 (GMT) Received: from blr-linux-engg1.wrs.com (147.11.136.210) 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.34; Thu, 16 Nov 2023 00:01:48 -0800 From: To: Subject: [oe-core][dunfell][PATCH 2/3] vim: Improve locale handling Date: Thu, 16 Nov 2023 08:01:23 +0000 Message-ID: <20231116080124.3175506-2-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20231116080124.3175506-1-archana.polampalli@windriver.com> References: <20231116080124.3175506-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Originating-IP: [147.11.136.210] X-ClientProxiedBy: ala-exchng01.corp.ad.wrs.com (147.11.82.252) To ala-exchng01.corp.ad.wrs.com (147.11.82.252) X-Proofpoint-GUID: Ttj4sNUWU7yqPrzYOYKKI_80m-qWlIe7 X-Proofpoint-ORIG-GUID: Ttj4sNUWU7yqPrzYOYKKI_80m-qWlIe7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_06,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2311160062 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 ; Thu, 16 Nov 2023 08:01:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190765 From: Richard Purdie When making checkouts from git, the timestamps can vary and occasionally two files can end up with the same stamp. This triggers make to regenerate ru.cp1251.po from ru.po for example. If it isn't regenerated, the output isn't quite the same leading to reproducibility issues (CP1251 vs cp1251). Since we added all locales to buildtools tarball now, we can drop the locale restrictions too. We need to generate a native binary for the sjis conversion tool so also tweak that. (From OE-Core rev: 042c1a501b1dae5ddb31307b461be02c3591c589) Signed-off-by: Richard Purdie Signed-off-by: Archana Polampalli --- meta/recipes-support/vim/vim.inc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 10406d8b26..a12e3c8d89 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -40,22 +40,16 @@ do_configure () { cd src rm -f auto/* touch auto/config.mk + # git timestamps aren't reliable and we want to consistently regenerate these generated files + rm -f po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po aclocal autoconf cd .. oe_runconf touch src/auto/configure touch src/auto/config.mk src/auto/config.h -} - -do_compile() { - # We do not support fully / correctly the following locales. Attempting - # to use these with msgfmt in order to update the ".desktop" files exposes - # this problem and leads to the compile failing. - for LOCALE in cs fr ko pl sk zh_CN zh_TW;do - echo -n > src/po/${LOCALE}.po - done - autotools_do_compile + # need a native tool, not a target one + ${BUILD_CC} src/po/sjiscorr.c -o src/po/sjiscorr } PACKAGECONFIG ??= "\ From patchwork Thu Nov 16 08:01:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 34693 X-Patchwork-Delegate: steve@sakoman.com 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 7FEE8C5AD4C for ; Thu, 16 Nov 2023 08:01:56 +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.2461.1700121708129075335 for ; Thu, 16 Nov 2023 00:01:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=hARfMy7V; 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=9684758189=archana.polampalli@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3AG6Zgb2007605 for ; Thu, 16 Nov 2023 08:01:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PPS06212021; bh=MGkNYw9F2MWxDVp2zn0TvxKIiG5TV2DGLrVA8O636Is=; b= hARfMy7VTFkuFhdpQzzSz0+907hj+7ujcmyG1dWMB7LtbPnEqkre59nUpU/6rnuf uRZhLugVLM3wBNoAWxFFHm7Sjj3eMv4A6IB+m1cN7j3TlWPOobxVC1ilT/khpXYb wL/m5DBhxj39yJNqXPbwr3H0ZySrFs0qwhdCrKu7uF0bz0yHx3lIP/yPeLcAdkMY x2HDSQCLHB+KD+Z8NQ9bZl15TMPVBGLuPXW1HlAQ/iRkcLYLsXnNOAJuiD/OaqUr 2ZYIrZhMvVtFXyueLMAchc2fs5+hv6IRQBOzWeFUNakjPs5tse2Ie6ISibIIGQsG migbLfguYFBY1EnUBT98mA== 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 3u9xtxcqwu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 16 Nov 2023 08:01:47 +0000 (GMT) Received: from blr-linux-engg1.wrs.com (147.11.136.210) 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.34; Thu, 16 Nov 2023 00:01:49 -0800 From: To: Subject: [oe-core][dunfell][PATCH 3/3] vim: Upgrade 9.0.2048 -> 9.0.2068 Date: Thu, 16 Nov 2023 08:01:24 +0000 Message-ID: <20231116080124.3175506-3-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20231116080124.3175506-1-archana.polampalli@windriver.com> References: <20231116080124.3175506-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Originating-IP: [147.11.136.210] X-ClientProxiedBy: ala-exchng01.corp.ad.wrs.com (147.11.82.252) To ala-exchng01.corp.ad.wrs.com (147.11.82.252) X-Proofpoint-ORIG-GUID: lFVxbWfcRjuSiJnw4yQ3cJUqfxD_HA2N X-Proofpoint-GUID: lFVxbWfcRjuSiJnw4yQ3cJUqfxD_HA2N X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_06,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=653 bulkscore=0 mlxscore=0 clxscore=1015 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2311160062 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 ; Thu, 16 Nov 2023 08:01:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190766 From: Archana Polampalli This includes CVE fix for CVE-2023-46246. 9198c1f2b (tag: v9.0.2068) patch 9.0.2068: [security] overflow in :history References: https://nvd.nist.gov/vuln/detail/CVE-2023-46246 Signed-off-by: Archana Polampalli --- meta/recipes-support/vim/vim.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index a12e3c8d89..383db8b874 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".2048" +PV .= ".2068" SRCREV = "982ef16059bd163a77271107020defde0740bbd6" # Do not consider .z in x.y.z, as that is updated with every commit