From patchwork Thu Oct 10 19:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 50392 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 3CF5CD1A43A for ; Thu, 10 Oct 2024 19:36:30 +0000 (UTC) Received: from a27-29.smtp-out.us-west-2.amazonses.com (a27-29.smtp-out.us-west-2.amazonses.com [54.240.27.29]) by mx.groups.io with SMTP id smtpd.web10.53297.1728588977917466634 for ; Thu, 10 Oct 2024 12:36:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=juZtYXut; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=12a8Z46e; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.29, mailfrom: 0101019277eeaec0-6e439843-92bf-4c27-9d5d-b1e5941e5617-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1728588984; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=fgQ3nrob23MwBh6gXU71iIzwmzCP/x8Q9qNPlqBls/0=; b=juZtYXutFWemI/f4l9tJeI4cBNa71hhdNOyOlbWy36lhlrtFmZr4KfjQGtKbGthw azRffgrGW5/tiCsQ+oWAWflQmxhTh4YkrEJHheUuzKfMpBz+zUelFriaCsV3iyyAizk 5AJovrb20n9eGK6oS6f3awI2oJg6IDRhNYwYfEN8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1728588984; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=fgQ3nrob23MwBh6gXU71iIzwmzCP/x8Q9qNPlqBls/0=; b=12a8Z46elkBQbHRVdzghJ/uM3yS3vPBb4robbdnvDB+BHKBTBBMXdIsQSfCyqyT2 0OwiCYEtIvEsIB7kcLiiIBBv2NvU71qBBg68Z0rW9bP6AQO+WF5W/TfmWZF6oO7SNJl wuo7KG2f5JhooM8V+Y3pe7fP6obdElyCWdjPkQu8= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] sudo: upgrading to 1.9.16 FAILED Message-ID: <0101019277eeaec0-6e439843-92bf-4c27-9d5d-b1e5941e5617-000000@us-west-2.amazonses.com> Date: Thu, 10 Oct 2024 19:36:24 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.10.10-54.240.27.29 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, 10 Oct 2024 19:36:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205571 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *sudo* to *1.9.16* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-sudo-upgrade-1.9.15p5-1.9.16.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 69fd990fc65bb1b4a08098fcd9d0c8ba7d6e016a Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 10 Oct 2024 03:48:43 +0000 Subject: [PATCH] sudo: upgrade 1.9.15p5 -> 1.9.16 --- ...o.conf.in-fix-conflict-with-multilib.patch | 3 +- meta/recipes-extended/sudo/sudo.inc | 2 +- .../sudo/{sudo_1.9.15p5.bb => sudo_1.9.16.bb} | 32 ++++++++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.9.15p5.bb => sudo_1.9.16.bb} (66%) diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index 041c717e00..d86c6ca4fa 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -1,4 +1,4 @@ -From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 +From 3584b07767fe4b95ad17b2fa393ce855074b889a Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 17 Nov 2020 11:13:40 +0800 Subject: [PATCH] sudo.conf.in: fix conflict with multilib @@ -15,7 +15,6 @@ Update the comments in sudo.conf.in to avoid the conflict. Signed-off-by: Kai Kang Upstream-Status: Inappropriate [OE configuration specific] - --- examples/sudo.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index feb1cf35a7..b5d7f1bc9c 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d5345720ed8a3a0469fbe1cc702b3f65 \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.16.bb similarity index 66% rename from meta/recipes-extended/sudo/sudo_1.9.15p5.bb rename to meta/recipes-extended/sudo/sudo_1.9.16.bb index 2fd2ae6d05..fde9db6cd0 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.16.bb @@ -1,3 +1,33 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- LICENSE.md +# +++ LICENSE.md +# @@ -1,6 +1,6 @@ +# Sudo is distributed under the following license: +# +# - Copyright (c) 1994-1996, 1998-2023 +# + Copyright (c) 1994-1996, 1998-2024 +# Todd C. Miller +# +# Permission to use, copy, modify, and distribute this software for any +# @@ -299,7 +299,7 @@ +# +# The embedded copy of zlib bears the following license: +# +# - Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler +# + Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler +# +# This software is provided 'as-is', without any express or implied +# warranty. In no event will the authors be held liable for any damages +# +# + require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ @@ -7,7 +37,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558" +SRC_URI[sha256sum] = "c0d84d797f06b732fc573d0b798ae83128c2bc33052057f05b560ec6bcbfa03d" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"