diff options
Diffstat (limited to 'poky/meta/recipes-extended/sudo')
-rw-r--r-- | poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch | 25 | ||||
-rw-r--r-- | poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 19 | ||||
-rw-r--r-- | poky/meta/recipes-extended/sudo/sudo.inc | 16 | ||||
-rw-r--r-- | poky/meta/recipes-extended/sudo/sudo_1.9.8p2.bb (renamed from poky/meta/recipes-extended/sudo/sudo_1.9.7p2.bb) | 3 |
4 files changed, 48 insertions, 15 deletions
diff --git a/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch b/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch new file mode 100644 index 0000000000..e7875c96f7 --- /dev/null +++ b/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch @@ -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++) { diff --git a/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index f7ccfdd623..f4fc376bb8 100644 --- a/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -13,11 +13,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> Upstream-Status: Inappropriate [OE configuration specific] --- - examples/sudo.conf.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + 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 19e33ff..af78235 100644 +index 6535d3a..50afc8f 100644 --- a/examples/sudo.conf.in +++ b/examples/sudo.conf.in @@ -4,7 +4,7 @@ @@ -29,7 +29,16 @@ index 19e33ff..af78235 100644 # fully qualified. # The plugin_name corresponds to a global symbol in the plugin # that contains the plugin interface structure. -@@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so +@@ -51,7 +51,7 @@ + # 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 + + # + # Sudo noexec: +@@ -65,7 +65,7 @@ # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # @@ -38,7 +47,7 @@ index 19e33ff..af78235 100644 # # Sudo plugin directory: -@@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so +@@ -74,7 +74,7 @@ # The default directory to use when searching for plugins that are # specified without a fully qualified path name. # diff --git a/poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc index 6a18609adc..82040de8aa 100644 --- a/poky/meta/recipes-extended/sudo/sudo.inc +++ b/poky/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://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 diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.7p2.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.8p2.bb index 9b5b2f3c69..b2afd1f98c 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.7p2.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.8p2.bb @@ -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] = "9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d" 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)}" |