diff options
author | Ross Burton <ross.burton@intel.com> | 2015-07-24 15:58:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-27 12:28:00 +0100 |
commit | 53caeebc716ae9caf6ca08fd46dc58232571cd38 (patch) | |
tree | 586efca2ab475789afc11c963c29c0af4c33beca /meta/recipes-extended/sudo/sudo_1.8.14p3.bb | |
parent | 898fd07d7754f96432338e7a2989b0de17db8be3 (diff) | |
download | poky-53caeebc716ae9caf6ca08fd46dc58232571cd38.tar.gz |
sudo: upgrade to 1.8.14p3
The licence checksum is modified according to the change of doc/LICENCE.
In specific, file://lib/util/reallocarray.c is added to LIC_FILES_CHECKSUM.
Fix out of tree builds, and explicitly enable/disable tmpfiles.d support based
on the systemd DISTRO_FEATURE to avoid non-deterministic packaging.
Based on a patch by Chen Qi <Qi.Chen@windriver.com>
(From OE-Core rev: ef2a842d06b3a9ee6036af06247c7c022f8c720d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo/sudo_1.8.14p3.bb')
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.14p3.bb | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb new file mode 100644 index 0000000000..ea37aafc34 --- /dev/null +++ b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | require sudo.inc | ||
2 | |||
3 | SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ | ||
4 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | ||
5 | file://0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch \ | ||
6 | " | ||
7 | |||
8 | PAM_SRC_URI = "file://sudo.pam" | ||
9 | |||
10 | SRC_URI[md5sum] = "93dbd1e47c136179ff1b01494c1c0e75" | ||
11 | SRC_URI[sha256sum] = "a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237" | ||
12 | |||
13 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
14 | RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | ||
15 | |||
16 | EXTRA_OECONF += " \ | ||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ | ||
18 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ | ||
19 | " | ||
20 | |||
21 | do_install_append () { | ||
22 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | ||
23 | install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo | ||
24 | fi | ||
25 | |||
26 | chmod 4111 ${D}${bindir}/sudo | ||
27 | chmod 0440 ${D}${sysconfdir}/sudoers | ||
28 | |||
29 | # Explicitly remove the ${localstatedir}/run directory to avoid QA error | ||
30 | rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += "${libdir}/tmpfiles.d" | ||
34 | FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la" | ||