mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
sudo: update 1.9.7p2 -> 1.9.8p1
Drop specialhandling for mksig items; issue fixed upstream. (From OE-Core rev: c5226a62fe90ff6b24d5063f1ecefd656b3494a3) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
266d5bdb10
commit
90a03db51b
+25
@@ -0,0 +1,25 @@
|
||||
From f993c5c88faacc43971899aae2168ffb3e34dc80 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 24 Sep 2021 13:36:24 +0200
|
||||
Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of
|
||||
tree builds
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
lib/util/mksigname.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c
|
||||
index de8b1ad..0a69e7e 100644
|
||||
--- a/lib/util/mksigname.c
|
||||
+++ b/lib/util/mksigname.c
|
||||
@@ -36,7 +36,7 @@ main(int argc, char *argv[])
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
-#include "mksigname.h"
|
||||
+#include "lib/util/mksigname.h"
|
||||
|
||||
printf("const char *const sudo_sys_signame[] = {\n");
|
||||
for (i = 0; i < nitems(sudo_sys_signame); i++) {
|
||||
@@ -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://doc/LICENSE;md5=fdff64d4fd19126330aa81b94d167173 \
|
||||
LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=b969d389e79703121cbffc9f3ea18a8b \
|
||||
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 \
|
||||
@@ -30,15 +30,13 @@ EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor"
|
||||
|
||||
EXTRA_OECONF:append:libc-musl = " --disable-hardening "
|
||||
|
||||
# mksigname/mksiglist are used on build host to generate source files
|
||||
do_compile:prepend () {
|
||||
# Remove build host references from sudo_usage.h
|
||||
sed -i \
|
||||
-e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's,--build=${BUILD_SYS},,g' \
|
||||
-e 's,--host=${HOST_SYS},,g' \
|
||||
${B}/src/sudo_usage.h
|
||||
oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist
|
||||
# Remove build host references from sudo_usage.h
|
||||
sed -i \
|
||||
-e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's,--build=${BUILD_SYS},,g' \
|
||||
-e 's,--host=${HOST_SYS},,g' \
|
||||
${B}/src/sudo_usage.h
|
||||
}
|
||||
|
||||
# Explicitly create ${localstatedir}/lib before do_install to ensure
|
||||
|
||||
+2
-1
@@ -3,11 +3,12 @@ require sudo.inc
|
||||
SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
|
||||
file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \
|
||||
file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \
|
||||
"
|
||||
|
||||
PAM_SRC_URI = "file://sudo.pam"
|
||||
|
||||
SRC_URI[sha256sum] = "28b5ee725dbf89a7852f42f309ca877d2810a9531b4eecfe59f3a84b6b4afca8"
|
||||
SRC_URI[sha256sum] = "0939ee24df7095a92e0ca4aa3bd53b2a10965a7b921d51a26ab70cdd24388d69"
|
||||
|
||||
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