summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/files/libtool.patch28
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.6p4.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.5p2.bb)6
2 files changed, 26 insertions, 8 deletions
diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
index b0cd675518..10456d2aa5 100644
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ b/meta/recipes-extended/sudo/files/libtool.patch
@@ -1,14 +1,22 @@
1Fix path to libtool scripts so autoreconf can succeed. 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.
2 5
3Upstream-Status: Inappropriate [Other] 6Upstream-Status: Inappropriate [Other]
4Workaround is specific to our build system. 7Workaround is specific to our build system.
5 8
6Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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(-)
7 14
8diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4 15diff --git a/aclocal.m4 b/aclocal.m4
9--- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700 16index 481ffeb..0c53eeb 100644
10+++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800 17--- a/aclocal.m4
11@@ -368,8 +368,8 @@ 18+++ b/aclocal.m4
19@@ -364,13 +364,13 @@ EOF
12 dnl 20 dnl
13 dnl Pull in libtool macros 21 dnl Pull in libtool macros
14 dnl 22 dnl
@@ -22,3 +30,13 @@ diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4
22+m4_include([m4/ltsugar.m4]) 30+m4_include([m4/ltsugar.m4])
23+m4_include([m4/ltversion.m4]) 31+m4_include([m4/ltversion.m4])
24+m4_include([m4/lt~obsolete.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_1.8.5p2.bb b/meta/recipes-extended/sudo/sudo_1.8.6p4.bb
index 4e4a4436ff..115439b078 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.6p4.bb
@@ -1,6 +1,6 @@
1require sudo.inc 1require sudo.inc
2 2
3PR = "r1" 3PR = "r0"
4 4
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 \
@@ -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] = "dc42ed9f0946d92273762d0ae7314d59" 11SRC_URI[md5sum] = "cd19154e341b28573801397f0736126b"
12SRC_URI[sha256sum] = "c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf" 12SRC_URI[sha256sum] = "364ad88ca3afcadcff6bd6820b0af19c56ce4876704dae210e21845d923e59e8"
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)}"