summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sudo
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-02-28 13:45:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-02 15:22:53 +0000
commit60eed3195cadf001ef683e96a5e65be5c1a2dde5 (patch)
tree9f80a9a81d1b31313b318adb913fe10bd30e84c9 /meta/recipes-extended/sudo
parent78ae63423f123f89a5c72c85539e6ed71bd2653d (diff)
downloadpoky-60eed3195cadf001ef683e96a5e65be5c1a2dde5.tar.gz
sudo: upgrade to 1.8.4
During the upgrade to 1.8.4, the UCB-licensed fnmatch.c was replaced with a non-recursive BSD-licensed version, hence the removal of UCB and addition of BSD in the LICENSE field. This led to checksum changes in the doc/LICENSE file, and we now additionally track the comment headers in redblack.c. These changes were confirmed on the sudo mailing list: http://www.sudo.ws/pipermail/sudo-workers/2012-February/000736.html This upgrade also fixes CVE-2012-0809. (From OE-Core rev: 7147a569758414467c9d022e4c11fbc303e050aa) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo')
-rw-r--r--meta/recipes-extended/sudo/sudo.inc7
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.4.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.3.bb)4
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 83dd209afa..2168690527 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -3,9 +3,10 @@ DESCRIPTION = "Sudo (superuser do) allows a system administrator to give certain
3HOMEPAGE = "http://www.sudo.ws" 3HOMEPAGE = "http://www.sudo.ws"
4BUGTRACKER = "http://www.sudo.ws/bugs/" 4BUGTRACKER = "http://www.sudo.ws/bugs/"
5SECTION = "admin" 5SECTION = "admin"
6LICENSE = "ISC & UCB & Zlib" 6LICENSE = "ISC & BSD & Zlib"
7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=54f1b46c2459ecec3d892618eab44302 \ 7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=19f95c610f585c26a836975654807669 \
8 file://compat/fnmatch.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724 \
9 file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
9 file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ 10 file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
10 file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 11 file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
11 file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea" 12 file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea"
diff --git a/meta/recipes-extended/sudo/sudo_1.8.3.bb b/meta/recipes-extended/sudo/sudo_1.8.4.bb
index 99fe5b91e7..dfa7291c55 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.4.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
8 8
9PAM_SRC_URI = "file://sudo.pam" 9PAM_SRC_URI = "file://sudo.pam"
10 10
11SRC_URI[md5sum] = "9e5517bbf3aee420b38c2d1d7a71bcad" 11SRC_URI[md5sum] = "5a54dde137618bbc1dd46bb0ef725d7d"
12SRC_URI[sha256sum] = "ff1fcc410c5465063ee4912912e29936ea39f017d9a8a57ec76b0ded71b7c3c4" 12SRC_URI[sha256sum] = "17a91da1857954aa73445197e6f73d5d50cc8c48719f6db457723bb8badc32a5"
13 13
14DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 14DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 15RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"