mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
sudo: update 1.9.12p2 -> 1.9.13p2
License-update: copyright years, formatting. (From OE-Core rev: 3195339a5cba9f141eb6e2835537897535b5bef9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 1476813725cce6754334b4a6727675640a7a1e44) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e0b2ca5867
commit
c69cb1bf9b
@@ -1,4 +1,7 @@
|
||||
sudo.conf.in: fix conflict with multilib
|
||||
From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
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 <kai.kang@windriver.com>
|
||||
|
||||
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:
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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)}"
|
||||
Reference in New Issue
Block a user