From 43b0a2e2daaf83730532c9e0f536872f55d26ef9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 7 May 2014 11:30:08 +0800 Subject: sudo: upgrade from 1.8.9p5 to 1.8.10p2 Upgrade sudo from 1.8.9p5 to the newest stable release 1.8.10p2. The license checksums are modified as required, because the doc/LICENSE file now declares that compat/inet_pton.c bears the ISC license. As /var/run/sudo is the default directory for sudo's time stamp files, this patch adds a configuration file to manage this directory. (From OE-Core rev: af625d2f78a24dac96d11f159569f6465a534dfd) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/files/volatiles.99_sudo | 1 + meta/recipes-extended/sudo/sudo.inc | 6 ++--- meta/recipes-extended/sudo/sudo_1.8.10p2.bb | 30 ++++++++++++++++++++++ meta/recipes-extended/sudo/sudo_1.8.9p5.bb | 23 ----------------- 4 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 meta/recipes-extended/sudo/files/volatiles.99_sudo create mode 100644 meta/recipes-extended/sudo/sudo_1.8.10p2.bb delete mode 100644 meta/recipes-extended/sudo/sudo_1.8.9p5.bb (limited to 'meta/recipes-extended/sudo') diff --git a/meta/recipes-extended/sudo/files/volatiles.99_sudo b/meta/recipes-extended/sudo/files/volatiles.99_sudo new file mode 100644 index 0000000000..ecb576eaa3 --- /dev/null +++ b/meta/recipes-extended/sudo/files/volatiles.99_sudo @@ -0,0 +1 @@ +d root root 0755 /var/run/sudo none diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 0aa5193375..6de984a9f5 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,13 +4,14 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=923752f88decdea9d69f92fe42c2af80 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=69e337d679950e304953813158595256 \ file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \ file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \ - file://include/queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681" + file://include/queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ + file://compat/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a" inherit autotools @@ -38,4 +39,3 @@ do_compile_prepend () { do_install_prepend (){ mkdir -p ${D}/${localstatedir}/lib } - diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p2.bb b/meta/recipes-extended/sudo/sudo_1.8.10p2.bb new file mode 100644 index 0000000000..aa8c445536 --- /dev/null +++ b/meta/recipes-extended/sudo/sudo_1.8.10p2.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] = "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.9p5.bb b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb deleted file mode 100644 index 7851473e47..0000000000 --- a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb +++ /dev/null @@ -1,23 +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)}" - -PAM_SRC_URI = "file://sudo.pam" - -SRC_URI[md5sum] = "d3f1f1cfca6b2b06b048e1abb7d0227e" -SRC_URI[sha256sum] = "bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21" - -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 -} -- cgit v1.2.3-54-g00ecf