summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorFan Xin <fan.xin@jp.fujitsu.com>2015-12-09 16:57:54 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:53 +0000
commit2b2774bd009847a20e4819a152efcfcffe522e86 (patch)
treef882b765943fe626787f7579160cffb200fd32fa /meta/recipes-extended
parent5eb0e90e4492ca9a1896392fec856b47505cdcf6 (diff)
downloadpoky-2b2774bd009847a20e4819a152efcfcffe522e86.tar.gz
sudo: upgrade to 1.8.15
1. upgrade to 1.8.15 2. delete patch file due to the bug has been fixed in sudo 1.8.15 (http://bugzilla.sudo.ws/show_bug.cgi?id=708) (From OE-Core rev: 2180280e63aece8fb45686e1b5dd01430ce478fe) Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch31
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.15.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.14p3.bb)5
2 files changed, 2 insertions, 34 deletions
diff --git a/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch b/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch
deleted file mode 100644
index 2418689dac..0000000000
--- a/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1The makefile uses top_srcdir to find files that were created by configure, when
2it should use top_builddir.
3
4Upstream-Status: Submitted (http://bugzilla.sudo.ws/show_bug.cgi?id=708)
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7---
8 src/Makefile.in | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/src/Makefile.in b/src/Makefile.in
12index f009e10..7acfb2d 100644
13--- a/src/Makefile.in
14+++ b/src/Makefile.in
15@@ -165,11 +165,11 @@ install-dirs:
16
17 install-rc: install-dirs
18 if [ -n "$(INIT_SCRIPT)" ]; then \
19- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
20+ $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
21 rm -f $(DESTDIR)$(RC_LINK); \
22 ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \
23 elif test -n "$(tmpfiles_d)"; then \
24- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_srcdir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
25+ $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
26 fi
27
28 install-binaries: install-dirs $(PROGS)
29--
302.1.4
31
diff --git a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb b/meta/recipes-extended/sudo/sudo_1.8.15.bb
index 4db85e23f8..042043ecef 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.15.bb
@@ -2,14 +2,13 @@ require sudo.inc
2 2
3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
5 file://0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch \
6 file://0001-Include-sys-types.h-for-id_t-definition.patch \ 5 file://0001-Include-sys-types.h-for-id_t-definition.patch \
7 " 6 "
8 7
9PAM_SRC_URI = "file://sudo.pam" 8PAM_SRC_URI = "file://sudo.pam"
10 9
11SRC_URI[md5sum] = "93dbd1e47c136179ff1b01494c1c0e75" 10SRC_URI[md5sum] = "7cf6b9b76d0478a572432bed481dd7b5"
12SRC_URI[sha256sum] = "a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237" 11SRC_URI[sha256sum] = "4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308"
13 12
14DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 14RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"