On May 6, 2014 7:12 PM, "Chen Qi" <[email protected]> wrote: > > Upgrade sudo from 1.8.9p5 to the newest stable release 1.8.10p2. > > The license information is modified as required.
can you b more explicit here and provide information as to what changed exactly? > > As /var/run/sudo is the default directory for sudo's time stamp > files, this patch adds a configuration file to manage this directory. > > Signed-off-by: Chen Qi <[email protected]> > --- > meta/recipes-extended/sudo/files/volatiles.99_sudo | 1 + > meta/recipes-extended/sudo/sudo.inc | 6 +++--- > .../sudo/{sudo_1.8.9p5.bb => sudo_1.8.10p2.bb} | 13 ++++++++++--- > 3 files changed, 14 insertions(+), 6 deletions(-) > create mode 100644 meta/recipes-extended/sudo/files/volatiles.99_sudo > rename meta/recipes-extended/sudo/{sudo_1.8.9p5.bb => sudo_1.8.10p2.bb} (57%) > > 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 0000000..ecb576e > --- /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 0aa5193..6de984a 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.9p5.bbb/meta/recipes-extended/sudo/ sudo_1.8.10p2.bb > similarity index 57% > rename from meta/recipes-extended/sudo/sudo_1.8.9p5.bb > rename to meta/recipes-extended/sudo/sudo_1.8.10p2.bb > index 7851473..aa8c445 100644 > --- a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb > +++ b/meta/recipes-extended/sudo/sudo_1.8.10p2.bb > @@ -1,12 +1,13 @@ > 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)}" > + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ > + file://volatiles.99_sudo" > > PAM_SRC_URI = "file://sudo.pam" > > -SRC_URI[md5sum] = "d3f1f1cfca6b2b06b048e1abb7d0227e" > -SRC_URI[sha256sum] = "bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21" > +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)}" > @@ -20,4 +21,10 @@ do_install_append () { > > 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 > } > -- > 1.7.9.5 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
