From patchwork Thu Mar 16 21:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21090 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 5DF8AC7618E for ; Thu, 16 Mar 2023 21:45:34 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.5077.1679003133366338282 for ; Thu, 16 Mar 2023 14:45:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rBBMsSHA; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so3031944pjb.0 for ; Thu, 16 Mar 2023 14:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zWBopBp04rPdgGbuEMR0lhVzAS3ybdJ9J9i4JUTeB/s=; b=rBBMsSHAUenrfioLFUQEW9GGKTjvigXJ3hktvWI/WuRElxMgiIrvMFx2gosJmY6ryq LFtRO/52xmijWb/WWK04LL+ghdfQ98MUgGzt6fKwBl5Pl1QPvASfPDOdw900vvRUGGE0 gugw1M13mgKFjR+4oOFGnHgJIkagrG+FaRsS1MhBnSzFU3LsUdx/a3MJqnVw4A7Nf1zQ OSndPqmJlQesIe+koCTeuZ2XqtCJPcx27f8PusaKCBDLe13R93L86rOBj/A1vq8odppR Kws+mm9FmgRX3QpSRtn9Edg3w6kJ0BeuqcgyuCCnD8ua1e5/L5ajX7iXuU0bH25uk9yk PioA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zWBopBp04rPdgGbuEMR0lhVzAS3ybdJ9J9i4JUTeB/s=; b=KBMRpYLd1t4KinVyXF8Er3EIV4uiOLWyAcJ4qzp0rj25QiuDFlBSCnw6WAZ5lXhq+c RvA0J/ucXuofztfil1iNTpB5VVmjOvbrR5BcgSVMFzp/i/D1qq4lFR9DSsdsiUKPWtef TKBPtSHFNUCLHQ+VfqmV5NwZrOxIKY3lGGF1SgPxJ2SfY0WssyzBdPVycjUIuyecQlWE IoLsjBeJdPUPGcaXB6wNVMlKNtGaiHEje+aPHNplGEnG5mvvrEv/Xk8bJLJiCCgc/WZ2 RRt6ed7y1Fjxp3IgpmRp/RHeRke0FNRmB+9gZuUfrG9L950/3RszFdC/hRn3EYHx7vb1 xHXQ== X-Gm-Message-State: AO0yUKVVNc1mcb8pMYQJCn7H+XxFj+bUocL422IEnCWhpgvIlw5p9NPm wrZJUwIQPZ2M27LQDG+/kYaP3+dpPQHBJLCzKMM= X-Google-Smtp-Source: AK7set/HSjkMTYJc4dV8frr0GttCz1iz5zMGgGkeZa6L8W+R6aLHyeu8g7lZQIJ9H6IjanNhjHbFFQ== X-Received: by 2002:a05:6a20:6d15:b0:d7:3553:e53f with SMTP id fv21-20020a056a206d1500b000d73553e53fmr2524081pzb.47.1679003132268; Thu, 16 Mar 2023 14:45:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/23] sudo: update 1.9.12p2 -> 1.9.13p2 Date: Thu, 16 Mar 2023 11:44:59 -1000 Message-Id: <3195339a5cba9f141eb6e2835537897535b5bef9.1679003014.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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 Mar 2023 21:45:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178713 From: Alexander Kanavin License-update: copyright years, formatting. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 1476813725cce6754334b4a6727675640a7a1e44) Signed-off-by: Steve Sakoman --- ...o.conf.in-fix-conflict-with-multilib.patch | 21 ++++++++++--------- meta/recipes-extended/sudo/sudo.inc | 2 +- .../{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} (96%) 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 f4fc376bb8..041c717e00 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,7 @@ -sudo.conf.in: fix conflict with multilib +From 6e835350b7413210c410d3578cfab804186b7a4f 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 When pass ${libdir} to --libexecdir of sudo, it fails to install sudo and lib32-sudo at same time: @@ -12,12 +15,13 @@ 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/examples/sudo.conf.in b/examples/sudo.conf.in -index 6535d3a..50afc8f 100644 +index 2187457..0908d24 100644 --- a/examples/sudo.conf.in +++ b/examples/sudo.conf.in @@ -4,7 +4,7 @@ @@ -33,8 +37,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_intercept.so file. # --#Path intercept @plugindir@/sudo_intercept.so -+#Path intercept $plugindir/sudo_intercept.so +-#Path intercept @intercept_file@ ++#Path intercept $intercept_file # # Sudo noexec: @@ -42,8 +46,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # --#Path noexec @plugindir@/sudo_noexec.so -+#Path noexec $plugindir/sudo_noexec.so +-#Path noexec @noexec_file@ ++#Path noexec $noexec_file # # Sudo plugin directory: @@ -55,7 +59,4 @@ index 6535d3a..50afc8f 100644 +#Path plugin_dir $plugindir # - # Sudo developer mode: --- -2.17.1 - + # Core dumps: diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index fd5bbf103d..f22b3eab99 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=7aacba499777b719416b293d16f29c8c \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ 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.12p2.bb b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.12p2.bb rename to meta/recipes-extended/sudo/sudo_1.9.13p2.bb index ae7207c081..a028bcc216 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.12p2.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" +SRC_URI[sha256sum] = "df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d" 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)}"