summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-08-16 11:30:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 11:44:15 +0100
commit660601bd9710a37c544131201eb9fa10a08a9de3 (patch)
tree6e3c1a68967ce9ae6b2716c8e96f1ab73a5a3b53 /meta
parent48bdcd7b2f65bbb1f707af38475947824da713d9 (diff)
downloadpoky-660601bd9710a37c544131201eb9fa10a08a9de3.tar.gz
sudo: upgrade to 1.8.7
Removed a patch because the changes were merged upstream. Also, the license had some modifications in two files. (From OE-Core rev: 13ba4490f6422109f934ed36809bd52d44577574) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/files/libtool.patch42
-rw-r--r--meta/recipes-extended/sudo/sudo.inc4
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.7.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.6p8.bb)7
3 files changed, 4 insertions, 49 deletions
diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
deleted file mode 100644
index 10456d2aa5..0000000000
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 8f89e456b2c23d78646a938ee5d4c5477c06c28d Mon Sep 17 00:00:00 2001
2From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3Date: Fri, 25 Jan 2013 16:18:37 +0200
4Subject: [PATCH] Fix path to libtool scripts so autoreconf can succeed.
5
6Upstream-Status: Inappropriate [Other]
7Workaround is specific to our build system.
8
9Signed-off-by: Scott Garman <scott.a.garman@intel.com>
10Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
11---
12 aclocal.m4 | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/aclocal.m4 b/aclocal.m4
16index 481ffeb..0c53eeb 100644
17--- a/aclocal.m4
18+++ b/aclocal.m4
19@@ -364,13 +364,13 @@ EOF
20 dnl
21 dnl Pull in libtool macros
22 dnl
23-m4_include([libtool.m4])
24-m4_include([ltoptions.m4])
25-m4_include([ltsugar.m4])
26-m4_include([ltversion.m4])
27-m4_include([lt~obsolete.m4])
28+m4_include([m4/libtool.m4])
29+m4_include([m4/ltoptions.m4])
30+m4_include([m4/ltsugar.m4])
31+m4_include([m4/ltversion.m4])
32+m4_include([m4/lt~obsolete.m4])
33 dnl
34 dnl Pull in other non-standard macros
35 dnl
36-m4_include([ax_check_compile_flag.m4])
37-m4_include([ax_check_link_flag.m4])
38+m4_include([m4/ax_check_compile_flag.m4])
39+m4_include([m4/ax_check_link_flag.m4])
40--
411.7.9.5
42
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index e77c90176d..b00f68dc67 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.sudo.ws"
4BUGTRACKER = "http://www.sudo.ws/bugs/" 4BUGTRACKER = "http://www.sudo.ws/bugs/"
5SECTION = "admin" 5SECTION = "admin"
6LICENSE = "ISC & BSD & Zlib" 6LICENSE = "ISC & BSD & Zlib"
7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=d25a8240ca6decdecb9990789e593130 \ 7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=9b2b7976b2182ee9a146710b32a01c7a \
8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724 \ 8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \
9 file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ 9 file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
10 file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ 10 file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
11 file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 11 file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
diff --git a/meta/recipes-extended/sudo/sudo_1.8.6p8.bb b/meta/recipes-extended/sudo/sudo_1.8.7.bb
index 00602c00a3..c83e95d3e7 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.6p8.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.7.bb
@@ -1,15 +1,12 @@
1require sudo.inc 1require sudo.inc
2 2
3PR = "r0"
4
5SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
6 file://libtool.patch \
7 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 4 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
8 5
9PAM_SRC_URI = "file://sudo.pam" 6PAM_SRC_URI = "file://sudo.pam"
10 7
11SRC_URI[md5sum] = "6dac48c73c8e0932980efcddafa569af" 8SRC_URI[md5sum] = "a02367090e1dac8d0c1747de1127b6bf"
12SRC_URI[sha256sum] = "c0baaa87f59153967b650a0dde2f7d4147d358fa15f3fdabb47e84d0282fe625" 9SRC_URI[sha256sum] = "39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a"
13 10
14DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 12RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"