From 0262bd1fc9507a39b7f313a8a5e85e7001f6bd9f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 13 Jan 2014 15:05:45 +0800 Subject: sudo: upgrade to 1.8.9p1 Upgrade sudo from 1.8.8 to 1.8.9p1. This patch adds include/queue.h to the LIC_FILES_CHECKSUM because it's specified in the doc/LICENSE file. Signed-off-by: Chen Qi Signed-off-by: Saul Wold --- meta/recipes-extended/sudo/sudo.inc | 5 +++-- meta/recipes-extended/sudo/sudo_1.8.8.bb | 23 ----------------------- meta/recipes-extended/sudo/sudo_1.8.9p1.bb | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-extended/sudo/sudo_1.8.8.bb create mode 100644 meta/recipes-extended/sudo/sudo_1.8.9p1.bb (limited to 'meta/recipes-extended/sudo') diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 80357eb2e9..0aa5193375 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,12 +4,13 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=47ae0be3bf895c0bb885fae7e1e83a47 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=923752f88decdea9d69f92fe42c2af80 \ 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://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \ + file://include/queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681" inherit autotools diff --git a/meta/recipes-extended/sudo/sudo_1.8.8.bb b/meta/recipes-extended/sudo/sudo_1.8.8.bb deleted file mode 100644 index 6ab072f4db..0000000000 --- a/meta/recipes-extended/sudo/sudo_1.8.8.bb +++ /dev/null @@ -1,23 +0,0 @@ -require sudo.inc - -SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" - -PAM_SRC_URI = "file://sudo.pam" - -SRC_URI[md5sum] = "fc4f074090afd56d9ff4ff4e97321971" -SRC_URI[sha256sum] = "9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9" - -DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" - -EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" - -do_install_append () { - if [ "${@base_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 -} diff --git a/meta/recipes-extended/sudo/sudo_1.8.9p1.bb b/meta/recipes-extended/sudo/sudo_1.8.9p1.bb new file mode 100644 index 0000000000..b3c2086c4e --- /dev/null +++ b/meta/recipes-extended/sudo/sudo_1.8.9p1.bb @@ -0,0 +1,23 @@ +require sudo.inc + +SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + +PAM_SRC_URI = "file://sudo.pam" + +SRC_URI[md5sum] = "03773c373082843211c96df2c9187146" +SRC_URI[sha256sum] = "c22089aa1023233bf27808e8f7611b6b4c4fec2d151616179e1898876703cd51" + +DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" + +EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +do_install_append () { + if [ "${@base_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