summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-06-14 09:49:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:55:43 +0100
commit7c6f47b13c55e5c1d15d9ab9c2cee3da065fb592 (patch)
treec19a22c5b8d0f9ed60bd7f6a19a01d9f974de073
parent3b97ea13c85870a1ff71312a42cd2c68036712a2 (diff)
downloadpoky-7c6f47b13c55e5c1d15d9ab9c2cee3da065fb592.tar.gz
sudo: upgrade to v1.8.1p2
Upgrading to the latest stable release of sudo. This version of sudo has reorganized its source code layout, hence the LIC_FILES_CHKSUM related changes. Also, some of the individual .c files we checksummed (nonunix.h, vasgroups.c) are no longer shipped with the sources. Finally, an embedded copy of zlib is now included in these sources, so Zlib is included as one of the licenses. I could not find any evidence of MIT-licensed sources, so that license has been removed. (From OE-Core rev: 10694e6037b16813e99e2204dbbe5c169f34667c) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sudo/sudo.inc27
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.1p2.bb (renamed from meta/recipes-extended/sudo/sudo_1.7.4p6.bb)4
2 files changed, 13 insertions, 18 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index fd680574a3..0d9f35eaba 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,14 +4,12 @@ HOMEPAGE = "http://www.sudo.ws"
4BUGTRACKER = "http://www.sudo.ws/bugs/" 4BUGTRACKER = "http://www.sudo.ws/bugs/"
5PRIORITY = "optional" 5PRIORITY = "optional"
6SECTION = "admin" 6SECTION = "admin"
7LICENSE = "ISC & UCB & MIT" 7LICENSE = "ISC & UCB & Zlib"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=0b07397b2fca3fb8b71f08cd85c6eb3f \ 8LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=54f1b46c2459ecec3d892618eab44302 \
9 file://nonunix.h;beginline=4;endline=28;md5=af7d361f47ae60769cac77e4fca0dbb0 \ 9 file://compat/fnmatch.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
10 file://vasgroups.c;beginline=4;endline=28;md5=af7d361f47ae60769cac77e4fca0dbb0 \ 10 file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
11 file://fnmatch.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 11 file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
12 file://getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ 12 file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea"
13 file://glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
14 file://snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea"
15 13
16inherit autotools 14inherit autotools
17 15
@@ -23,17 +21,14 @@ do_configure_prepend () {
23 fi 21 fi
24} 22}
25 23
26# The script "mkinstalldirs" from package "sudo" will create directory 24# Explicitly create ${localstatedir}/lib before do_install to ensure
27# "/var/lib/sudo" by recursion with mode "0700" during installing files. 25# the directory is accessible by all users. Otherwise the mkinstalldirs
28# That is to say, "var", "var/lib" and "var/lib/sudo" will possess access authority 26# script (from sudo) will recursively create ${localstatedir}/lib/sudo
29# with mode "0700". It cause that directory "var" and "var/lib" 27# and then chmod each directory with 0700 permissions, which isn't what
30# can't be accessed by common user. Creating directory "/var/lib" before 28# we want (i.e, users would not be able to access /var/lib).
31# installing files can resolve this problem.
32
33do_install_prepend (){ 29do_install_prepend (){
34 mkdir -p ${D}/${localstatedir}/lib 30 mkdir -p ${D}/${localstatedir}/lib
35} 31}
36
37 32
38pkg_postinst_${PN} () { 33pkg_postinst_${PN} () {
39 if [ "x$D" != "x" ]; then 34 if [ "x$D" != "x" ]; then
diff --git a/meta/recipes-extended/sudo/sudo_1.7.4p6.bb b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
index edc9a0e8bf..7eba307c0c 100644
--- a/meta/recipes-extended/sudo/sudo_1.7.4p6.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
@@ -5,7 +5,7 @@ PR = "r0"
5SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 5SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
6 file://libtool.patch" 6 file://libtool.patch"
7 7
8SRC_URI[md5sum] = "1ae12d3d22e7ffedbf2db26f957676f0" 8SRC_URI[md5sum] = "e8330f0e63b0ecb2e12b5c76922818cc"
9SRC_URI[sha256sum] = "20091ef71018698c674c779f4b57178b2ecb4275fa34909b06219d2688ad14d5" 9SRC_URI[sha256sum] = "281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb"
10 10
11EXTRA_OECONF += " --with-pam=no" 11EXTRA_OECONF += " --with-pam=no"