From acd711f7faa98990f32b11f6235e739723ec2743 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 18 Jun 2014 11:12:24 +0800 Subject: sudo: upgrade from 1.8.10p2 to 1.8.10p3 Upgrade sudo from 1.8.10p2 to 1.8.10p3. [YOCTO #6457] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo_1.8.10p2.bb | 30 ----------------------------- meta/recipes-extended/sudo/sudo_1.8.10p3.bb | 30 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-extended/sudo/sudo_1.8.10p2.bb create mode 100644 meta/recipes-extended/sudo/sudo_1.8.10p3.bb (limited to 'meta/recipes-extended/sudo') diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p2.bb b/meta/recipes-extended/sudo/sudo_1.8.10p2.bb deleted file mode 100644 index aa8c445536..0000000000 --- a/meta/recipes-extended/sudo/sudo_1.8.10p2.bb +++ /dev/null @@ -1,30 +0,0 @@ -require sudo.inc - -SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://volatiles.99_sudo" - -PAM_SRC_URI = "file://sudo.pam" - -SRC_URI[md5sum] = "5e5eab1036a7cc2c088ab0d9b6b6a42e" -SRC_URI[sha256sum] = "ba6cb8db6dccdb92a96e8ae63ca65c410f8b61270b603ab9af4b1154fef379f1" - -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" - -EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" - -do_install_append () { - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then - install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo - fi - - chmod 4111 ${D}${bindir}/sudo - chmod 0440 ${D}${sysconfdir}/sudoers - - # Explicitly remove the ${localstatedir}/run directory as we can - # manage it by a configuration file under ${sysconfdir}/default/volatiles/ - rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo - install -d ${D}/${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_sudo ${D}/${sysconfdir}/default/volatiles/99_sudo -} diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb b/meta/recipes-extended/sudo/sudo_1.8.10p3.bb new file mode 100644 index 0000000000..46d47817e5 --- /dev/null +++ b/meta/recipes-extended/sudo/sudo_1.8.10p3.bb @@ -0,0 +1,30 @@ +require sudo.inc + +SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://volatiles.99_sudo" + +PAM_SRC_URI = "file://sudo.pam" + +SRC_URI[md5sum] = "fcd8d0d9f9f0397d076ee901e242ed39" +SRC_URI[sha256sum] = "6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400" + +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" + +EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +do_install_append () { + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo + fi + + chmod 4111 ${D}${bindir}/sudo + chmod 0440 ${D}${sysconfdir}/sudoers + + # Explicitly remove the ${localstatedir}/run directory as we can + # manage it by a configuration file under ${sysconfdir}/default/volatiles/ + rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo + install -d ${D}/${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles.99_sudo ${D}/${sysconfdir}/default/volatiles/99_sudo +} -- cgit 1.2.3-korg